Skip to content

Commit ee6929d

Browse files
wxiaoguangwxiaoguang
authored
Refactor dropdown ellipsis (go-gitea#34123)
Remove legacy `truncated-item-container` and `truncated-item-name`.
1 parent 7a09bc9 commit ee6929d

File tree

21 files changed

+116
-128
lines changed

21 files changed

+116
-128
lines changed

‎templates/devtest/fomantic-dropdown.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@
7575
<h2>Selection</h2>
7676
<div>
7777
{{/* the "selection" class is optional, it will be added by JS automatically */}}
78-
<select class="ui dropdown selection ellipsis-items-nowrap">
78+
<select class="ui dropdown selection ellipsis-text-items">
7979
<option>a</option>
8080
<option>abcdefuvwxyz</option>
8181
<option>loooooooooooooooooooooooooooooooooooooooooooooooooooooooooong</option>
8282
</select>
83-
<select class="ui dropdown ellipsis-items-nowrap tw-max-w-[8em]">
83+
<select class="ui dropdown ellipsis-text-items tw-max-w-[8em]">
8484
<option>loooooooooooooooooooooooooooooooooooooooooooooooooooooooooong</option>
8585
<option>abcdefuvwxyz</option>
8686
<option>a</option>

‎templates/repo/actions/workflow_dispatch.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="ui inline required field">
1111
<label>{{ctx.Locale.Tr "actions.workflow.from_ref"}}:</label>
1212
</span>
13-
<div class="ui inline field dropdown button select-branch branch-selector-dropdown ellipsis-items-nowrap">
13+
<div class="ui inline field dropdown button select-branch branch-selector-dropdown ellipsis-text-items">
1414
<input type="hidden" name="ref" hx-sync="this:replace" hx-target="#runWorkflowDispatchModalInputs" hx-swap="innerHTML" hx-get="{{$.Link}}/workflow-dispatch-inputs?workflow={{$.CurWorkflow}}" hx-trigger="change" value="refs/heads/{{index .Branches 0}}">
1515
{{svg "octicon-git-branch" 14}}
1616
<div class="default text">{{index .Branches 0}}</div>

‎templates/repo/branch_dropdown.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
4646
data-enable-feed="{{ctx.RootData.EnableFeed}}"
4747
>
4848
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
49-
<div class="ui dropdown custom branch-selector-dropdown ellipsis-items-nowrap">
49+
<div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items">
5050
<div class="ui button branch-dropdown-button">
5151
<span class="flex-text-block gt-ellipsis">
5252
{{if not .DropdownFixedText}}

‎templates/repo/create.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
<div id="create-repo-error-message" class="ui negative message tw-text-center tw-hidden"></div>
1313
<div class="inline required field {{if .Err_Owner}}error{{end}}">
1414
<label>{{ctx.Locale.Tr "repo.owner"}}</label>
15-
<div class="ui selection dropdown" id="repo_owner_dropdown">
15+
<div class="ui selection dropdown ellipsis-text-items" id="repo_owner_dropdown">
1616
<input type="hidden" name="uid" value="{{.ContextUser.ID}}">
17-
<span class="text truncated-item-name"></span>
17+
<span class="text"></span>
1818
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1919
<div class="menu">
20-
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"
20+
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"
2121
{{if not .CanCreateRepoInDoer}}
2222
data-create-repo-disallowed-prompt="{{ctx.Locale.TrN .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n" .MaxCreationLimitOfDoer}}"
2323
{{end}}
2424
>
2525
{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
26-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
26+
{{.SignedUser.ShortName 40}}
2727
</div>
2828
{{range .Orgs}}
29-
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
29+
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
3030
{{ctx.AvatarUtils.Avatar . 28 "mini"}}
31-
<span class="truncated-item-name">{{.ShortName 40}}</span>
31+
{{.ShortName 40}}
3232
</div>
3333
{{end}}
3434
</div>

‎templates/repo/issue/branch_selector_field.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Still needs to figure out:
1414
*/}}
1515
{{if and (not .Issue.IsPull) (not .PageIsComparePull)}}
1616
<input id="ref_selector" name="ref" type="hidden" value="{{.Reference}}">
17-
<div class="ui dropdown select-branch branch-selector-dropdown ellipsis-items-nowrap {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}}"
17+
<div class="ui dropdown select-branch branch-selector-dropdown ellipsis-text-items {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}}"
1818
data-no-results="{{ctx.Locale.Tr "no_results_found"}}"
1919
{{if and .Issue (or .IsIssueWriter .HasIssuesOrPullsWritePermission)}}data-url-update-issueref="{{$.RepoLink}}/issues/{{.Issue.Index}}/ref"{{end}}
2020
>

