0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-21 21:41:10 +01:00

Merge branch 'main' into minioIamDiscoverySupport

This commit is contained in:
Giteabot 2024-11-21 11:09:00 +08:00 committed by GitHub
commit c8f296a631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 93 additions and 75 deletions

View file

@ -352,7 +352,7 @@ enable_update_checker = Enable Update Checker
enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io. enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
env_config_keys = Environment Configuration env_config_keys = Environment Configuration
env_config_keys_prompt = The following environment variables will also be applied to your configuration file: env_config_keys_prompt = The following environment variables will also be applied to your configuration file:
config_write_file_prompt = These configuration options will be written into: config_write_file_prompt = These configuration options will be written into: %s
[home] [home]
nav_menu = Navigation Menu nav_menu = Navigation Menu

View file

@ -338,7 +338,9 @@
<div class="inline field"> <div class="inline field">
<div class="right-content"> <div class="right-content">
{{ctx.Locale.Tr "install.config_write_file_prompt"}} <span class="ui label">{{.CustomConfFile}}</span> <button class="btn interact-fg" data-clipboard-text="{{.CustomConfFile}}">{{svg "octicon-copy" 14}}</button> {{$copyBtn := svg "octicon-copy" 14}}
{{$filePath := HTMLFormat `<span class="ui label">%s</span> <button class="btn interact-fg" data-clipboard-text="%s">%s</button>` .CustomConfFile .CustomConfFile $copyBtn}}
{{ctx.Locale.Tr "install.config_write_file_prompt" $filePath}}
</div> </div>
<div class="tw-mt-4 tw-mb-2 tw-text-center"> <div class="tw-mt-4 tw-mb-2 tw-text-center">
<button class="ui primary button">{{ctx.Locale.Tr "install.install_btn_confirm"}}</button> <button class="ui primary button">{{ctx.Locale.Tr "install.install_btn_confirm"}}</button>

View file

@ -16,6 +16,7 @@
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}"> <input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
</div> </div>
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div> <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
<div class="scrolling menu">
{{range $data.CandidateAssignees}} {{range $data.CandidateAssignees}}
<a class="item muted" href="#" data-value="{{.ID}}"> <a class="item muted" href="#" data-value="{{.ID}}">
<span class="item-check-mark">{{svg "octicon-check"}}</span> <span class="item-check-mark">{{svg "octicon-check"}}</span>
@ -24,6 +25,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
</div>
<div class="ui list tw-flex tw-flex-row tw-gap-2"> <div class="ui list tw-flex tw-flex-row tw-gap-2">
<span class="item empty-list {{if $issueAssignees}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}</span> <span class="item empty-list {{if $issueAssignees}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}</span>
{{range $issueAssignees}} {{range $issueAssignees}}

View file

@ -17,6 +17,7 @@
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_labels"}}"> <input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_labels"}}">
</div> </div>
<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a> <a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
<div class="scrolling menu">
{{$previousExclusiveScope := "_no_scope"}} {{$previousExclusiveScope := "_no_scope"}}
{{range $data.RepoLabels}} {{range $data.RepoLabels}}
{{$exclusiveScope := .ExclusiveScope}} {{$exclusiveScope := .ExclusiveScope}}
@ -36,6 +37,7 @@
{{$previousExclusiveScope = $exclusiveScope}} {{$previousExclusiveScope = $exclusiveScope}}
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}} {{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
{{end}} {{end}}
</div>
{{end}} {{end}}
</div> </div>
</div> </div>

View file

@ -20,6 +20,7 @@
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div> <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
<div class="scrolling menu">
{{if $data.OpenMilestones}} {{if $data.OpenMilestones}}
<div class="divider"></div> <div class="divider"></div>
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div>
@ -41,6 +42,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
</div>
<div class="ui list"> <div class="ui list">
<span class="item empty-list {{if $issueMilestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span> <span class="item empty-list {{if $issueMilestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>

View file

@ -18,6 +18,7 @@
</div> </div>
{{end}} {{end}}
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div> <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
<div class="scrolling menu">
{{if $data.OpenProjects}} {{if $data.OpenProjects}}
<div class="divider"></div> <div class="divider"></div>
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div>
@ -38,6 +39,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
</div>
<div class="ui list"> <div class="ui list">
<span class="item empty-list {{if $issueProject}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span> <span class="item empty-list {{if $issueProject}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
{{if $issueProject}} {{if $issueProject}}

View file

@ -17,6 +17,7 @@
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}"> <input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
</div> </div>
{{end}} {{end}}
<div class="scrolling menu">
{{range $data.Reviewers}} {{range $data.Reviewers}}
{{if .User}} {{if .User}}
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}" <a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
@ -40,6 +41,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
</div>
<div class="ui relaxed list flex-items-block tw-my-4"> <div class="ui relaxed list flex-items-block tw-my-4">
<span class="item empty-list {{if or $data.OriginalReviews $data.CurrentPullReviewers}}tw-hidden{{end}}"> <span class="item empty-list {{if or $data.OriginalReviews $data.CurrentPullReviewers}}tw-hidden{{end}}">

View file

@ -66,6 +66,12 @@
overflow-x: auto; overflow-x: auto;
} }
.issue-content-right .dropdown > .menu .item-secondary-info small {
display: block;
text-overflow: ellipsis;
overflow: hidden;
}
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.issue-content-left, .issue-content-left,
.issue-content-right { .issue-content-right {