summaryrefslogtreecommitdiffstats
path: root/templates/org
diff options
context:
space:
mode:
Diffstat (limited to 'templates/org')
-rw-r--r--templates/org/settings/applications.tmpl15
-rw-r--r--templates/org/settings/applications_oauth2_edit.tmpl12
-rw-r--r--templates/org/settings/delete.tmpl17
-rw-r--r--templates/org/settings/hook_new.tmpl16
-rw-r--r--templates/org/settings/hooks.tmpl14
-rw-r--r--templates/org/settings/labels.tmpl18
-rw-r--r--templates/org/settings/layout_footer.tmpl11
-rw-r--r--templates/org/settings/layout_head.tmpl14
-rw-r--r--templates/org/settings/options.tmpl15
-rw-r--r--templates/org/settings/packages.tmpl15
-rw-r--r--templates/org/settings/packages_cleanup_rules_edit.tmpl15
-rw-r--r--templates/org/settings/packages_cleanup_rules_preview.tmpl14
-rw-r--r--templates/org/settings/runners.tmpl14
-rw-r--r--templates/org/settings/runners_edit.tmpl14
-rw-r--r--templates/org/settings/secrets.tmpl16
15 files changed, 70 insertions, 150 deletions
diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl
index 35736df591..5934f99de7 100644
--- a/templates/org/settings/applications.tmpl
+++ b/templates/org/settings/applications.tmpl
@@ -1,18 +1,9 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+ <div class="org-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.applications"}}
</h4>
{{template "user/settings/applications_oauth2_list" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl
index 861651a15e..987803ac26 100644
--- a/templates/org/settings/applications_oauth2_edit.tmpl
+++ b/templates/org/settings/applications_oauth2_edit.tmpl
@@ -1,7 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
- {{template "org/header" .}}
-
- {{template "user/settings/applications_oauth2_edit_form" .}}
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+ <div class="org-setting-content">
+ {{template "user/settings/applications_oauth2_edit_form" .}}
+ </div>
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index e8a8f5b185..1cfe1f16cd 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,11 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings delete">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings delete")}}
+
+ <div class="org-setting-content">
<h4 class="ui top attached error header">
{{.locale.Tr "org.settings.delete_account"}}
</h4>
@@ -25,9 +20,6 @@
</form>
</div>
</div>
- </div>
- </div>
-</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@@ -39,4 +31,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 4685225f4c..1bf74fb7ba 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings new webhook">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
+ <div class="org-setting-content">
<h4 class="ui top attached header">
{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
<div class="ui right">
@@ -50,7 +44,5 @@
{{template "repo/settings/webhook/history" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 3abbc62ecf..9f307968f8 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}}
+ <div class="org-setting-content">
{{template "repo/settings/webhook/list" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
index e04b391271..c3917861f6 100644
--- a/templates/org/settings/labels.tmpl
+++ b/templates/org/settings/labels.tmpl
@@ -1,10 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings labels">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="ui twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
+ <div class="org-setting-content">
<div class="ui grid">
<div class="left floated twelve wide column">
{{$.locale.Tr "org.settings.labels_desc" | Str2html}}
@@ -17,13 +12,8 @@
</div>
<div class="ui divider"></div>
{{template "repo/issue/labels/label_new" .}}
- {{template "base/alert" .}}
{{template "repo/issue/labels/label_list" .}}
</div>
- </div>
- </div>
- </div>
-</div>
-
{{template "repo/issue/labels/edit_delete_label" .}}
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
+
diff --git a/templates/org/settings/layout_footer.tmpl b/templates/org/settings/layout_footer.tmpl
new file mode 100644
index 0000000000..09d88c0c15
--- /dev/null
+++ b/templates/org/settings/layout_footer.tmpl
@@ -0,0 +1,11 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+ <div class="org-layout-right">
+ <div>
+ {{/* block: org-setting-content */}}
+{{end}}
+
+ </div>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl
new file mode 100644
index 0000000000..c245a3bf62
--- /dev/null
+++ b/templates/org/settings/layout_head.tmpl
@@ -0,0 +1,14 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+ {{template "org/header" .ctxData}}
+ <div class="ui container stackable grid">
+ {{template "org/settings/navbar" .ctxData}}
+ <div class="twelve wide column">
+ {{template "base/alert" .ctxData}}
+ {{/* block: org-setting-content */}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+ </div>
+ </div>
+</div>
+{{end}}
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 56ad5fa896..6f9f076548 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+ <div class="org-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "org.settings.options"}}
</h4>
@@ -101,7 +95,4 @@
</form>
</div>
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages.tmpl b/templates/org/settings/packages.tmpl
index 04e5d45b50..91106c3f15 100644
--- a/templates/org/settings/packages.tmpl
+++ b/templates/org/settings/packages.tmpl
@@ -1,15 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+ <div class="org-setting-content">
{{template "package/shared/cleanup_rules/list" .}}
{{template "package/shared/cargo" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages_cleanup_rules_edit.tmpl b/templates/org/settings/packages_cleanup_rules_edit.tmpl
index 195c21da0c..ff4c2dd651 100644
--- a/templates/org/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_edit.tmpl
@@ -1,14 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+ <div class="org-setting-content">
{{template "package/shared/cleanup_rules/edit" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages_cleanup_rules_preview.tmpl b/templates/org/settings/packages_cleanup_rules_preview.tmpl
index 771e6cb8f3..5a2f061225 100644
--- a/templates/org/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_preview.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages admin">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+ <div class="org-setting-content">
{{template "package/shared/cleanup_rules/preview" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl
index 7c70f6d956..2350f68ba9 100644
--- a/templates/org/settings/runners.tmpl
+++ b/templates/org/settings/runners.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+ <div class="org-setting-content">
{{template "shared/actions/runner_list" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/runners_edit.tmpl b/templates/org/settings/runners_edit.tmpl
index 931ca3701a..acd67a4d7b 100644
--- a/templates/org/settings/runners_edit.tmpl
+++ b/templates/org/settings/runners_edit.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+ <div class="org-setting-content">
{{template "shared/actions/runner_edit" .}}
</div>
- </div>
- </div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl
index 909c16f448..68ce415f41 100644
--- a/templates/org/settings/secrets.tmpl
+++ b/templates/org/settings/secrets.tmpl
@@ -1,15 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
- {{template "org/header" .}}
- <div class="ui container">
- <div class="ui grid">
- {{template "org/settings/navbar" .}}
- <div class="ui twelve wide column content">
- {{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}}
+ <div class="org-setting-content">
{{template "shared/secrets/add_list" .}}
</div>
- </div>
- </div>
-</div>
-
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}