Skip to content

Commit 6d715d4

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 9f0ef36 commit 6d715d4

File tree

7 files changed

+211
-194
lines changed

7 files changed

+211
-194
lines changed

‎templates/devtest/fomantic-dropdown.tmpl

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
{{template "base/head" .}}
2+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
3+
<div class="page-content devtest ui container">
4+
<div>
5+
<h2>Dropdown</h2>
6+
<div>
7+
<div class="ui dropdown tw-border tw-border-red tw-border-dashed" data-tooltip-content="border for demo purpose only">
8+
<span class="text">search-input &amp; flex-item in menu</span>
9+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
10+
<div class="menu flex-items-menu">
11+
<div class="ui icon search input"><i class="icon">{{svg "octicon-search"}}</i><input type="text" value="search input in menu"></div>
12+
<div class="item"><input type="radio">item</div>
13+
<div class="item"><input type="radio">item</div>
14+
</div>
15+
</div>
16+
<div class="ui search selection dropdown">
17+
<span class="text">search ...</span>
18+
<input name="value" class="search">
19+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
20+
{{svg "octicon-x" 14 "remove icon"}}
21+
<div class="menu">
22+
<div class="item">item</div>
23+
</div>
24+
</div>
25+
<div class="ui multiple selection dropdown">
26+
<input class="hidden" value="1">
27+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
28+
{{svg "octicon-x" 14 "remove icon"}}
29+
<div class="default text">empty multiple dropdown</div>
30+
<div class="menu">
31+
<div class="item">item</div>
32+
</div>
33+
</div>
34+
<div class="ui multiple clearable search selection dropdown">
35+
<input type="hidden" value="1">
36+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
37+
{{svg "octicon-x" 14 "remove icon"}}
38+
<div class="default text">clearable search dropdown</div>
39+
<div class="menu">
40+
<div class="item" data-value="1">item</div>
41+
</div>
42+
</div>
43+
<div class="ui buttons">
44+
<button class="ui button">Button with Dropdown</button>
45+
<div class="ui dropdown button icon">
46+
{{svg "octicon-triangle-down"}}
47+
<div class="menu">
48+
<div class="item">item</div>
49+
</div>
50+
</div>
51+
</div>
52+
</div>
53+
54+
<h2>Selection</h2>
55+
<div>
56+
{{/* the "selection" class is optional, it will be added by JS automatically */}}
57+
<select class="ui dropdown selection">
58+
<option>a</option>
59+
<option>abcdefuvwxyz</option>
60+
</select>
61+
<select class="ui dropdown">
62+
<option>abcdefuvwxyz</option>
63+
<option>a</option>
64+
</select>
65+
</div>
66+
<h2>Dropdown Button (demo only without menu)</h2>
67+
<div>
68+
<div class="ui dropdown mini button">
69+
<span class="text">mini dropdown</span>
70+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
71+
</div>
72+
<div class="ui dropdown tiny button">
73+
<span class="text">tiny dropdown</span>
74+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
75+
</div>
76+
<div class="ui button dropdown">
77+
<span class="text">button dropdown</span>
78+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
79+
</div>
80+
</div>
81+
82+
<div>
83+
<div class="ui dropdown mini compact button">
84+
<span class="text">mini compact</span>
85+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
86+
</div>
87+
<div class="ui dropdown tiny compact button">
88+
<span class="text">tiny compact</span>
89+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
90+
</div>
91+
<div class="ui button compact dropdown">
92+
<span class="text">button compact</span>
93+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
94+
</div>
95+
</div>
96+
97+
<div>
98+
<hr>
99+
<div class="ui tiny button">Other button align with ...</div>
100+
<div class="ui dropdown tiny button">
101+
<span class="text">... Dropdown Button</span>
102+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
103+
</div>
104+
</div>
105+
</div>
106+
</div>
107+
{{template "base/footer" .}}

