From b2d9c2e2d6ac363c0b8faf827dbb9138a2be7290 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 9 Dec 2021 09:55:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=90=9C=E7=B4=A2,=E9=BB=98=E8=AE=A4=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base/head_navbar.tmpl | 12 +- templates/base/head_navbar_fluid.tmpl | 4 +- templates/base/head_navbar_home.tmpl | 4 +- templates/base/head_navbar_pro.tmpl | 216 ++++++++++++++++++++++++++++++++++ templates/base/head_pro.tmpl | 208 ++++++++++++++++++++++++++++++++ templates/explore/repos.tmpl | 2 +- 6 files changed, 436 insertions(+), 10 deletions(-) create mode 100644 templates/base/head_navbar_pro.tmpl create mode 100644 templates/base/head_pro.tmpl diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index c87524afb..c475faaf6 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -17,7 +17,7 @@ {{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -47,7 +47,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   @@ -94,13 +94,14 @@ */}} {{if .IsSigned}} -
+
+ sss{{$.SortType}}}}
- + @@ -190,12 +191,13 @@
+
- + diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl index d323d2151..deecc3bf2 100644 --- a/templates/base/head_navbar_fluid.tmpl +++ b/templates/base/head_navbar_fluid.tmpl @@ -17,7 +17,7 @@ {{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -46,7 +46,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl index 096722bf6..7a5258168 100644 --- a/templates/base/head_navbar_home.tmpl +++ b/templates/base/head_navbar_home.tmpl @@ -9,7 +9,7 @@
{{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -38,7 +38,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl new file mode 100644 index 000000000..561a49cd7 --- /dev/null +++ b/templates/base/head_navbar_pro.tmpl @@ -0,0 +1,216 @@ + diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl new file mode 100644 index 000000000..0b92016d1 --- /dev/null +++ b/templates/base/head_pro.tmpl @@ -0,0 +1,208 @@ + + + + + + + {{if .Title}}{{.Title}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}} + + {{if UseServiceWorker}} + + {{else}} + + {{end}} + + + + + + + {{if .IsSigned}} + + {{end}} + {{if .ContextUser}} + + {{end}} + {{if .SearchLimit}} + + {{end}} +{{if .GoGetImport}} + + +{{end}} + + + + + + + + +{{if .RequireSimpleMDE}} + +{{end}} + +{{if .RequireTribute}} + +{{end}} + + + +{{if .RequireMinicolors}} + +{{end}} + +{{if .PageIsUserProfile}} + + + + + {{if .Owner.Description}} + + {{end}} +{{else if .Repository}} + {{if .Issue}} + + + {{if .Issue.Content}} + + {{end}} + {{else}} + + + {{if .Repository.Description}} + + {{end}} + {{end}} + + +{{else}} + + + + + +{{end}} + +{{if .IsSigned }} + {{ if ne .SignedUser.Theme "gitea" }} + + {{end}} +{{else if ne DefaultTheme "gitea"}} + +{{end}} +{{template "custom/header" .}} + + + + + + + {{template "custom/body_outer_pre" .}} + +
+ + + {{template "custom/body_inner_pre" .}} + + {{if not .PageIsInstall}} +
+ {{template "base/head_navbar_pro" .}} +
+ {{end}} +{{/* +
+ + +*/}} diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index f487c9e01..df305099a 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -1,4 +1,4 @@ -{{template "base/head" .}} +{{template "base/head_pro" .}}
{{template "explore/repo_search" .}} From 7c11778adcbfa55043c92c18bf932ae61886e0cf Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 9 Dec 2021 11:21:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=90=9C=E7=B4=A2,=E9=BB=98=E8=AE=A4=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base/head_navbar.tmpl | 7 +++---- templates/base/head_navbar_fluid.tmpl | 4 ++-- templates/base/head_navbar_home.tmpl | 4 ++-- templates/base/head_navbar_pro.tmpl | 4 ++-- web_src/less/openi.less | 8 +++++++- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index c475faaf6..a67df2186 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -17,7 +17,7 @@ {{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -47,7 +47,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   @@ -94,8 +94,7 @@ */}} {{if .IsSigned}} -
- sss{{$.SortType}}}} +
+
{{.i18n.Tr "index"}}   @@ -46,7 +46,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl index 7a5258168..7391fa3e5 100644 --- a/templates/base/head_navbar_home.tmpl +++ b/templates/base/head_navbar_home.tmpl @@ -9,7 +9,7 @@
{{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -38,7 +38,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl index 561a49cd7..086e4de02 100644 --- a/templates/base/head_navbar_pro.tmpl +++ b/templates/base/head_navbar_pro.tmpl @@ -18,7 +18,7 @@ {{if .IsSigned}} -
+
{{.i18n.Tr "index"}}   @@ -48,7 +48,7 @@
{{else if .IsLandingPageHome}} -
+
{{.i18n.Tr "home"}}   diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 0f3129cd5..a20563ea5 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -518,4 +518,10 @@ display: block; } .letf2{ margin-left: -2px; -} \ No newline at end of file +} +.edge{ + margin-left:0 !important; + margin-right: 0 !important; + padding-left:0 !important; + padding-right:0 !important; + } \ No newline at end of file From a8e4dbe698cf0d9b8b462293e1872e801943720e Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 9 Dec 2021 11:30:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=90=9C=E7=B4=A2,=E9=BB=98=E8=AE=A4=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base/head_navbar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index a67df2186..27c82a6bf 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -100,7 +100,7 @@ - +