Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main: Add "View all branches/tags" entry to Branch Selector (go-gitea#32653) Remove all "floated" CSS styles (go-gitea#32691) Optimize the styling of icon buttons within file-header-right (go-gitea#32675) fix: show tag name on branch/tag selector if repo shown from tag ref (go-gitea#32689)
zjjhot · Dec 3, 2024 · 948d5ea · 948d5ea
2 parents 5ebe735 + 576e31a
commit 948d5ea
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 59 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1032,6 +1032,8 @@ fork_to_different_account = Fork to a different account
 fork_visibility_helper = The visibility of a forked repository cannot be changed.
 fork_branch = Branch to be cloned to the fork
 all_branches = All branches
+view_all_branches = View all branches
+view_all_tags = View all tags
 fork_no_valid_owners = This repository can not be forked because there are no valid owners.
 fork.blocked_user = Cannot fork the repository because you are blocked by the repository owner.
 use_template = Use this template

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
@@ -7,10 +7,12 @@
 			</div>
 		</h4>
 		<div class="ui attached segment">
-			<form class="ui form ignore-dirty" id="user-list-search-form">
-
+			<form class="ui form ignore-dirty flex-text-block" id="user-list-search-form">
+				<div class="tw-flex-1">
+					{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
+				</div>
 				<!-- Right Menu -->
-				<div class="ui right floated secondary filter menu">
+				<div class="ui secondary menu tw-m-0">
 					<!-- Status Filter Menu Item -->
 					<div class="ui dropdown type jump item">
 						<span class="text">{{ctx.Locale.Tr "admin.users.list_status_filter.menu_text"}}</span>
@@ -51,8 +53,6 @@
 						</div>
 					</div>
 				</div>
-
-				{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
 			</form>
 		</div>
 		<div class="ui attached table segment">

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
@@ -10,6 +10,7 @@
 * ShowTabBranches
 * ShowTabTagsTab
 * AllowCreateNewRef
+* ShowViewAllRefsEntry
 
 Search "repo/branch_dropdown" in the template directory to find all occurrences.
 */}}
@@ -24,6 +25,8 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 	data-text-create-branch="{{ctx.Locale.Tr "repo.branch.create_branch"}}"
 	data-text-create-ref-from="{{ctx.Locale.Tr "repo.branch.create_from"}}"
 	data-text-no-results="{{ctx.Locale.Tr "no_results_found"}}"
+	data-text-view-all-branches="{{ctx.Locale.Tr "repo.view_all_branches"}}"
+	data-text-view-all-tags="{{ctx.Locale.Tr "repo.view_all_tags"}}"
 
 	data-current-repo-default-branch="{{.Repository.DefaultBranch}}"
 	data-current-repo-link="{{.Repository.Link}}"
@@ -37,6 +40,7 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 	data-show-tab-branches="{{.ShowTabBranches}}"
 	data-show-tab-tags="{{.ShowTabTags}}"
 	data-allow-create-new-ref="{{.AllowCreateNewRef}}"
+	data-show-view-all-refs-entry="{{.ShowViewAllRefsEntry}}"
 
 	data-enable-feed="{{ctx.RootData.EnableFeed}}"
 >

diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
@@ -9,8 +9,8 @@
 				{{$branchDropdownCurrentRefType := "branch"}}
 				{{$branchDropdownCurrentRefShortName := .BranchName}}
 				{{if .IsViewTag}}
-					{{$branchDropdownCurrentRefType := "tag"}}
-					{{$branchDropdownCurrentRefShortName := .TagName}}
+					{{$branchDropdownCurrentRefType = "tag"}}
+					{{$branchDropdownCurrentRefShortName = .TagName}}
 				{{end}}
 				{{template "repo/branch_dropdown" dict
 					"Repository" .Repository

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -50,8 +50,8 @@
 				{{$branchDropdownCurrentRefType := "branch"}}
 				{{$branchDropdownCurrentRefShortName := .BranchName}}
 				{{if .IsViewTag}}
-					{{$branchDropdownCurrentRefType := "tag"}}
-					{{$branchDropdownCurrentRefShortName := .TagName}}
+					{{$branchDropdownCurrentRefType = "tag"}}
+					{{$branchDropdownCurrentRefShortName = .TagName}}
 				{{end}}
 				{{template "repo/branch_dropdown" dict
 					"Repository" .Repository
@@ -62,6 +62,7 @@
 					"CurrentTreePath" .TreePath
 					"RefLinkTemplate" "{RepoLink}/src/{RefType}/{RefShortName}/{TreePath}"
 					"AllowCreateNewRef" .CanCreateBranch
+					"ShowViewAllRefsEntry" true
 				}}
 				{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
 					{{$cmpBranch := ""}}

diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
@@ -5,7 +5,7 @@
 		<div class="issue-navbar">
 			{{template "repo/issue/navbar" .}}
 			{{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}}
-				<div class="ui right floated secondary menu">
+				<div class="ui right">
 					<a class="ui primary button" href="{{$.RepoLink}}/milestones/new">{{ctx.Locale.Tr "repo.milestones.new"}}</a>
 				</div>
 			{{end}}

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
@@ -56,21 +56,21 @@
 						<button class="ui mini basic button escape-button">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
 					{{end}}
 				</div>
-				<a download href="{{$.RawFileLink}}"><span class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}">{{svg "octicon-download"}}</span></a>
-				<a id="copy-content" class="btn-octicon {{if not .CanCopyContent}} disabled{{end}}"{{if or .IsImageFile (and .HasSourceRenderedToggle (not .IsDisplayingSource))}} data-link="{{$.RawFileLink}}"{{end}} data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}">{{svg "octicon-copy" 14}}</a>
+				<a download class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}" href="{{$.RawFileLink}}">{{svg "octicon-download"}}</a>
+				<a id="copy-content" class="btn-octicon {{if not .CanCopyContent}} disabled{{end}}"{{if or .IsImageFile (and .HasSourceRenderedToggle (not .IsDisplayingSource))}} data-link="{{$.RawFileLink}}"{{end}} data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}">{{svg "octicon-copy"}}</a>
 				{{if .EnableFeed}}
 				<a class="btn-octicon" href="{{$.FeedURL}}/rss/{{$.BranchNameSubURL}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