‎templates/devtest/gitea-ui.tmpl

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -180,94 +180,6 @@
180180
<input type="text" placeholder="place holder">
181181
</div>
182182
</div>
183-
184-
<h2>Dropdown with SVG</h2>
185-
<div>
186-
<div class="ui dropdown tw-border tw-border-red tw-border-dashed" data-tooltip-content="border for demo purpose only">
187-
<span class="text">search-input &amp; flex-item in menu</span>
188-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
189-
<div class="menu flex-items-menu">
190-
<div class="ui icon search input"><i class="icon">{{svg "octicon-search"}}</i><input type="text" value="search input in menu"></div>
191-
<div class="item"><input type="radio">item</div>
192-
<div class="item"><input type="radio">item</div>
193-
</div>
194-
</div>
195-
<div class="ui search selection dropdown">
196-
<span class="text">search ...</span>
197-
<input name="value" class="search">
198-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
199-
{{svg "octicon-x" 14 "remove icon"}}
200-
<div class="menu">
201-
<div class="item">item</div>
202-
</div>
203-
</div>
204-
<div class="ui multiple selection dropdown">
205-
<input class="hidden" value="1">
206-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
207-
{{svg "octicon-x" 14 "remove icon"}}
208-
<div class="default text">empty multiple dropdown</div>
209-
<div class="menu">
210-
<div class="item">item</div>
211-
</div>
212-
</div>
213-
<div class="ui multiple clearable search selection dropdown">
214-
<input type="hidden" value="1">
215-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
216-
{{svg "octicon-x" 14 "remove icon"}}
217-
<div class="default text">clearable search dropdown</div>
218-
<div class="menu">
219-
<div class="item" data-value="1">item</div>
220-
</div>
221-
</div>
222-
<div class="ui buttons">
223-
<button class="ui button">Button with Dropdown</button>
224-
<div class="ui dropdown button icon">
225-
{{svg "octicon-triangle-down"}}
226-
<div class="menu">
227-
<div class="item">item</div>
228-
</div>
229-
</div>
230-
</div>
231-
</div>
232-
233-
<div>
234-
<div class="ui dropdown mini button">
235-
<span class="text">mini dropdown</span>
236-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
237-
</div>
238-
<div class="ui dropdown tiny button">
239-
<span class="text">tiny dropdown</span>
240-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
241-
</div>
242-
<div class="ui button dropdown">
243-
<span class="text">button dropdown</span>
244-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
245-
</div>
246-
</div>
247-
248-
<div>
249-
<div class="ui dropdown mini compact button">
250-
<span class="text">mini compact</span>
251-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
252-
</div>
253-
<div class="ui dropdown tiny compact button">
254-
<span class="text">tiny compact</span>
255-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
256-
</div>
257-
<div class="ui button compact dropdown">
258-
<span class="text">button compact</span>
259-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
260-
</div>
261-
</div>
262-
263-
<div>
264-
<hr>
265-
<div class="ui tiny button">Button align with ...</div>
266-
<div class="ui dropdown tiny button">
267-
<span class="text">... Dropdown Button</span>
268-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
269-
</div>
270-
</div>
271183
</div>
272184

273185
<div>

‎templates/repo/header.tmpl

Lines changed: 88 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -128,107 +128,109 @@
128128
{{if .IsGenerated}}<div class="fork-flag">{{ctx.Locale.Tr "repo.generated_from"}} <a href="{{(.TemplateRepo ctx).Link}}">{{(.TemplateRepo ctx).FullName}}</a></div>{{end}}
129129
</div>
130130
{{end}}
131-
<overflow-menu class="ui container secondary pointing tabular top attached borderless menu tw-pt-0 tw-my-0">
132-
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
133-
<div class="overflow-menu-items">
134-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeCode}}
135-
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if and (ne .BranchName .Repository.DefaultBranch) (not $.PageIsWiki)}}/src/{{.BranchNameSubURL}}{{end}}">
136-
{{svg "octicon-code"}} {{ctx.Locale.Tr "repo.code"}}
137-
</a>
138-
{{end}}
139-
140-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeIssues}}
141-
<a class="{{if .PageIsIssueList}}active {{end}}item" href="{{.RepoLink}}/issues">
142-
{{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "repo.issues"}}
143-
{{if .Repository.NumOpenIssues}}
144-
<span class="ui small label">{{CountFmt .Repository.NumOpenIssues}}</span>
145-
{{end}}
131+
<div class="ui container">
132+
<overflow-menu class="ui secondary pointing menu">
133+
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
134+
<div class="overflow-menu-items">
135+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeCode}}
136+
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if and (ne .BranchName .Repository.DefaultBranch) (not $.PageIsWiki)}}/src/{{.BranchNameSubURL}}{{end}}">
137+
{{svg "octicon-code"}} {{ctx.Locale.Tr "repo.code"}}
146138
</a>
147-
{{end}}
139+
{{end}}
148140

