update navbar links

head_navbar: consider catppuccin themes when inverting the logo
update base tmpls for gitea 1.21
2023-09-02 23:04:20 +02:00 · 2023-09-02 22:05:18 +02:00 · 2023-09-02 22:02:19 +02:00 · 2023-02-22 23:22:17 +01:00 · 2023-02-22 16:59:36 +01:00 · 2023-02-18 01:35:35 +01:00
9 changed files with 252 additions and 164 deletions
--- a/custom/public/robots.txt
+++ b/custom/public/robots.txt
@ -1,16 +1,32 @@
 User-agent: MJ12bot
+
 Disallow: /


-User-agent: AdsBot-Google
+User-agent: AdsBot*
+
 Disallow: /


 User-agent: Mediapartners*
+
 Disallow: /


-User-agent: SemrushBot*
+User-agent: *SemrushBot*
+
+Disallow: /
+
+User-agent: BLEXBot
+
+Disallow: /
+
+User-agent: DataForSeoBot
+
+Disallow: /
+
+User-agent: PetalBot
+
 Disallow: /


@ -78,9 +94,6 @@ Disallow: /search
 Disallow: */search
 Disallow: /*q=
 Disallow: /*.atom
-Allow: /*/*/tree/master
-Allow: /*/*/tree/main
-Allow: /*/*/blob/master
-Allow: /*/*/blob/main
+Disallow: /assets/

-Crawl-delay: 1
+Crawl-delay: 3
--- a/custom/public/ssh-hostkeys.txt
+++ b/custom/public/ssh-hostkeys.txt
@ -1,8 +1,4 @@
 # git.dotya.ml
 SHA256:i6DvPgfdDa9vafcCYdsleV1v5P2WFPHrNt/eJWL1KTo (ED25519)
-SHA256:1ksd14LUKfLaRriGWt/zlfhetUUVv4cehIffK//iH6o (ECDSA)
-SHA256:2t/JTS5p/AGee3mj3DRCWVhnGAjxC67akaG+qE9J4cU (RSA)

 MD5:25:e6:59:33:f7:2c:f3:ce:ad:03:ef:81:4b:c1:b1:17 (ED25519)
