Gitea: Update templates

Gitea: Add more custom image files
Gitea: Rename logo.svg
2021-07-13 14:46:12 +02:00 · 2021-07-13 14:46:01 +02:00 · 2021-07-13 14:35:30 +02:00 · 2021-07-12 23:00:07 +02:00 · 2021-07-12 18:27:17 +02:00 · 2021-07-12 18:27:06 +02:00
12 changed files with 122 additions and 39 deletions
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="1000" height="1000" fill="#F2F2F2"/>
+    <g transform="translate(50 50)">
+      <path fill="#F4B971" d="M532.39558,0.513361863 C556.792922,4.95668696 580.514429,11.3375464 603.394857,19.4906959 L589.844829,163.244927 C603.244149,169.791759 616.116675,177.250098 628.381657,185.539193 L746.039895,101.972551 C764.7269,117.883615 782.116385,135.2731 798.027449,153.960105 L714.460807,271.618343 C722.749902,283.883325 730.208241,296.755851 736.755073,310.155171 L880.50942,296.605469 C888.662498,319.485749 895.043308,343.207097 899.486611,367.604271 L768.201816,427.753794 C768.708159,435.103505 768.965517,442.521698 768.965517,450 C768.965517,457.478302 768.708159,464.896495 768.201816,472.246206 L899.486638,532.39558 C895.043313,556.792922 888.662454,580.514429 880.509304,603.394857 L736.755073,589.844829 C730.208241,603.244149 722.749902,616.116675 714.460807,628.381657 L798.027449,746.039895 C782.116385,764.7269 764.7269,782.116385 746.039895,798.027449 L628.381657,714.460807 C616.116675,722.749902 603.244149,730.208241 589.844829,736.755073 L603.394857,880.509304 C580.514429,888.662454 556.792922,895.043313 532.39558,899.486638 L472.246206,768.201816 C466.627802,768.588884 460.969379,768.830454 455.274678,768.922785 L450,768.965517 C442.521698,768.965517 435.103505,768.708159 427.753794,768.201816 L367.604271,899.486611 C343.207097,895.043308 319.485749,888.662498 296.605469,880.50942 L310.155171,736.755073 C296.755851,730.208241 283.883325,722.749902 271.618343,714.460807 L153.960105,798.027449 C135.2731,782.116385 117.883615,764.7269 101.972551,746.039895 L185.539193,628.381657 C177.250098,616.116675 169.791759,603.244149 163.244927,589.844829 L19.4906959,603.394857 C11.3375464,580.514429 4.95668696,556.792922 0.513361863,532.39558 L131.798184,472.246206 C131.291841,464.896495 131.034483,457.478302 131.034483,450 C131.034483,442.521698 131.291841,435.103505 131.798184,427.753794 L0.513388934,367.604271 C4.95669181,343.207097 11.3375024,319.485749 19.4905799,296.605469 L163.244927,310.155171 C169.791759,296.755851 177.250098,283.883325 185.539193,271.618343 L101.971703,153.961102 C117.883279,135.273386 135.273386,117.883279 153.961102,101.971703 L271.618343,185.539193 C283.883325,177.250098 296.755851,169.791759 310.155171,163.244927 L296.605469,19.4905799 C319.485749,11.3375024 343.207097,4.95669181 367.604271,0.513388934 L427.753794,131.798184 C435.103505,131.291841 442.521698,131.034483 450,131.034483 C457.478302,131.034483 464.896495,131.291841 472.246206,131.798184 L532.39558,0.513361863 Z M450,191.37931 C307.167737,191.37931 191.37931,307.167737 191.37931,450 C191.37931,592.832263 307.167737,708.62069 450,708.62069 C592.832263,708.62069 708.62069,592.832263 708.62069,450 C708.62069,307.167737 592.832263,191.37931 450,191.37931 Z"/>
+      <polygon stroke="#0BB888" stroke-width="51.724" points="450 312.069 569.452 381.034 569.452 518.966 450 587.931 330.548 518.966 330.548 381.034"/>
+      <circle cx="450.001" cy="450" r="286.207" stroke="#ED8F1B" stroke-width="106.897"/>
+    </g>
+  </g>
+</svg>
@@ -1,3 +1,6 @@
+{{/* Template last updated based on:
+     commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+     date:   2021-07-12 */}}
 <footer>
 	<div class="ui container">
 		<div class="ui left">
@@ -5,14 +8,14 @@
 		</div>
 		<div class="ui right links">
 			{{if .ShowFooterBranding}}
-				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
+				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
-				<i class="world icon"></i>
+				{{svg "octicon-globe"}}
 				<div class="text">{{.LangName}}</div>
