Skip to content

Improve branch select list ui in go templates #29729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
14c13ce
modify variables
HEREYUA Mar 8, 2024
3b749d8
modify variables
HEREYUA Mar 8, 2024
46663ca
Merge remote-tracking branch 'upstream/main'
HEREYUA Mar 8, 2024
81f9a84
Set user's 24h preference from their current OS locale (#29651)
silverwind Mar 8, 2024
fa27104
revert
HEREYUA Mar 8, 2024
0c9d222
Merge remote-tracking branch 'upstream/main'
HEREYUA Mar 8, 2024
076e99f
Merge remote-tracking branch 'upstream/main'
HEREYUA Mar 11, 2024
a0fa8e7
Merge remote-tracking branch 'upstream/main'
HEREYUA Mar 11, 2024
bc525ec
Merge remote-tracking branch 'upstream/main'
HEREYUA Mar 12, 2024
c194264
Improve branch select list ui in go templates
HEREYUA Mar 12, 2024
27a6622
fix
HEREYUA Mar 12, 2024
7529eda
Merge branch 'go-gitea:main' into fix/branch_select_ui
HEREYUA Mar 12, 2024
4f9c370
fix
HEREYUA Mar 13, 2024
e1d464c
Merge branch 'fix/branch_select_ui' of github.com:HEREYUA/gitea into …
HEREYUA Mar 13, 2024
22c25be
Update web_src/css/repo.css
silverwind Mar 14, 2024
1bf583e
Update web_src/css/repo.css
silverwind Mar 14, 2024
f1b5517
Update web_src/css/repo.css
silverwind Mar 14, 2024
7f9fa9e
Update web_src/css/repo.css
silverwind Mar 14, 2024
eef0a4d
Update web_src/css/repo.css
silverwind Mar 14, 2024
b9181f5
Update web_src/css/repo.css
silverwind Mar 14, 2024
e031058
Update web_src/css/repo.css
silverwind Mar 14, 2024
6220811
Update templates/repo/issue/branch_selector_field.tmpl
silverwind Mar 14, 2024
6dcc699
fix
HEREYUA Mar 15, 2024
b7dbc02
Merge branch 'main' into fix/branch_select_ui
HEREYUA Mar 15, 2024
c48d781
fix
HEREYUA Mar 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,7 @@ issues.choose.ignore_invalid_templates = Invalid templates have been ignored
issues.choose.invalid_templates = %v invalid template(s) found
issues.choose.invalid_config = The issue config contains errors:
issues.no_ref = No Branch/Tag Specified
issues.no_results = No results found.
Copy link
Member

@silverwind silverwind Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but I have to raise this: Why create a duplicate translation string?

issues.no_results = No results found.
pulls.no_results = No results found.

This will lead to unnecessary work for the translators. Either keep the old key or move to non-namespaced key no_results_found.

issues.create = Create Issue
issues.new_label = New Label
issues.new_label_placeholder = Label name
Expand Down
11 changes: 8 additions & 3 deletions templates/repo/issue/branch_selector_field.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{$.CsrfTokenHtml}}
</form>

<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{ctx.Locale.Tr "repo.pulls.no_results"}}">
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{ctx.Locale.Tr "repo.issues.no_results"}}">
<div class="ui basic small button">
<span class="text branch-name">{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}}</span>
{{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
Expand All @@ -18,25 +18,28 @@
<div class="header">
<div class="ui grid">
<div class="two column row">
<a class="reference column" href="#" data-target="#branch-list">
<a class="reference column muted" href="#" data-target="#branch-list">
<span class="text black">
{{svg "octicon-git-branch" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.branches"}}
</span>
</a>
<a class="reference column" href="#" data-target="#tag-list">
<a class="reference column muted" href="#" data-target="#tag-list">
<span class="text">
{{svg "octicon-tag" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.tags"}}
</span>
</a>
</div>
</div>
</div>
<div class="branch-tag-divider"></div>
<div id="branch-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}">
{{if .Reference}}
<div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{ctx.Locale.Tr "repo.clear_ref"}}</a></strong></div>
{{end}}
{{range .Branches}}
<div class="item" data-id="refs/heads/{{.}}" data-name="{{.}}" data-id-selector="#ref_selector">{{.}}</div>
{{else}}
<div class="item">{{ctx.Locale.Tr "repo.issues.no_results"}}</div>
{{end}}
</div>
<div id="tag-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}} gt-hidden">
Expand All @@ -45,6 +48,8 @@
{{end}}
{{range .Tags}}
<div class="item" data-id="refs/tags/{{.}}" data-name="tags/{{.}}" data-id-selector="#ref_selector">{{.}}</div>
{{else}}
<div class="item">{{ctx.Locale.Tr "repo.issues.no_results"}}</div>
{{end}}
</div>
</div>
Expand Down
31 changes: 31 additions & 0 deletions web_src/css/repo.css
Original file line number Diff line number Diff line change
Expand Up @@ -3023,3 +3023,34 @@ tbody.commit-list {
#cherry-pick-modal .scrolling.menu {
max-height: 200px;
}

/* branch-tag-selecter */
.repository .issue-content .issue-content-right .ui.grid .column.row{
padding: 10px;
padding-bottom: 0;
}
.repository .issue-content .issue-content-right .ui.grid .column.muted{
padding: 0;
}
.repository .issue-content .issue-content-right .ui.grid .column.muted .text {
display: inline-block;
padding: 10px;
width: 100%;
text-align: center;
border: 1px solid transparent;
border-bottom: none;

}
.repository .issue-content .issue-content-right .ui.grid .column.muted .text.black {
border-color: var(--color-secondary);
background: var(--color-menu);
border-top-left-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
}
.repository .issue-content .issue-content-right .ui.dropdown .scrolling.menu{
border-top: none;
}
.repository .issue-content .issue-content-right .branch-tag-divider {
margin-top: -1px;
border-top: 1px solid var(--color-secondary);
}