-					{{svg "octicon-rss" 14}}
+					{{svg "octicon-rss"}}
 				</a>
 				{{end}}
 				{{if .Repository.CanEnableEditor}}
 					{{if .CanEditFile}}
-						<a href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}"><span class="btn-octicon" data-tooltip-content="{{.EditFileTooltip}}">{{svg "octicon-pencil"}}</span></a>
+						<a class="btn-octicon" data-tooltip-content="{{.EditFileTooltip}}" href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}">{{svg "octicon-pencil"}}</a>
 					{{else}}
 						<span class="btn-octicon disabled" data-tooltip-content="{{.EditFileTooltip}}">{{svg "octicon-pencil"}}</span>
 					{{end}}
 					{{if .CanDeleteFile}}
-						<a href="{{.RepoLink}}/_delete/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}"><span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{.DeleteFileTooltip}}">{{svg "octicon-trash"}}</span></a>
+						<a class="btn-octicon btn-octicon-danger" data-tooltip-content="{{.DeleteFileTooltip}}" href="{{.RepoLink}}/_delete/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}">{{svg "octicon-trash"}}</a>
 					{{else}}
 						<span class="btn-octicon disabled" data-tooltip-content="{{.DeleteFileTooltip}}">{{svg "octicon-trash"}}</span>
 					{{end}}

diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
@@ -40,7 +40,7 @@
 			{{ctx.Locale.Tr "settings.manage_emails"}}
 		</h4>
 		<div class="ui attached segment">
-			<div class="ui list">
+			<div class="ui list flex-items-block">
 				{{if $.EnableNotifyMail}}
 				<div class="item">
 					<div class="tw-mb-2">{{ctx.Locale.Tr "settings.email_desc"}}</div>
@@ -65,27 +65,34 @@
 				</div>
 				{{end}}
 				{{if not ($.UserDisabledFeatures.Contains "manage_credentials")}}
-				{{range .Emails}}
-					<div class="item">
-						{{if not .IsPrimary}}
-							<div class="right floated content">
+					{{range .Emails}}
+						<div class="item tw-flex-wrap">
+							<div class="content tw-flex-1">
+								<strong>{{.Email}}</strong>
+								{{if .IsPrimary}}
+									<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
+								{{end}}
+								{{if .IsActivated}}
+									<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
+								{{else}}
+									<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
+								{{end}}
+							</div>
+							<div class="flex-text-block">
+							{{if not .IsPrimary}}
 								<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
 									{{ctx.Locale.Tr "settings.delete_email"}}
 								</button>
