diff options
-rw-r--r-- | templates/admin/base/search.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/emails/list.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/repo/search.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/user/list.tmpl | 6 | ||||
-rw-r--r-- | templates/explore/repo_search.tmpl | 2 | ||||
-rw-r--r-- | templates/explore/search.tmpl | 2 | ||||
-rw-r--r-- | templates/projects/list.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/activity.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/commits.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/issue/filters.tmpl | 14 | ||||
-rw-r--r-- | templates/repo/issue/labels/label_list.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/issue/list.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/issue/milestones.tmpl | 2 | ||||
-rw-r--r-- | templates/user/dashboard/milestones.tmpl | 2 | ||||
-rw-r--r-- | templates/user/dashboard/navbar.tmpl | 2 | ||||
-rw-r--r-- | templates/user/notification/notification_subscriptions.tmpl | 4 |
16 files changed, 33 insertions, 35 deletions
diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 19977f05a9..865cc8830f 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -9,8 +9,8 @@ <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> <a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 153877174b..445f57bfe3 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -15,8 +15,8 @@ <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a> <a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a> diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl index 0d98e3e4f2..fa39e0b40a 100644 --- a/templates/admin/repo/search.tmpl +++ b/templates/admin/repo/search.tmpl @@ -9,8 +9,8 @@ <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> <a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 7334828533..2c8d805177 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -13,7 +13,8 @@ <div class="ui right floated secondary filter menu"> <!-- Status Filter Menu Item --> <div class="ui dropdown type jump item"> - <span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span> + <span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}}</span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a> <div class="divider"></div> @@ -37,8 +38,9 @@ <!-- Sort Menu Item --> <div class="ui dropdown type jump item"> <span class="text"> - {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{.locale.Tr "repo.issues.filter_sort"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button> <button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button> diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index 0731368e85..e684d2a1c4 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -16,8 +16,8 @@ <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=newest&q={{$.Keyword}}&language={{$.Language}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=oldest&q={{$.Keyword}}&language={{$.Language}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index b0041ee3ce..1c35ee00fa 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -9,8 +9,8 @@ <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 1f3668be7a..930cbca7e2 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -33,8 +33,8 @@ <div class="list-header-sort ui small dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index da4eca7525..444f21e779 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -7,10 +7,8 @@ <!-- Period --> <div class="ui floating dropdown jump filter"> <div class="ui basic compact button"> - <span class="text"> - {{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> + {{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a> diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 3400dbd251..18bb78cb06 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -7,9 +7,7 @@ <div class="gt-df gt-ac"> {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} <a href="{{.RepoLink}}/graph" class="ui basic small compact button"> - <span class="text"> - {{svg "octicon-git-branch"}} - </span> + {{svg "octicon-git-branch"}} {{.locale.Tr "repo.commit_graph"}} </a> </div> diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index 3bfced90d6..1805a23e37 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -11,8 +11,8 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter"> <span class="text"> {{.locale.Tr "repo.issues.filter_label"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="ui icon search input"> <i class="icon">{{svg "octicon-search" 16}}</i> @@ -42,8 +42,8 @@ <div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_milestone"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="ui icon search input"> <i class="icon">{{svg "octicon-search" 16}}</i> @@ -80,8 +80,8 @@ <div class="ui{{if not (or .OpenProjects .ClosedProjects)}} disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_project"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="ui icon search input"> <i class="icon">{{svg "octicon-search" 16}}</i> @@ -122,8 +122,8 @@ > <span class="text"> {{.locale.Tr "repo.issues.filter_poster"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="ui icon search input"> <i class="icon">{{svg "octicon-search" 16}}</i> @@ -137,8 +137,8 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_assignee"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="ui icon search input"> <i class="icon">{{svg "octicon-search" 16}}</i> @@ -160,8 +160,8 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_type"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if eq .ViewType "all"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_type.all_issues"}}</a> <a class="{{if eq .ViewType "assigned"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_type.assigned_to_you"}}</a> @@ -179,8 +179,8 @@ <div class="list-header-sort ui small dropdown downward type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=oldest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index d9addb439b..b9d349cb2b 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -1,14 +1,14 @@ <h4 class="ui top attached header"> {{.locale.Tr "repo.issues.label_count" .NumLabels}} <div class="ui right"> - <div class="ui right floated secondary filter menu"> + <div class="ui secondary menu"> <!-- Sort --> - <div class="ui dropdown type jump item"> + <div class="item ui jump dropdown gt-py-3"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> - <div class="menu"> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + <div class="left menu"> <a class="{{if or (eq .SortType "alphabetically") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a> <a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a> <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8087aaa68a..cc8c647c1e 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -54,8 +54,8 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.action_label"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item issue-action" data-action="clear" data-url="{{$.RepoLink}}/issues/labels"> {{.locale.Tr "repo.issues.new.clear_labels"}} @@ -78,8 +78,8 @@ <div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.action_milestone"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/milestone"> {{.locale.Tr "repo.issues.action_milestone_no_select"}} @@ -109,8 +109,8 @@ <div class="ui{{if not (or .OpenProjects .ClosedProjects)}} disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.project_board"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/projects"> {{.locale.Tr "repo.issues.new.clear_projects"}} @@ -144,8 +144,8 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.locale.Tr "repo.issues.action_assignee"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item issue-action" data-action="clear" data-url="{{$.Link}}/assignee"> {{.locale.Tr "repo.issues.new.clear_assignees"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index cdc372cc55..c6693e35cc 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -37,8 +37,8 @@ <div class="list-header-sort ui small dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.earliest_due_data"}}</a> <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.latest_due_date"}}</a> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index d9921ab59b..d18ed37910 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -59,8 +59,8 @@ <div class="list-header-sort ui dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index ee9e7e60ad..f9c6a29513 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -53,8 +53,8 @@ {{else}} {{.locale.Tr "org.teams"}} {{end}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="context user overflow menu"> <div class="ui header"> {{.locale.Tr "home.filter_by_team_repositories"}} diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index ec93935874..6d3f9759f8 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -33,8 +33,8 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_type"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .IssueType "all") (not .IssueType)}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state={{$.State}}&issueType=all&labels={{$.Labels}}">{{.locale.Tr "all"}}</a> <a class="{{if eq .IssueType "issues"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state={{$.State}}&issueType=issues&labels={{$.Labels}}">{{.locale.Tr "issues"}}</a> @@ -46,8 +46,8 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=latest&state={{$.State}}&issueType={{$.IssueType}}&labels={{$.Labels}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?sort=oldest&state={{$.State}}&issueType={{$.IssueType}}&labels={{$.Labels}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> |