149-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeExternalTracker}}
150-
<a class="{{if .PageIsIssueList}}active {{end}}item" href="{{.RepoExternalIssuesLink}}" target="_blank" rel="noopener noreferrer">
151-
{{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.issues"}}
152-
</a>
153-
{{end}}
141+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeIssues}}
142+
<a class="{{if .PageIsIssueList}}active {{end}}item" href="{{.RepoLink}}/issues">
143+
{{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "repo.issues"}}
144+
{{if .Repository.NumOpenIssues}}
145+
<span class="ui small label">{{CountFmt .Repository.NumOpenIssues}}</span>
146+
{{end}}
147+
</a>
148+
{{end}}
154149

155-
{{if and .Repository.CanEnablePulls (.Permission.CanRead ctx.Consts.RepoUnitTypePullRequests)}}
156-
<a class="{{if .PageIsPullList}}active {{end}}item" href="{{.RepoLink}}/pulls">
157-
{{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.pulls"}}
158-
{{if .Repository.NumOpenPulls}}
159-
<span class="ui small label">{{CountFmt .Repository.NumOpenPulls}}</span>
160-
{{end}}
161-
</a>
162-
{{end}}
150+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeExternalTracker}}
151+
<a class="{{if .PageIsIssueList}}active {{end}}item" href="{{.RepoExternalIssuesLink}}" target="_blank" rel="noopener noreferrer">
152+
{{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.issues"}}
153+
</a>
154+
{{end}}
163155

164-
{{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeActions)}}
165-
<a class="{{if .PageIsActions}}active {{end}}item" href="{{.RepoLink}}/actions">
166-
{{svg "octicon-play"}} {{ctx.Locale.Tr "actions.actions"}}
167-
{{if .Repository.NumOpenActionRuns}}
168-
<span class="ui small label">{{CountFmt .Repository.NumOpenActionRuns}}</span>
169-
{{end}}
170-
</a>
171-
{{end}}
156+
{{if and .Repository.CanEnablePulls (.Permission.CanRead ctx.Consts.RepoUnitTypePullRequests)}}
157+
<a class="{{if .PageIsPullList}}active {{end}}item" href="{{.RepoLink}}/pulls">
158+
{{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.pulls"}}
159+
{{if .Repository.NumOpenPulls}}
160+
<span class="ui small label">{{CountFmt .Repository.NumOpenPulls}}</span>
161+
{{end}}
162+
</a>
163+
{{end}}
172164

173-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypePackages}}
174-
<a href="{{.RepoLink}}/packages" class="{{if .IsPackagesPage}}active {{end}}item">
175-
{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
176-
</a>
177-
{{end}}
165+
{{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeActions)}}
166+
<a class="{{if .PageIsActions}}active {{end}}item" href="{{.RepoLink}}/actions">
167+
{{svg "octicon-play"}} {{ctx.Locale.Tr "actions.actions"}}
168+
{{if .Repository.NumOpenActionRuns}}
169+
<span class="ui small label">{{CountFmt .Repository.NumOpenActionRuns}}</span>
170+
{{end}}
171+
</a>
172+
{{end}}
178173

179-
{{$projectsUnit := .Repository.MustGetUnit $.Context ctx.Consts.RepoUnitTypeProjects}}
180-
{{if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeProjects) ($projectsUnit.ProjectsConfig.IsProjectsAllowed "repo")}}
181-
<a href="{{.RepoLink}}/projects" class="{{if .IsProjectsPage}}active {{end}}item">
182-
{{svg "octicon-project"}} {{ctx.Locale.Tr "repo.project_board"}}
183-
{{if .Repository.NumOpenProjects}}
184-
<span class="ui small label">{{CountFmt .Repository.NumOpenProjects}}</span>
185-
{{end}}
186-
</a>
187-
{{end}}
174+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypePackages}}
175+
<a href="{{.RepoLink}}/packages" class="{{if .IsPackagesPage}}active {{end}}item">
176+
{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
177+
</a>
178+
{{end}}
188179

189-
{{if and (.Permission.CanRead ctx.Consts.RepoUnitTypeReleases) (not .IsEmptyRepo)}}
190-
<a class="{{if or .PageIsReleaseList .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/releases">
191-
{{svg "octicon-tag"}} {{ctx.Locale.Tr "repo.releases"}}
192-
{{if .NumReleases}}
193-
<span class="ui small label">{{CountFmt .NumReleases}}</span>
194-
{{end}}
195-
</a>
196-
{{end}}
180+
{{$projectsUnit := .Repository.MustGetUnit $.Context ctx.Consts.RepoUnitTypeProjects}}
181+
{{if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeProjects) ($projectsUnit.ProjectsConfig.IsProjectsAllowed "repo")}}
182+
<a href="{{.RepoLink}}/projects" class="{{if .IsProjectsPage}}active {{end}}item">
183+
{{svg "octicon-project"}} {{ctx.Locale.Tr "repo.project_board"}}
184+
{{if .Repository.NumOpenProjects}}
185+
<span class="ui small label">{{CountFmt .Repository.NumOpenProjects}}</span>
186+
{{end}}
187+
</a>
188+
{{end}}
197189