-							</div>
-							{{if .CanBePrimary}}
-								<div class="right floated content">
+								{{if .CanBePrimary}}
 									<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
 										{{$.CsrfTokenHtml}}
 										<input name="_method" type="hidden" value="PRIMARY">
 										<input name="id" type="hidden" value="{{.ID}}">
 										<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.primary_email"}}</button>
 									</form>
-								</div>
+								{{end}}
 							{{end}}
-						{{end}}
-						{{if not .IsActivated}}
-							<div class="right floated content">
+							{{if not .IsActivated}}
 								<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
 									{{$.CsrfTokenHtml}}
 									<input name="_method" type="hidden" value="SENDACTIVATION">
@@ -96,22 +103,11 @@
 										<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.activate_email"}}</button>
 									{{end}}
 								</form>
-							</div>
-						{{end}}
-						<div class="content tw-py-2">
-							<strong>{{.Email}}</strong>
-							{{if .IsPrimary}}
-								<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
-							{{end}}
-							{{if .IsActivated}}
-								<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
-							{{else}}
-								<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
 							{{end}}
+							</div>
 						</div>
-					</div>
-				{{end}}
-				{{end}}
+					{{end}}{{/* range Emails */}}
+				{{end}}{{/* if manage_credentials */}}
 			</div>
 		</div>
 		{{end}}

diff --git a/web_src/css/modules/list.css b/web_src/css/modules/list.css
@@ -126,12 +126,6 @@
   cursor: pointer;
 }
 
-.ui.list .list > .item [class*="right floated"],
-.ui.list > .item [class*="right floated"] {
-  float: right;
-  margin: 0 0 0 1em;
-}
-
 .ui.menu .ui.list > .item,
 .ui.menu .ui.list .list > .item {
   display: list-item;

diff --git a/web_src/css/modules/menu.css b/web_src/css/modules/menu.css
@@ -633,18 +633,6 @@
   }
 }
 
-.ui.floated.menu {
-  float: left;
-  margin: 0 0.5rem 0 0;
-}
-.ui.floated.menu .item:last-child::before {
-  display: none;
-}
-.ui.right.floated.menu {
-  float: right;
-  margin: 0 0 0 0.5rem;
-}
-
 .ui.borderless.menu .item::before,
 .ui.borderless.menu .item .menu .item::before,
 .ui.menu .borderless.item::before {

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
@@ -86,6 +86,8 @@ const sfc = {
       textCreateBranch: elRoot.getAttribute('data-text-create-branch'),
       textCreateRefFrom: elRoot.getAttribute('data-text-create-ref-from'),
       textNoResults: elRoot.getAttribute('data-text-no-results'),
+      textViewAllBranches: elRoot.getAttribute('data-text-view-all-branches'),
+      textViewAllTags: elRoot.getAttribute('data-text-view-all-tags'),
 
       currentRepoDefaultBranch: elRoot.getAttribute('data-current-repo-default-branch'),
       currentRepoLink: elRoot.getAttribute('data-current-repo-link'),
@@ -99,6 +101,7 @@ const sfc = {
       showTabBranches: shouldShowTabBranches,
       showTabTags: elRoot.getAttribute('data-show-tab-tags') === 'true',
       allowCreateNewRef: elRoot.getAttribute('data-allow-create-new-ref') === 'true',
+      showViewAllRefsEntry: elRoot.getAttribute('data-show-view-all-refs-entry') === 'true',
 
       enableFeed: elRoot.getAttribute('data-enable-feed') === 'true',
     };
@@ -281,6 +284,11 @@ export default sfc; // activate IDE's Vue plugin
       <div class="message" v-if="showNoResults">
         {{ textNoResults }}
       </div>
+      <template v-if="showViewAllRefsEntry">
+        <div class="divider tw-m-0"/>
+        <a v-if="selectedTab === 'branches'" class="item" :href="currentRepoLink + '/branches'">{{ textViewAllBranches }}</a>
+        <a v-if="selectedTab === 'tags'" class="item" :href="currentRepoLink + '/tags'">{{ textViewAllTags }}</a>
+      </template>
     </div>
   </div>
 </template>