-				<div class="menu">
+				<div class="menu language-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>
+						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
 					{{end}}
 				</div>
 			</div>
@@ -1,7 +1,10 @@
+{{/* Template last updated based on:
+     commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+     date:   2021-07-12 */}}
 <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/codesignd.svg">
+			<img class="ui mini image" width="30" height="30" src="{{StaticUrlPrefix}}/img/logo.svg">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -33,11 +36,11 @@

 	{{template "custom/extra_links" .}}

-	{{/*
+	{{/* TODO
 		<div class="item">
 		<div class="ui icon input">
 		<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
-		<i class="search icon"></i>
+		<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
 		</div>
 		</div>
 	*/}}
@@ -47,10 +50,10 @@
 		<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}}">
+					{{avatar .SignedUser 24 "tiny"}}
 					<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>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
@@ -59,7 +62,7 @@

 					<div class="divider"></div>
 					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
-						{{svg "octicon-sign-out" 16}}
+						{{svg "octicon-sign-out"}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
@@ -67,9 +70,47 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
+			{{$issueURL := Printf "%s/%s/issues/%d" AppSubUrl .ActiveStopwatch.RepoSlug .ActiveStopwatch.IssueIndex}}
+			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{$issueURL}}">
+				<span class="text">
+					<span class="fitted item">
+						{{svg "octicon-stopwatch"}}
+						<span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
+					</span>
+					<span class="sr-mobile-only">{{.i18n.Tr "active_stopwatch"}}</span>
+				</span>
+			</a>
+			<div class="ui popup very wide">
+				<div class="df ac">
+					<a class="stopwatch-link df ac" href="{{$issueURL}}">
+						{{svg "octicon-issue-opened"}}
+						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
+						<span class="ui label blue stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
+						</span>
+					</a>
+					<form class="stopwatch-commit" method="POST" action="{{$issueURL}}/times/stopwatch/toggle">
+						{{.CsrfTokenHtml}}
+						<button
+							class="ui button mini compact basic icon fitted poping up"
+							data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
+							data-position="top right" data-variation="small inverted"
+						>{{svg "octicon-square-fill"}}</button>
+					</form>
+					<form class="stopwatch-cancel" method="POST" action="{{$issueURL}}/times/stopwatch/cancel">
+						{{.CsrfTokenHtml}}
+						<button
+							class="ui button mini compact basic icon fitted poping up"
+							data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
+							data-position="top right" data-variation="small inverted"
+						>{{svg "octicon-trash"}}</button>
+					</form>
+				</div>
+			</div>
+
 			<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="fitted">{{svg "octicon-bell"}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
 					{{$notificationUnreadCount := 0}}
 					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
@@ -81,20 +122,22 @@

 			<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
 				<span class="text">
-					<span class="fitted">{{svg "octicon-plus" 16}}</span>
+					<span class="fitted">{{svg "octicon-plus"}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
-					<span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span>
+					<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu">
 					<a class="item" href="{{AppSubUrl}}/repo/create">
-						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
+						<span class="fitted">{{svg "octicon-plus"}}</span> {{.i18n.Tr "new_repo"}}
 					</a>
+					{{if not .DisableMigrations}}
 						<a class="item" href="{{AppSubUrl}}/repo/migrate">
-						<span class="fitted">{{svg "octicon-repo-clone" 16}}</span> {{.i18n.Tr "new_migrate"}}
+							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.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"}}
+						<span class="fitted">{{svg "octicon-organization"}}</span> {{.i18n.Tr "new_org"}}
 					</a>
 					{{end}}
 				</div><!-- end content create new menu -->
@@ -102,10 +145,10 @@

 			<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}}">
+					{{avatar .SignedUser 24 "tiny"}}
 					<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>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
@@ -114,33 +157,35 @@

 					<div class="divider"></div>
 					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
-						{{svg "octicon-person" 16}}
+						{{svg "octicon-person"}}
 						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
 					</a>
+					{{if not .DisableStars}}
 						<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
-						{{svg "octicon-star" 16}}
+							{{svg "octicon-star"}}
 							{{.i18n.Tr "your_starred"}}
 						</a>
+					{{end}}
 					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
-						{{svg "octicon-settings" 16}}
+						{{svg "octicon-tools"}}
 						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 					</a>
 					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
-						{{svg "octicon-question" 16}}
+						{{svg "octicon-question"}}
 						{{.i18n.Tr "help"}}<!-- Help -->
 					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>

 						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
-							<i class="icon settings"></i>
+							{{svg "octicon-server"}}
 							{{.i18n.Tr "admin_panel"}}<!-- 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}}