198-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeWiki}}
199-
<a class="{{if .PageIsWiki}}active {{end}}item" href="{{.RepoLink}}/wiki">
200-
{{svg "octicon-book"}} {{ctx.Locale.Tr "repo.wiki"}}
190+
{{if and (.Permission.CanRead ctx.Consts.RepoUnitTypeReleases) (not .IsEmptyRepo)}}
191+
<a class="{{if or .PageIsReleaseList .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/releases">
192+
{{svg "octicon-tag"}} {{ctx.Locale.Tr "repo.releases"}}
193+
{{if .NumReleases}}
194+
<span class="ui small label">{{CountFmt .NumReleases}}</span>
195+
{{end}}
201196
</a>
202-
{{end}}
197+
{{end}}
203198

204-
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeExternalWiki}}
205-
<a class="item" href="{{(.Repository.MustGetUnit $.Context ctx.Consts.RepoUnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}" target="_blank" rel="noopener noreferrer">
206-
{{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.wiki"}}
207-
</a>
208-
{{end}}
199+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeWiki}}
200+
<a class="{{if .PageIsWiki}}active {{end}}item" href="{{.RepoLink}}/wiki">
201+
{{svg "octicon-book"}} {{ctx.Locale.Tr "repo.wiki"}}
202+
</a>
203+
{{end}}
209204

210-
{{if and (.Permission.CanReadAny ctx.Consts.RepoUnitTypePullRequests ctx.Consts.RepoUnitTypeIssues ctx.Consts.RepoUnitTypeReleases) (not .IsEmptyRepo)}}
211-
<a class="{{if .PageIsActivity}}active {{end}}item" href="{{.RepoLink}}/activity">
212-
{{svg "octicon-pulse"}} {{ctx.Locale.Tr "repo.activity"}}
213-
</a>
214-
{{end}}
205+
{{if .Permission.CanRead ctx.Consts.RepoUnitTypeExternalWiki}}
206+
<a class="item" href="{{(.Repository.MustGetUnit $.Context ctx.Consts.RepoUnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}" target="_blank" rel="noopener noreferrer">
207+
{{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.wiki"}}
208+
</a>
209+
{{end}}
215210

216-
{{template "custom/extra_tabs" .}}
211+
{{if and (.Permission.CanReadAny ctx.Consts.RepoUnitTypePullRequests ctx.Consts.RepoUnitTypeIssues ctx.Consts.RepoUnitTypeReleases) (not .IsEmptyRepo)}}
212+
<a class="{{if .PageIsActivity}}active {{end}}item" href="{{.RepoLink}}/activity">
213+
{{svg "octicon-pulse"}} {{ctx.Locale.Tr "repo.activity"}}
214+
</a>
215+
{{end}}
217216

218-
{{if .Permission.IsAdmin}}
219-
<span class="item-flex-space"></span>
217+
{{template "custom/extra_tabs" .}}
218+
219+
{{if .Permission.IsAdmin}}
220+
<span class="item-flex-space"></span>
221+
<a class="{{if .PageIsRepoSettings}}active {{end}} item" href="{{.RepoLink}}/settings">
222+
{{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}}
223+
</a>
224+
{{end}}
225+
</div>
226+
{{else if .Permission.IsAdmin}}
227+
<div class="overflow-menu-items">
220228
<a class="{{if .PageIsRepoSettings}}active {{end}} item" href="{{.RepoLink}}/settings">
221229
{{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}}
222230
</a>
223-
{{end}}
224-
</div>
225-
{{else if .Permission.IsAdmin}}
226-
<div class="overflow-menu-items">
227-
<a class="{{if .PageIsRepoSettings}}active {{end}} item" href="{{.RepoLink}}/settings">
228-
{{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}}
229-
</a>
230-
</div>
231-
{{end}}
232-
</overflow-menu>
231+
</div>
232+
{{end}}
233+
</overflow-menu>
234+
</div>
233235
<div class="ui tabs divider"></div>
234236
</div>

0 commit comments

Comments
 (0)