‎templates/repo/issue/view_content/reference_issue_dialog.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{{.CsrfTokenHtml}}
88
<div class="field">
99
<label><strong>{{ctx.Locale.Tr "repository"}}</strong></label>
10-
<div class="ui search selection dropdown issue_reference_repository_search ellipsis-items-nowrap">
10+
<div class="ui search selection dropdown issue_reference_repository_search ellipsis-text-items">
1111
<div class="default text gt-ellipsis">{{.Repository.FullName}}</div>
1212
<div class="menu"></div>
1313
</div>

‎templates/repo/migrate/codebase.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@
6060

6161
<div class="inline required field {{if .Err_Owner}}error{{end}}">
6262
<label>{{ctx.Locale.Tr "repo.owner"}}</label>
63-
<div class="ui selection owner dropdown">
63+
<div class="ui selection owner dropdown ellipsis-text-items">
6464
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
65-
<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
65+
<span class="text" title="{{.ContextUser.Name}}">
6666
{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
67-
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
67+
{{.ContextUser.ShortName 40}}
6868
</span>
6969
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
7070
<div class="menu" title="{{.SignedUser.Name}}">
71-
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
71+
<div class="item" data-value="{{.SignedUser.ID}}">
7272
{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
73-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
73+
{{.SignedUser.ShortName 40}}
7474
</div>
7575
{{range .Orgs}}
76-
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
76+
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
7777
{{ctx.AvatarUtils.Avatar . 28 "mini"}}
78-
<span class="truncated-item-name">{{.ShortName 40}}</span>
78+
{{.ShortName 40}}
7979
</div>
8080
{{end}}
8181
</div>

‎templates/repo/migrate/codecommit.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@
6161

6262
<div class="inline required field {{if .Err_Owner}}error{{end}}">
6363
<label>{{ctx.Locale.Tr "repo.owner"}}</label>
64-
<div class="ui selection owner dropdown">
64+
<div class="ui selection owner dropdown ellipsis-text-items">
6565
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
66-
<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
66+
<span class="text" title="{{.ContextUser.Name}}">
6767
{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
68-
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
68+
{{.ContextUser.ShortName 40}}
6969
</span>
7070
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
7171
<div class="menu" title="{{.SignedUser.Name}}">
72-
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
72+
<div class="item" data-value="{{.SignedUser.ID}}">
7373
{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
74-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
74+
{{.SignedUser.ShortName 40}}
7575
</div>
7676
{{range .Orgs}}
77-
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
77+
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
7878
{{ctx.AvatarUtils.Avatar . 28 "mini"}}
79-
<span class="truncated-item-name">{{.ShortName 40}}</span>
79+
{{.ShortName 40}}
8080
</div>
8181
{{end}}
8282
</div>

‎templates/repo/migrate/git.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@
3434

3535
<div class="inline required field {{if .Err_Owner}}error{{end}}">
3636
<label>{{ctx.Locale.Tr "repo.owner"}}</label>
37-
<div class="ui selection owner dropdown">
37+
<div class="ui selection owner dropdown ellipsis-text-items">
3838
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
39-
<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
39+
<span class="text" title="{{.ContextUser.Name}}">
4040
{{ctx.AvatarUtils.Avatar .ContextUser}}
41-
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
41+
{{.ContextUser.ShortName 40}}
4242
</span>
4343
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4444
<div class="menu" title="{{.SignedUser.Name}}">
45-
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
45+
<div class="item" data-value="{{.SignedUser.ID}}">
4646
{{ctx.AvatarUtils.Avatar .SignedUser}}
47-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
47+
{{.SignedUser.ShortName 40}}
4848
</div>
4949
{{range .Orgs}}
50-
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
50+
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
5151
{{ctx.AvatarUtils.Avatar .}}
52-
<span class="truncated-item-name">{{.ShortName 40}}</span>
52+
{{.ShortName 40}}
5353
</div>
5454
{{end}}
5555
</div>

‎templates/repo/migrate/gitbucket.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@
7676

7777
<div class="inline required field {{if .Err_Owner}}error{{end}}">
7878
<label>{{ctx.Locale.Tr "repo.owner"}}</label>
79-
<div class="ui selection owner dropdown">
79+
<div class="ui selection owner dropdown ellipsis-text-items">
8080
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
81-
<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
81+
<span class="text" title="{{.ContextUser.Name}}">
8282
{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
83-
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
83+
{{.ContextUser.ShortName 40}}
8484
</span>
8585
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8686
<div class="menu" title="{{.SignedUser.Name}}">
87-
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
87+
<div class="item" data-value="{{.SignedUser.ID}}">
8888
{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
89-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
89+
{{.SignedUser.ShortName 40}}
9090
</div>
9191
{{range .Orgs}}
92-
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
92+
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
9393
{{ctx.AvatarUtils.Avatar . 28 "mini"}}
94-
<span class="truncated-item-name">{{.ShortName 40}}</span>
94+
{{.ShortName 40}}
9595
</div>
9696
{{end}}
9797
</div>

0 commit comments

Comments
 (0)