+						{{svg "octicon-sign-out"}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
@@ -150,11 +195,11 @@
 		<div class="right stackable menu">
 			{{if .ShowRegistrationButton}}
 				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-					{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
+					{{svg "octicon-person"}} {{.i18n.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"}}
+				{{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}}
 			</a>
 		</div><!-- end anonymous right menu -->
 	{{end}}
@@ -1,6 +1,6 @@
 ; Config last updated based on:
-;  commit: bcb722daec4bdd45303da97173a2b8a3c4c95dcd
-;  date:   2020-01-19
+;  commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+;  date:   2021-07-12

 APP_NAME = codesignd Git
 RUN_USER = {{ ansible_facts.user_id }}
@@ -67,6 +67,11 @@ COOKIE_SECURE = true
 [ui]
 THEME_COLOR_META_TAG = `#eb8e2e`

+[ui.meta]
+AUTHOR = codesignd, Lukas Bestle
+DESCRIPTION = Self-hosted Git repositories of codesignd, Lukas Bestle
+KEYWORDS = "codesignd, git"
+
 [other]
 SHOW_FOOTER_BRANDING           = false
 SHOW_FOOTER_VERSION            = false
@@ -13,3 +13,6 @@
    state: latest
    path: "{{ ansible_facts.env.HOME}}/.linuxbrew/bin"
    update_homebrew: yes
+  tags:
+  - gitea-update
+  - radicale-update
@@ -26,7 +26,7 @@ if ( $EXT )
 }

 # check if the spam score is higher than our threshold
-if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/ )
+if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/:h )
 {
  # yes, move to Spam folder and exit

@@ -6,17 +6,22 @@ MAILDIR="$HOME/users/lukas" # default Maildir

 if ( $MAILDIR =~ /\/lukas$/ )
 {
-  # deliver GitHub notifications to the Kirby folders
+  # deliver Nolt and GitHub notifications to the Kirby folders

  `test -d "$MAILDIR/.Kirby2"; or maildirmake "$MAILDIR/.Kirby2"`
  `test -d "$MAILDIR/.Kirby3"; or maildirmake "$MAILDIR/.Kirby3"`

-  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\// )
+  if( /^From: .*? <notifications@nolt\.io>$/:h)
+  {
+    MAILDIR="$MAILDIR/.Kirby3"
+  }
+
+  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\//:h )
  {
    MAILDIR="$MAILDIR/.Kirby2"
  }

-  if( /^List-Archive: https:\/\/github.com\/getkirby\// )
+  if( /^List-Archive: https:\/\/github.com\/getkirby\//:h )
  {
    MAILDIR="$MAILDIR/.Kirby3"
  }
@@ -118,3 +118,12 @@
 - name: Enable PHP error log
  command: uberspace web log php_error enable
  when: "'is enabled' not in uberspace_log_php_error_status_result.stdout"
+
+- name: Check if the 500 error page is disabled
+  command: uberspace web errorpage 500 status
+  register: uberspace_error_page_500_status_result
+  changed_when: no
+  
+- name: Disable 500 error page
+  command: uberspace web errorpage 500 disable
+  when: "'is disabled' not in uberspace_error_page_500_status_result.stdout"
@@ -39,8 +39,9 @@ web_sites:
    lukasbestle: https://git.codesignd.com/sites/lukasbestle.com.git
    codesignd: null
  cddweb2:
-    shareable: null
    cdn: null
+    shareable: null
+    test: null

 # Domain links to set up per host
 web_links:
@@ -68,3 +69,5 @@ web_links:
      path: data/files
    cdn.codesignd.net:
      site: cdn
+    test.codesignd.de:
+      site: test
Author	SHA1	Message	Date
lukas	32d435b851	Gitea: Update templates	2021-07-13 14:46:12 +02:00
lukas	5e775b35c6	Gitea: Add more custom image files	2021-07-13 14:46:01 +02:00
lukas	46272cc3fb	Gitea: Rename logo.svg	2021-07-13 14:35:30 +02:00
lukas	f366345ac8	Update Gitea config and templates	2021-07-12 23:00:07 +02:00
lukas	513ef339ee	New testing site	2021-07-12 18:27:17 +02:00
lukas	8aad9019a2	Disable HTTP 500 error pages on web Uberspaces	2021-07-12 18:27:06 +02:00
lukas	aa1f5caa70	Run brew update before upgrading	2020-11-22 16:59:02 +01:00
lukas	633d9b0889	Add mailfilter for Nolt notifications	2020-10-08 22:07:00 +02:00
lukas	864c7c3ec8	Mailfilters: Only match regexes in headers	2020-10-08 22:06:51 +02:00