Skip to content

Commit 598dd21

Browse files
noerwzeripath
noerw
and
zeripath
authored
org dashboard: move teamselector left (#14954)
Co-authored-by: zeripath <art27@cantab.net>
1 parent 27b8eff commit 598dd21

File tree

1 file changed

+53
-52
lines changed

1 file changed

+53
-52
lines changed

‎templates/user/dashboard/navbar.tmpl‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -41,64 +41,65 @@
4141
</div>
4242
</div>
4343
</div>
44-
4544
{{if .ContextUser.IsOrganization}}
46-
<div class="right stackable menu">
47-
<div class="item">
48-
<div class="ui floating dropdown link jump">
49-
<span class="text">
50-
{{svg "octicon-people" 18}}
51-
{{if .Team}}
52-
{{.Team.Name}}
53-
{{else}}
54-
{{.i18n.Tr "org.teams"}}
55-
{{end}}
56-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
57-
</span>
58-
<div class="context user overflow menu" tabindex="-1">
59-
<div class="ui header">
60-
{{.i18n.Tr "home.filter_by_team_repositories"}}
61-
</div>
62-
<div class="scrolling menu items">
63-
<a class="{{if not $.Team}}active selected{{end}} item" title="{{.i18n.Tr "all"}}" href="{{AppSubUrl}}/org/{{$.Org.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
64-
{{.i18n.Tr "all"}}
65-
</a>
66-
{{range .Org.Teams}}
67-
{{if not .IncludesAllRepositories}}
68-
<a class="{{if $.Team}}{{if eq $.Team.ID .ID}}active selected{{end}}{{end}} item" title="{{.Name}}" href="{{AppSubUrl}}/org/{{$.Org.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}/{{.Name}}">
69-
{{.Name}}
70-
</a>
71-
{{end}}
45+
<div class="item">
46+
<div class="ui floating dropdown link jump">
47+
<span class="text">
48+
{{svg "octicon-people" 18}}
49+
{{if .Team}}
50+
{{.Team.Name}}
51+
{{else}}
52+
{{.i18n.Tr "org.teams"}}
53+
{{end}}
54+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
55+
</span>
56+
<div class="context user overflow menu" tabindex="-1">
57+
<div class="ui header">
58+
{{.i18n.Tr "home.filter_by_team_repositories"}}
59+
</div>
60+
<div class="scrolling menu items">
61+
<a class="{{if not $.Team}}active selected{{end}} item" title="{{.i18n.Tr "all"}}" href="{{AppSubUrl}}/org/{{$.Org.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
62+
{{.i18n.Tr "all"}}
63+
</a>
64+
{{range .Org.Teams}}
65+
{{if not .IncludesAllRepositories}}
66+
<a class="{{if $.Team}}{{if eq $.Team.ID .ID}}active selected{{end}}{{end}} item" title="{{.Name}}" href="{{AppSubUrl}}/org/{{$.Org.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}/{{.Name}}">
67+
{{.Name}}
68+
</a>
7269
{{end}}
73-
</div>
70+
{{end}}
7471
</div>
7572
</div>
7673
</div>
77-
<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard{{if .Team}}/{{.Team.Name}}{{end}}">
78-
{{svg "octicon-rss"}}&nbsp;{{.i18n.Tr "activities"}}
79-
</a>
80-
{{if not .UnitIssuesGlobalDisabled}}
81-
<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues{{if .Team}}/{{.Team.Name}}{{end}}">
82-
{{svg "octicon-issue-opened"}}&nbsp;{{.i18n.Tr "issues"}}
83-
</a>
84-
{{end}}
85-
{{if not .UnitPullsGlobalDisabled}}
86-
<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls{{if .Team}}/{{.Team.Name}}{{end}}">
87-
{{svg "octicon-git-pull-request"}}&nbsp;{{.i18n.Tr "pull_requests"}}
88-
</a>
89-
{{end}}
90-
{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
91-
<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/milestones{{if .Team}}/{{.Team.Name}}{{end}}">
92-
{{svg "octicon-milestone"}}&nbsp;{{.i18n.Tr "milestones"}}
93-
</a>
94-
{{end}}
95-
<div class="item">
96-
<a class="ui blue basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
97-
{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
98-
</a>
99-
</div>
100-
</div>
10174
{{end}}
10275
</div>
76+
77+
{{if .ContextUser.IsOrganization}}
78+
<div class="right stackable menu">
79+
<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard{{if .Team}}/{{.Team.Name}}{{end}}">
80+
{{svg "octicon-rss"}}&nbsp;{{.i18n.Tr "activities"}}
81+
</a>
82+
{{if not .UnitIssuesGlobalDisabled}}
83+
<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues{{if .Team}}/{{.Team.Name}}{{end}}">
84+
{{svg "octicon-issue-opened"}}&nbsp;{{.i18n.Tr "issues"}}
85+
</a>
86+
{{end}}
87+
{{if not .UnitPullsGlobalDisabled}}
88+
<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls{{if .Team}}/{{.Team.Name}}{{end}}">
89+
{{svg "octicon-git-pull-request"}}&nbsp;{{.i18n.Tr "pull_requests"}}
90+
</a>
91+
{{end}}
92+
{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
93+
<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/milestones{{if .Team}}/{{.Team.Name}}{{end}}">
94+
{{svg "octicon-milestone"}}&nbsp;{{.i18n.Tr "milestones"}}
95+
</a>
96+
{{end}}
97+
<div class="item">
98+
<a class="ui blue basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
99+
{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
100+
</a>
101+
</div>
102+
</div>
103+
{{end}}
103104
</div>
104105
<div class="ui divider"></div>

0 commit comments

Comments
 (0)