From 6739b4f590440ec5323ebe89034190bd510cee87 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Thu, 7 Mar 2024 19:01:11 +0500
Subject: [PATCH 1/2] Update look of repo/org tabs on homepage

---
 options/locale/locale_en-US.ini             |  3 +--
 templates/user/dashboard/repolist.tmpl      |  4 ----
 web_src/js/components/DashboardRepoList.vue | 24 ++++++---------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 07ad19aa7..dcabf02ed 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -328,10 +328,9 @@ uname_holder = Username or Email address
 password_holder = Password
 switch_dashboard_context = Switch Dashboard Context
 my_repos = Repositories
+my_orgs = Organizations
 show_more_repos = Show more repositories…
 collaborative_repos = Collaborative Repositories
-my_orgs = My Organizations
-my_mirrors = My Mirrors
 view_home = View %s
 search_repos = Find a repository…
 filter = Other Filters
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl
index ed6f90682..0a8c0a2e0 100644
--- a/templates/user/dashboard/repolist.tmpl
+++ b/templates/user/dashboard/repolist.tmpl
@@ -5,10 +5,7 @@ const data = {
 	isMirrorsEnabled: {{.MirrorsEnabled}},
 	isStarsEnabled: {{not .IsDisableStars}},
 
-	textRepository: {{ctx.Locale.Tr "repository"}},
-	textOrganization: {{ctx.Locale.Tr "organization"}},
 	textMyRepos: {{ctx.Locale.Tr "home.my_repos"}},
-	textNewRepo: {{ctx.Locale.Tr "new_repo"}},
 	textSearchRepos: {{ctx.Locale.Tr "home.search_repos"}},
 	textFilter: {{ctx.Locale.Tr "home.filter"}},
 	textShowArchived: {{ctx.Locale.Tr "home.show_archived"}},
@@ -34,7 +31,6 @@ const data = {
 	textLastPage: {{ctx.Locale.Tr "admin.last_page"}},
 
 	textMyOrgs: {{ctx.Locale.Tr "home.my_orgs"}},
-	textNewOrg: {{ctx.Locale.Tr "new_org"}},
 
 	textOrgVisibilityLimited: {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}},
 	textOrgVisibilityPrivate: {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}},
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 6f742bbea..3ef1f0f93 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -340,21 +340,18 @@ export default sfc; // activate the IDE's Vue plugin
 </script>
 <template>
   <div>
-    <div v-if="!isOrganization" class="ui two item menu">
-      <a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{ textRepository }}</a>
-      <a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{ textOrganization }}</a>
+    <div v-if="!isOrganization" class="ui secondary stackable menu">
+      <a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{ textMyRepos }} <span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span></a>
+      <a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{ textMyOrgs }} <span class="ui grey label gt-ml-3">{{ organizationsTotalCount }}</span></a>
     </div>
     <div v-show="tab === 'repos'" class="ui tab active list dashboard-repos">
-      <h4 class="ui top attached header gt-df gt-ac">
+      <h4 v-if="isOrganization" class="ui top attached gt-mt-4 gt-df gt-ac">
         <div class="gt-f1 gt-df gt-ac">
           {{ textMyRepos }}
           <span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span>
         </div>
-        <a class="gt-df gt-ac muted" :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo">
-          <svg-icon name="octicon-plus"/>
-        </a>
       </h4>
-      <div class="ui attached segment repos-search">
+      <div class="ui top attached segment repos-search gt-rounded-top">
         <div class="ui fluid action left icon input" :class="{loading: isLoading}">
           <input type="search" spellcheck="false" maxlength="255" @input="changeReposFilter(reposFilter)" v-model="searchQuery" ref="search" @keydown="reposFilterKeyControl" :placeholder="textSearchRepos">
           <i class="icon"><svg-icon name="octicon-search" :size="16"/></i>
@@ -455,16 +452,7 @@ export default sfc; // activate the IDE's Vue plugin
       </div>
     </div>
     <div v-if="!isOrganization" v-show="tab === 'organizations'" class="ui tab active list dashboard-orgs">
-      <h4 class="ui top attached header gt-df gt-ac">
-        <div class="gt-f1 gt-df gt-ac">
-          {{ textMyOrgs }}
-          <span class="ui grey label gt-ml-3">{{ organizationsTotalCount }}</span>
-        </div>
-        <a class="gt-df gt-ac muted" v-if="canCreateOrganization" :href="subUrl + '/org/create'" :data-tooltip-content="textNewOrg">
-          <svg-icon name="octicon-plus"/>
-        </a>
-      </h4>
-      <div v-if="organizations.length" class="ui attached table segment gt-rounded-bottom">
+      <div v-if="organizations.length" class="ui attached table segment gt-rounded">
         <ul class="repo-owner-name-list">
           <li class="gt-df gt-ac gt-py-3" v-for="org in organizations" :key="org.name">
             <a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)">

From faa6cb62f723472ae26c91f23ff2d3783ebd6356 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Sun, 10 Mar 2024 19:32:58 +0500
Subject: [PATCH 2/2] Fix gaps for org homepage tabs

---
 web_src/css/dashboard.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 51ddd45e3..57ddb80bc 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -82,6 +82,14 @@
   padding-right: 0.5rem;
 }
 
+.dashboard .dashboard-navbar .right.menu {
+  gap: .35714286em;
+}
+
+.dashboard .dashboard-navbar .right.menu div.item {
+  padding-left: 0.5rem;
+}
+
 .dashboard .dashboard-navbar .org-visibility .label {
   margin-left: 5px;
 }