-MD5:1d:d1:8b:51:cc:d2:08:19:51:1a:f8:20:66:55:07:fb (ECDSA)
-MD5:1b:95:d7:b7:01:19:ac:81:7d:71:cf:df:05:29:57:85 (RSA)
--- a/custom/templates/base/footer_content.tmpl
+++ b/custom/templates/base/footer_content.tmpl
@ -1,25 +1,30 @@
-<footer>
-	<div class="ui container">
-		<div class="ui left">
-			{{.i18n.Tr "powered_by" "Gitea"}} {{if (or .ShowFooterVersion .PageIsAdmin)}}{{.i18n.Tr "version"}}: {{AppVer}}{{end}} {{if ShowFooterTemplateLoadTime}}{{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong>{{end}}
-		</div>
-		<div class="ui right links">
-			{{if .ShowFooterBranding}}
-				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
+<footer class="page-footer" role="group" aria-label="{{.locale.Tr "aria.footer"}}">
+	<div class="left-links" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
+		<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
+		{{if (or .ShowFooterVersion .PageIsAdmin)}}
+			{{.locale.Tr "version"}}:
+			{{if .IsAdmin}}
+				<a href="/admin/config">{{AppVer}}</a>
+			{{else}}
+				{{AppVer}}
 			{{end}}
-			<div class="ui language bottom floating slide up dropdown link item">
-				{{svg "octicon-globe"}}
-				<div class="text">{{.LangName}}</div>
-				<div class="menu">
-					{{range .AllLangs}}
-						<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
-					{{end}}
-				</div>
+		{{end}}
+		{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
+			{{.locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
+			{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
+		{{end}}
+	</div>
+	<div class="right-links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
+		<div class="ui dropdown upward language">
+			<span class="flex-text-inline">{{svg "octicon-globe" 14}} {{.locale.LangName}}</span>
+			<div class="menu language-menu">
+				{{range .AllLangs}}
+					<a lang="{{.Lang}}" data-url="/?lang={{.Lang}}" class="item {{if eq $.locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
+				{{end}}
 			</div>
-			<a href="{{StaticUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
-			{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
-			{{template "custom/extra_links_footer" .}}
-			{{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}}
 		</div>
+		<a href="/assets/js/licenses.txt">{{.locale.Tr "licenses"}}</a>
+		{{if .EnableSwagger}}<a href="/api/swagger">API</a>{{end}}
+		{{template "custom/extra_links_footer" .}}
 	</div>
 </footer>
--- a/custom/templates/base/head_navbar.tmpl
+++ b/custom/templates/base/head_navbar.tmpl
@ -1,151 +1,205 @@
-<div class="ui container" id="navbar">
-	<div class="item brand" style="justify-content: space-between;">
-		<a href="{{AppSubUrl}}/">
-			<img class="ui mini image" src="{{StaticUrlPrefix}}/img/git.dotya.ml.svg" alt="git.dotya.ml icon">
+{{$notificationUnreadCount := 0}}
+{{if and .IsSigned .NotificationUnreadCount}}
+	{{$notificationUnreadCount = call .NotificationUnreadCount}}
+{{end}}
+
+<nav id="navbar" aria-label="{{.locale.Tr "aria.navbar"}}">
+	<div class="navbar-left ui secondary menu">
+		<!-- the logo -->
+		<a class="item" id="navbar-logo" href="/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
+			<img width="30" height="30" {{if .SignedUser}}{{if not (eq .SignedUser.Theme "arc-green" "42l-dark" "42l-light" "catppuccin-mocha-blue" "catppuccin-mocha-green")}}style="filter: invert(.9);"{{end}}{{else if not (eq DefaultTheme "arc-green" "42l-dark" "42l-light" "catppuccin-mocha-blue" "catppuccin-mocha-green")}}style="filter: invert(.9);"{{end}} src="/assets/img/logo.svg" alt="git.dotya.ml {{.locale.Tr "logo"}}" aria-hidden="true">
 		</a>
-		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
-			<i class="sidebar icon"></i>
+
+		<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
+		<div class="ui secondary menu item navbar-mobile-right">
+			{{if .IsSigned}}
+			<a id="mobile-notifications-icon" class="item gt-w-auto gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+				<div class="gt-relative">
+					{{svg "octicon-bell"}}
+					<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
+				</div>
+			</a>
+			{{end}}
+			<button class="item gt-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button>
 		</div>
+
+		<!-- navbar links non-mobile -->
+		{{if and .IsSigned .MustChangePassword}}
+			{{/* No links */}}
+		{{else if .IsSigned}}
+			{{if not .UnitIssuesGlobalDisabled}}
+				<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a>
+			{{end}}
+			{{if not .UnitPullsGlobalDisabled}}
+				<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a>
+			{{end}}
+			{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
+				{{if .ShowMilestonesDashboardPage}}
+					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a>
+				{{end}}
+			{{end}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+		{{else if .IsLandingPageOrganizations}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a>
+		{{else}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+		{{end}}
+
+		{{template "custom/extra_links" .}}
+
+		{{if not .IsSigned}}
+			<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.com">{{.locale.Tr "help"}}</a>
+		{{end}}
 	</div>
-	{{if and .IsSigned .MustChangePassword}}
-		{{/* No links */}}
-	{{else if .IsSigned}}
-		<a class="item {{if .PageIsDashboard}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
-		{{if not .UnitIssuesGlobalDisabled}}
-		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
-		{{end}}
-		{{if not .UnitPullsGlobalDisabled}}
-		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
-		{{end}}
-		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
-		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
-		{{end}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
-	{{else if .IsLandingPageHome}}
-		<a class="item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
-	{{else if .IsLandingPageExplore}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "home"}}</a>
-	{{else if .IsLandingPageOrganizations}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "home"}}</a>
-	{{end}}
-	{{template "custom/extra_links" .}}
-	{{/*
-		<div class="item">
-		<div class="ui icon input">
-		<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
-		<i class="search icon"></i>
-		</div>
-		</div>
-	*/}}
-	{{if and .IsSigned .MustChangePassword}}
-		<div class="right stackable menu">
-			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
-				<span class="text">
-					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
-					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
-					<span class="mobile-only">{{.SignedUser.Name}}</span>
-					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+
+	<!-- the full dropdown menus -->
+	<div class="navbar-right ui secondary menu">
+		{{if and .IsSigned .MustChangePassword}}
+			<div class="ui dropdown jump item" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}">
+				<span class="text gt-df gt-ac">
+					{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
+					<span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
+					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
-				<div class="menu user-menu" tabindex="-1">
+				<div class="menu user-menu">
 					<div class="ui header">
-						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+						{{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
+
 					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
-						{{svg "octicon-sign-out" 16}}
-						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
+						{{svg "octicon-sign-out"}}
+						{{.locale.Tr "sign_out"}}
 					</a>
 				</div><!-- end content avatar menu -->
 			</div><!-- end dropdown avatar menu -->
-		</div>
-	{{else if .IsSigned}}
-		<div class="right stackable menu">
-			<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
-				<span class="text">
-					<span class="fitted">{{svg "octicon-bell" 16}}</span>
-					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
-					{{$notificationUnreadCount := 0}}
-					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
-					<span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count">
-						{{$notificationUnreadCount}}
-					</span>
-				</span>
+		{{else if .IsSigned}}
+			{{if EnableTimetracking}}
+			<a class="active-stopwatch-trigger item gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{.locale.Tr "active_stopwatch"}}">
+				<div class="gt-relative">
+					{{svg "octicon-stopwatch"}}
+					<span class="header-stopwatch-dot"></span>
+				</div>
+				<span class="mobile-only gt-ml-3">{{.locale.Tr "active_stopwatch"}}</span>
 			</a>
-			<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
+			<div class="active-stopwatch-popup item tippy-target gt-p-3">
+				<div class="gt-df gt-ac">
+					<a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}">
+						{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
+						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
+						<span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
+						</span>
+					</a>
+					<form class="stopwatch-commit" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle">
+						{{.CsrfTokenHtml}}
+						<button
+							type="submit"
+							class="ui button mini compact basic icon"
+							data-tooltip-content="{{.locale.Tr "repo.issues.stop_tracking"}}"
+						>{{svg "octicon-square-fill"}}</button>
+					</form>
+					<form class="stopwatch-cancel" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
+						{{.CsrfTokenHtml}}
+						<button
+							type="submit"
+							class="ui button mini compact basic icon"
+							data-tooltip-content="{{.locale.Tr "repo.issues.cancel_tracking"}}"
+						>{{svg "octicon-trash"}}</button>
+					</form>
+				</div>
+			</div>
+			{{end}}
+
+			<a class="item not-mobile gt-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+				<div class="gt-relative">
+					{{svg "octicon-bell"}}
+					<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
+				</div>
+			</a>
+
+			<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{.locale.Tr "create_new"}}">
 				<span class="text">
-					<span class="fitted">{{svg "octicon-plus" 16}}</span>
-					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
-					<span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span>
+					{{svg "octicon-plus"}}
+					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
+					<span class="mobile-only">{{.locale.Tr "create_new"}}</span>
 				</span>
 				<div class="menu">
 					<a class="item" href="{{AppSubUrl}}/repo/create">
-						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
-					</a>
-					<a class="item" href="{{AppSubUrl}}/repo/migrate">
-						<span class="fitted">{{svg "octicon-repo-push" 16}}</span> {{.i18n.Tr "new_migrate"}}
+						{{svg "octicon-plus"}} {{.locale.Tr "new_repo"}}
 					</a>
+					{{if not .DisableMigrations}}
+						<a class="item" href="{{AppSubUrl}}/repo/migrate">
+							{{svg "octicon-repo-push"}} {{.locale.Tr "new_migrate"}}
+						</a>
+					{{end}}
 					{{if .SignedUser.CanCreateOrganization}}
 					<a class="item" href="{{AppSubUrl}}/org/create">
-						<span class="fitted">{{svg "octicon-organization" 16}}</span> {{.i18n.Tr "new_org"}}
+						{{svg "octicon-organization"}} {{.locale.Tr "new_org"}}
 					</a>
 					{{end}}
 				</div><!-- end content create new menu -->
 			</div><!-- end dropdown menu create new -->
-			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
-				<span class="text">
-					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
-					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
-					<span class="mobile-only">{{.SignedUser.Name}}</span>
-					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+
+			<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}">
+				<span class="text gt-df gt-ac">
+					{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
+					<span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
+					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
-				<div class="menu user-menu" tabindex="-1">
+				<div class="menu user-menu">
 					<div class="ui header">
-						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+						{{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
+
 					<div class="divider"></div>
-					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
-						{{svg "octicon-person" 16}}
-						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
+					<a class="item" href="{{.SignedUser.HomeLink}}">
+						{{svg "octicon-person"}}
+						{{.locale.Tr "your_profile"}}
 					</a>
-					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
-						{{svg "octicon-star" 16}}
-						{{.i18n.Tr "your_starred"}}
+					{{if not .DisableStars}}
+						<a class="item" href="{{.SignedUser.HomeLink}}?tab=stars">
+							{{svg "octicon-star"}}
+							{{.locale.Tr "your_starred"}}
+						</a>
+					{{end}}
+					<a class="item" href="{{AppSubUrl}}/notifications/subscriptions">
+						{{svg "octicon-bell"}}
+						{{.locale.Tr "notification.subscriptions"}}
 					</a>
-					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
-						{{svg "octicon-tools" 16}}
-						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
+					<a class="{{if .PageIsUserSettings}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
+						{{svg "octicon-tools"}}
+						{{.locale.Tr "your_settings"}}
 					</a>
-					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
-						{{svg "octicon-question" 16}}
-						{{.i18n.Tr "help"}}<!-- Help -->
+					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.com">
+						{{svg "octicon-question"}}
+						{{.locale.Tr "help"}}
 					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>
-						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
-							<i class="icon settings"></i>
-							{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
+
+						<a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
+							{{svg "octicon-server"}}
+							{{.locale.Tr "admin_panel"}}
 						</a>
 					{{end}}
+
 					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
-						{{svg "octicon-sign-out" 16}}
-						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
+						{{svg "octicon-sign-out"}}
+						{{.locale.Tr "sign_out"}}
 					</a>
 				</div><!-- end content avatar menu -->
 			</div><!-- end dropdown avatar menu -->
-		</div><!-- end signed user right menu -->
-	{{else}}
-		<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.i18n.Tr "help"}}</a>
-		<div class="right stackable menu">
+		{{else}}
 			{{if .ShowRegistrationButton}}
 				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-					{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
+					{{svg "octicon-person"}} {{.locale.Tr "register"}}
 				</a>
 			{{end}}
-			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
-				{{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}}
+			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
+				{{svg "octicon-sign-in"}} {{.locale.Tr "sign_in"}}
 			</a>
-		</div><!-- end anonymous right menu -->
-	{{end}}
-</div>
+		{{end}}
+	</div><!-- end full right menu -->
+</nav>
--- a/custom/templates/custom/extra_links.tmpl
+++ b/custom/templates/custom/extra_links.tmpl
@ -1,5 +1,25 @@
 {{if .IsSigned}}
-<a class="item " href="https://drone.dotya.ml/" target="_blank" rel="noopener">Drone CI</a>
-<a class="item " href="https://docs.gitea.io/" target="_blank" rel="noopener">Gitea Help</a>
-<a class="item " href="https://git-scm.com/docs" target="_blank" rel="noopener">Git Help</a>
+<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="Moar...">
+	<span class="text">
+		<span class="not-mobile">Moar {{svg "octicon-triangle-down"}}</span>
+		<span class="mobile-only">Moar</span>
+	</span>
+	<div class="menu">
+		<a class="item " href="https://drone.dotya.ml/" target="_blank" rel="noopener">Drone CI</a>
+		<a class="item " href="https://docs.dotya.ml/" target="_blank" rel="noopener">Docs</a>
+		<a class="item " href="https://grafana.dotya.ml/" target="_blank" rel="noopener">Grafana</a>
+		<a class="item " href="https://searxng.dotya.ml/" target="_blank" rel="noopener">SearXNG</a>
+		<a class="item " href="https://dotya.ml/about/" target="_blank" rel="noopener">About...</a>
+		<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="Help...">
+			<span class="text">
+				<span class="not-mobile">Help {{svg "octicon-triangle-right"}}</span>
+				<span class="mobile-only">Help</span>
+			</span>
+			<div class="menu">
+				<a class="item " href="https://docs.gitea.io/" target="_blank" rel="noopener">Gitea Help</a>
+				<a class="item " href="https://git-scm.com/docs" target="_blank" rel="noopener">Git Help</a>
+			</div>
+		</div>
+	</div>
+</div>
 {{end}}
--- a/custom/templates/custom/extra_links_footer.tmpl
+++ b/custom/templates/custom/extra_links_footer.tmpl
@ -1,5 +1,5 @@
-<a href="/ssh-hostkeys.txt" rel="noreferer">hostkeys</a>
+<a href="/assets/ssh-hostkeys.txt" rel="noreferer">hostkeys</a>
 <a href="https://status.dotya.ml/" rel="noopener">Status</a>
 <a href="/dotya.ml" rel="noopener">&#183; dotya.ml &#183;</a>
 <a href="https://dotya.ml/contact/" rel="noopener">Contact</a>
-<a href="/0DD13DBC6B5433D3.asc" title="default signing key" rel="noopener">0DD13DBC6B5433D3</a>
+<a href="/assets/0DD13DBC6B5433D3.asc" title="default signing key" rel="noopener">0DD13DBC6B5433D3</a>
--- a/custom/templates/home.tmpl
+++ b/custom/templates/home.tmpl
@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="home">
+<div role="main" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}" class="page-content home">
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div class="hero">
@ -13,15 +13,15 @@
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="eight wide center column">
 			<h1 class="hero ui icon header">
-				{{svg "octicon-git-merge" 16}} Code with us
+				{{svg "octicon-git-merge"}} Code with us
 			</h1>
 			<p class="large">
-				This is a good place to host your code and start collaborating with like-minded people. Log in with <a href="https://git.dotya.ml/user/oauth2/GitHub/">GitHub</a> {{svg "octicon-mark-github" 16}} if you like.
+				This is a good place to host your code and start collaborating with like-minded people. Log in with <a href="https://git.dotya.ml/user/oauth2/GitHub/">GitHub</a> {{svg "octicon-mark-github"}} if you like.
 			</p>
 		</div>
 		<div class="eight wide center column">
 			<h1 class="hero ui icon header">
-				{{svg "octicon-ruby" 16}} No Bloat
+				{{svg "octicon-ruby"}} No Bloat
 			</h1>
 			<p class="large">
 				No nonsense. No tracking or analysing of your patterns. Just Gitea (tbh even that should be called bloat, it's too good)
@ -31,7 +31,7 @@
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="eight wide center column">
 			<h1 class="hero ui icon header">
-				{{svg "octicon-verified" 16}} Libre Software
+				{{svg "octicon-verified"}} Libre Software
 			</h1>
 			<p class="large">
 				This service is only possible thanks to several projects of the <a href="https://www.gnu.org/philosophy/free-sw.en.html" target="_blank" rel="noopener">Free Software</a> community. We encourage you to contribute back, too. Knowledge is light. Share it.
@ -39,10 +39,10 @@
 		</div>
 		<div class="eight wide center column">
 			<h1 class="hero ui icon header">
-				{{svg "octicon-info" 16}} Any questions?
+				{{svg "octicon-info"}} Any questions?
 			</h1>
 			<p class="large">
-				Don't hesitate and <a href="https://dotya.ml/contact/">ask us</a> directly.<br>btw we run <a href="https://archlinux.org/" target="_blank" rel="noopener">Arch</a>
+				Don't hesitate and <a href="https://dotya.ml/contact/">ask us</a> directly.<br>we use <a href="https://archlinux.org/" target="_blank" rel="noopener">arch</a> <a href="https://i.redd.it/mfrfqy66ey311.jpg" target="_blank" rel="noopener">btw</a>
 			</p>
 		</div>
 	</div>
--- a/custom/templates/pwa/manifest_json.tmpl
+++ b/custom/templates/pwa/manifest_json.tmpl
@ -3,29 +3,28 @@
    "name": "git.dotya.ml",
    "icons": [
      {
-        "src": "{{StaticUrlPrefix}}/img/gitea-lg.png",
+        "src": "/assets/img/gitea-lg.png",
        "type": "image/png",
        "sizes": "880x880"
      },
      {
-        "src": "{{StaticUrlPrefix}}/img/gitea-sm.png",
+        "src": "/assets/img/gitea-sm.png",
        "type": "image/png",
        "sizes": "120x120"
      },
      {
-        "src": "{{StaticUrlPrefix}}/img/gitea-512.png",
+        "src": "/assets/img/gitea-512.png",
        "type": "image/png",
        "sizes": "512x512"
      },
      {
-        "src": "{{StaticUrlPrefix}}/img/gitea-192.png",
+        "src": "/assets/img/gitea-192.png",
        "type": "image/png",
        "sizes": "192x192"
      }
    ],
-    "start_url": "{{AppSubUrl}}/",
-    "scope": "{{AppSubUrl}}/",
+    "start_url": "/",
+    "scope": "/",
    "background_color": "#FAFAFA",
    "display": "standalone",
-    "theme_color": "{{ThemeColorMetaTag}}"
  }
--- a/custom/templates/repo/issue/comment_tab.tmpl
+++ b/custom/templates/repo/issue/comment_tab.tmpl
@ -5,15 +5,16 @@
 <div class="field">
 	<div class="ui bottom active tab" data-tab="write">
 		<textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}">
-{{if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end}}</textarea>
+			{{- if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end -}}
+		</textarea>
 	</div>
-	<div class="ui bottom tab markdown" data-tab="preview">
+	<div class="ui bottom tab markup" data-tab="preview">
 		{{.i18n.Tr "loading"}}
 	</div>
 </div>
 {{if .IsAttachmentEnabled}}
-<div class="field">
-	<div class="files"></div>
-	<div class="ui dropzone" id="dropzone" data-upload-url="/attachments" data-accepts="{{.AttachmentAllowedTypes}}" data-max-file="{{.AttachmentMaxFiles}}" data-max-size="{{.AttachmentMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
-</div>
+	<div class="field">
+		<div class="files"></div>
+		{{template "repo/upload" .}}
+	</div>
 {{end}}
Author	SHA1	Message	Date
surtur	286dbdbed7	update navbar links	2023-09-02 23:04:20 +02:00
surtur	4732c84ed5	head_navbar: consider catppuccin themes when inverting the logo	2023-09-02 22:05:18 +02:00
surtur	e9bc081c16	update base tmpls for gitea 1.21	2023-09-02 22:02:19 +02:00
leo	4ac7ef8793	head_navbar: integrate tmpl changes	2023-02-22 23:22:17 +01:00
surtur	ed02e60819	home.tmpl: add btw	2023-02-22 16:59:36 +01:00
leo	e5b6e46953	navbar,footer,home: integrate tmpl changes	2023-02-18 01:35:35 +01:00
leo	ec92df277a	navbar,footer: integrate tmpl changes 2b1e47e2a2	2023-01-29 23:40:11 +01:00
leo	5c99eaff91	fix forgotten i18n -> locale conversion	2023-01-29 23:37:05 +01:00
leo	e39959cb91	chore: update templates as per upstream changes	2023-01-18 17:59:59 +01:00
surtur	ecfdb0857d	hostkeys: only expose and use ed25519 type key	2022-09-21 12:09:59 +03:00
surtur	26918dc5cb	all: disallow /assets/ as per dotya.ml/community#49	2022-08-30 13:52:20 +02:00
surtur	c5514a3b0a	foorter_content: integrate tmpl changes 20b3a90450 refs: `bbce94ee91` `bbce94ee91` https://github.com/go-gitea/gitea/issues/20777	2022-08-18 16:07:16 +02:00
surtur	553f8a62ee	footer_content: integrate tmpl changes d55a0b7238 this commit is a little overdue as these changes should have been introduced earlier. fortunately, the absence of this didn't cause any serious issues, only some footer labels have been missing text. fixed now. follow-up of: `c5609d7f74` refs: `d55a0b7238` `d55a0b7238` https://github.com/go-gitea/gitea/pull/20153	2022-07-19 12:07:13 +02:00
surtur	3ad70c0ad5	head_navbar: integrate tmpl changes (a168609e84) refs: `a168609e84` `a168609e84` https://github.com/go-gitea/gitea/issues/20236	2022-07-05 13:29:47 +02:00
surtur	a476acd0f2	head_navbar: integrate tmpl changes (c174bdc494) refs: `c174bdc494` `c174bdc494` https://github.com/go-gitea/gitea/issues/20108	2022-07-05 12:00:49 +02:00
surtur	c5609d7f74	head_navbar: integrate tmpl changes (d55a0b7238) refs: `d55a0b7238` `d55a0b7238` https://github.com/go-gitea/gitea/pull/20153	2022-06-29 17:31:50 +02:00
surtur	fbd54a038b	robots: add PetalBot to blocklist	2022-06-15 01:29:38 +02:00
surtur	27dc6198ed	robots: add DataForSeoBot to blocklist	2022-06-15 01:10:01 +02:00
surtur	0e596da80f	robots: add BLEXBot to blocklist	2022-06-14 12:31:52 +02:00
surtur	d210e30aea	robots: increase global Crawl-delay to 3s	2022-06-14 12:31:05 +02:00
surtur	b27e152bc8	head_navbar: integrate tmpl changes (0d7eda511f) also fix a typo (alt expression not being fully enclosed in "", see L4) introduced in `c423cfac97` refs: `0d7eda511f` `0d7eda511f` https://github.com/go-gitea/gitea/pull/19955	2022-06-14 12:06:04 +02:00
surtur	c423cfac97	head_navbar: integrate tmpl changes (73382d2132) refs: `73382d2132` `73382d2132`	2022-06-06 12:52:17 +02:00
surtur	326fac650e	head_navbar: integrate tmpl changes (9da3d78e74) refs: `9da3d78e74` https://github.com/go-gitea/gitea/pull/19763	2022-05-20 13:32:07 +02:00
surtur	1045285663	integrate footer_content.tmpl upstream changes refs: `a60e8be8d1 (diff-8f6971a0d1b1ce101dd8e90c68e590e7a23f52da)` `e0688995ef (diff-8f6971a0d1b1ce101dd8e90c68e590e7a23f52da)` `395117d301 (diff-8f6971a0d1b1ce101dd8e90c68e590e7a23f52da)`	2022-05-11 11:32:53 +02:00
surtur	aa9ee5f768	head_navbar: integrate tmpl changes (6874fe90e5)	2021-11-18 11:16:23 +01:00
surtur	fe2eed9ed0	head_navbar: integrate tmpl changes (bbffcc3aec) ref: https://github.com/go-gitea/gitea/pull/17551 `bbffcc3aec` `bbffcc3aec`	2021-11-17 18:23:55 +01:00
surtur	f13bb0434b	head_navbar: integrate upstream tmpl changes ref: https://github.com/go-gitea/gitea/pull/17451	2021-10-28 12:35:38 +02:00
surtur	e53748c078	robots: match moar botz;disallow direct tree scans	2021-10-08 20:11:18 +02:00
surtur	144cf942ec	head_navbar: integrate upstream tmpl changes ref: https://github.com/go-gitea/gitea/issues/16844 `48c2578bd8` `48c2578bd8` ref: https://github.com/go-gitea/gitea/issues/17235 `21a784e94a` `21a784e94a`	2021-10-08 20:11:18 +02:00
surtur	3fe18d720e	chore: comment tmpl consolidation as per upstream + fix indentation	2021-10-08 15:55:17 +02:00
surtur	1d3bc812d1	chore: path changes in extra_links_footer.tmpl another late follow-up of `4005d6388b`	2021-10-08 15:54:05 +02:00
surtur	993fc24802	chore: asset path changes in manifest_json.tmpl a late follow-up of `4005d6388b`	2021-10-08 15:51:41 +02:00
surtur	b0713f4c69	chore: fix a typo	2021-10-08 15:48:11 +02:00
surtur	61840db308	chore: indent properly	2021-10-08 15:47:58 +02:00
surtur	d89b710eb2	chore: icon rename/png -> svg	2021-10-08 15:47:32 +02:00
surtur	10824b15d7	chore: separate the blocks with newlines	2021-10-08 15:46:27 +02:00
surtur	a0ef6b3fb1	fix the logo contrast issue now the color is automatically inverted based on the currently set theme (which may or may not be changed by the user)	2021-10-08 15:43:38 +02:00
surtur	4005d6388b	chore: integrate template change for assets ref: * `1e877613bf` * `1e877613bf` * https://github.com/go-gitea/gitea/issues/15219	2021-04-28 22:14:44 +02:00
surtur	baafb38690	chore: integrate template change refs: * `f44543a1bb` * `f44543a1bb` * https://github.com/go-gitea/gitea/issues/14653	2021-04-15 23:02:32 +02:00
dalahast	8ad2672dbe	Merge pull request 'Invert logo colour based on current theme' (#9 ) from dynamic-logo-color into master Reviewed-on: #9 Reviewed-by: dalahast <dalahast@noreply.git.dotya.ml>	2021-01-22 16:37:17 +01:00
surtur	2db5a009fe	chore: invert logo colour based on current theme	2021-01-22 13:58:23 +01:00
dalahast	9d636353d6	Merge pull request 'chore: updated tmpl as per upstream timetracking PR merge' (#8 ) from issue-timetracking into master Reviewed-on: #8 Reviewed-by: dalahast <dalahast@noreply.git.dotya.ml>	2021-01-21 21:05:52 +01:00
surtur	a671855066	chore: updated tmpl as per upstream * head_navbar got updated in so we're including the thing reference: `b5570d3e68` `b5570d3e68`	2021-01-21 19:23:51 +01:00
surtur	961490e565	chore: follow-up of `380239d471`	2020-12-27 16:06:18 +01:00
surtur	380239d471	chore: bring upstream changes to head_navbar.tmpl	2020-12-27 15:42:50 +01:00
surtur	f2b5a73638	chore: update as per upstream * PR: https://github.com/go-gitea/gitea/pull/13649 * commit: `9269a038a4`	2020-12-04 00:23:28 +01:00
wanderer	236c803042	use relative url paths for samesite links (#7 ) chore: a take on head_navbar links chore: a take on base/footer_content.tmpl chore: a take on pwa/manifest_json.tmpl * since it's not a true offline-capable PWA, this should not break anything (network requests are still sent out) but hey, who knows really Co-authored-by: surtur <a_mirre@utb.cz> Reviewed-on: #7 Reviewed-by: dalahast <dalahast@noreply.git.dotya.ml> Co-Authored-By: wanderer <wanderer@noreply.git.dotya.ml> Co-Committed-By: wanderer <wanderer@noreply.git.dotya.ml>	2020-12-01 14:29:21 +01:00
surtur	6e3ccda244	chore: add class as per recent upstream change * https://github.com/go-gitea/gitea/pull/13766 * `b1cf7f4df1`	2020-12-01 11:38:12 +01:00