From 85b05229550ab701337e5016d204a824080dd6ce Mon Sep 17 00:00:00 2001 From: Azareal Date: Mon, 30 Sep 2019 20:23:59 +1000 Subject: [PATCH] Missed a spot. Push more session parameter shortenings. Remove some unneccesary indentations. --- templates/account_own_edit.html | 6 +- templates/account_own_edit_mfa.html | 4 +- templates/account_own_edit_mfa_setup.html | 2 +- templates/account_own_edit_password.html | 2 +- templates/are_you_sure.html | 2 +- templates/panel_are_you_sure.html | 4 +- templates/panel_forum_edit.html | 110 ++++++++-------- templates/panel_forum_edit_perms.html | 39 +++--- templates/panel_forums.html | 132 ++++++++++---------- templates/panel_groups.html | 90 ++++++------- templates/panel_pages.html | 2 +- templates/panel_plugins.html | 10 +- templates/panel_themes.html | 6 +- templates/panel_themes_menus_item_edit.html | 116 ++++++++--------- templates/panel_themes_menus_items.html | 4 +- templates/panel_themes_widgets.html | 4 +- templates/panel_user_edit.html | 6 +- 17 files changed, 269 insertions(+), 270 deletions(-) diff --git a/templates/account_own_edit.html b/templates/account_own_edit.html index e7805303..8aff40b6 100644 --- a/templates/account_own_edit.html +++ b/templates/account_own_edit.html @@ -1,10 +1,10 @@ -
+
-
-
+
+
diff --git a/templates/account_own_edit_mfa.html b/templates/account_own_edit_mfa.html index 103be606..c926860a 100644 --- a/templates/account_own_edit_mfa.html +++ b/templates/account_own_edit_mfa.html @@ -6,7 +6,7 @@

{{lang "account_mfa_head"}}

-
+
{{lang "account_mfa_disable_explanation"}}
@@ -17,7 +17,7 @@

{{lang "account_mfa_scratch_head"}}

{{/** TODO: Don't inline this, figure a way of implementing it properly in the template system **/}} -
{{lang "account_mfa_scratch_explanation"}}
+
{{lang "account_mfa_scratch_explanation"}}
{{range .Something}} diff --git a/templates/account_own_edit_mfa_setup.html b/templates/account_own_edit_mfa_setup.html index d797fa77..8d396bc4 100644 --- a/templates/account_own_edit_mfa_setup.html +++ b/templates/account_own_edit_mfa_setup.html @@ -6,7 +6,7 @@

{{lang "account_mfa_setup_head"}}

- +
{{lang "account_mfa_setup_explanation"}}
diff --git a/templates/account_own_edit_password.html b/templates/account_own_edit_password.html index 9116683f..3d52e607 100644 --- a/templates/account_own_edit_password.html +++ b/templates/account_own_edit_password.html @@ -6,7 +6,7 @@

{{lang "account_password_head"}}

- +
{{lang "account_password_current_password"}}
diff --git a/templates/are_you_sure.html b/templates/are_you_sure.html index 6e18a2ea..99ca0ab3 100644 --- a/templates/are_you_sure.html +++ b/templates/are_you_sure.html @@ -5,7 +5,7 @@
{{.Something.Message}}

- {{lang "areyousure_continue"}} + {{lang "areyousure_continue"}}
diff --git a/templates/panel_are_you_sure.html b/templates/panel_are_you_sure.html index d7773ae8..ca80b8d4 100644 --- a/templates/panel_are_you_sure.html +++ b/templates/panel_are_you_sure.html @@ -8,9 +8,9 @@
{{.Something.Message}}

- {{lang "areyousure_continue"}} + {{lang "areyousure_continue"}}
-{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_forum_edit.html b/templates/panel_forum_edit.html index 40248a0d..83ed51ee 100644 --- a/templates/panel_forum_edit.html +++ b/templates/panel_forum_edit.html @@ -1,60 +1,60 @@ -
-

{{.Name}}{{lang "panel_forum_head_suffix"}}

+
+

{{.Name}}{{lang "panel_forum_head_suffix"}}

+
+
+ +
+
{{lang "panel_forum_name"}}
+
-
- -
-
{{lang "panel_forum_name"}}
-
+
+
{{lang "panel_forum_description"}}
+
+
+
+
{{lang "panel_forum_active"}}
+
+
+
+
{{lang "panel_forum_preset"}}
+
+
-
-
{{lang "panel_forum_description"}}
-
-
-
-
{{lang "panel_forum_active"}}
-
-
-
-
{{lang "panel_forum_preset"}}
-
- +
+
+
+
+ +
+
+
+

{{lang "panel_forum_permissions_head"}}

+
+
+
+ {{range .Groups}} +
+
+ {{.Group.Name}} + + {{lang "panel_forum_edit_button"}} +
+ + +
-
-
-
-
-
-
-

{{lang "panel_forum_permissions_head"}}

-
-
-
- {{range .Groups}} -
-
- {{.Group.Name}} - - {{lang "panel_forum_edit_button"}} -
- - - -
-
-
- {{end}} -
\ No newline at end of file + {{end}} +
\ No newline at end of file diff --git a/templates/panel_forum_edit_perms.html b/templates/panel_forum_edit_perms.html index da85a8d3..190966d3 100644 --- a/templates/panel_forum_edit_perms.html +++ b/templates/panel_forum_edit_perms.html @@ -1,23 +1,22 @@ -
-

{{.Name}}{{lang "panel_forum_head_suffix"}}

-
-
-
- {{range .Perms}} -
-
- {{.LangStr}} -
- -
+
+

{{.Name}}{{lang "panel_forum_head_suffix"}}

+
+ +
+ {{range .Perms}} +
+
+ {{.LangStr}} +
+
- {{end}} -
-
-
+
{{end}} +
+
- \ No newline at end of file +
+ \ No newline at end of file diff --git a/templates/panel_forums.html b/templates/panel_forums.html index 0157452b..956cf926 100644 --- a/templates/panel_forums.html +++ b/templates/panel_forums.html @@ -1,69 +1,69 @@ -
-
-

{{lang "panel.forums_head"}}

-

{{lang "panel_hints_reorder"}}

-
+
+
+

{{lang "panel.forums_head"}}

+

{{lang "panel_hints_reorder"}}

-
- {{range .ItemList}} -
- - - {{/** TODO: Make sure the forum_active_name class is set and unset when the activity status of this forum is changed **/}} - {{.Name}} -
{{.Desc}} - - - - - - - - - {{if gt .ID 1}}{{end}} - - -
- {{end}} -
-
-
+
+
+ {{range .ItemList}} +
+ + + {{/** TODO: Make sure the forum_active_name class is set and unset when the activity status of this forum is changed **/}} + {{.Name}} +
{{.Desc}} + + + + + + + + + {{if gt .ID 1}}{{end}} + +
+ {{end}} +
+
+
+
-
-

{{lang "panel.forums_create_head"}}

-
-
-
-
-
{{lang "panel.forums_create_name_label"}}
-
-
-
-
{{lang "panel.forums_create_description_label"}}
-
-
-
-
{{lang "panel.forums_active_label"}}
-
-
-
-
{{lang "panel.forums_preset_label"}}
-
-
-
-
-
-
-
\ No newline at end of file +
+

{{lang "panel.forums_create_head"}}

+
+
+
+
+
{{lang "panel.forums_create_name_label"}}
+
+
+
+
{{lang "panel.forums_create_description_label"}}
+
+
+
+
{{lang "panel.forums_active_label"}}
+
+
+
+
{{lang "panel.forums_preset_label"}}
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/templates/panel_groups.html b/templates/panel_groups.html index 31da1b21..a8d0f9d9 100644 --- a/templates/panel_groups.html +++ b/templates/panel_groups.html @@ -1,49 +1,49 @@ -
-

{{lang "panel_groups_head"}}

-
-
- {{range .ItemList}} -
- {{.Name}} - - {{if .RankClass}} - {{else}}{{.Rank}}{{end}} +
+

{{lang "panel_groups_head"}}

+
+
+ {{range .ItemList}} +
+ {{.Name}} + + {{if .RankClass}} + {{else}}{{.Rank}}{{end}} - {{if .CanEdit}}{{end}} - -
- {{end}} + {{if .CanEdit}}{{end}} +
- {{template "paginator.html" . }} + {{end}} +
+{{template "paginator.html" . }} - {{if .CurrentUser.Perms.EditGroup}} -
-

{{lang "panel_groups_create_head"}}

-
-
-
-
-
{{lang "panel_groups_create_name"}}
-
+{{if .CurrentUser.Perms.EditGroup}} +
+

{{lang "panel_groups_create_head"}}

+
+
+ +
+
{{lang "panel_groups_create_name"}}
+
+
+
+
{{lang "panel_groups_create_type"}}
+
+
-
-
{{lang "panel_groups_create_type"}}
-
- -
-
-
-
{{lang "panel_groups_create_tag"}}
-
-
-
-
-
- -
- {{end}} \ No newline at end of file +
+
+
{{lang "panel_groups_create_tag"}}
+
+
+
+
+
+ +
+{{end}} \ No newline at end of file diff --git a/templates/panel_pages.html b/templates/panel_pages.html index 28246374..70bd3f9c 100644 --- a/templates/panel_pages.html +++ b/templates/panel_pages.html @@ -36,7 +36,7 @@
-
+
\ No newline at end of file diff --git a/templates/panel_plugins.html b/templates/panel_plugins.html index d0a3e709..c361161b 100644 --- a/templates/panel_plugins.html +++ b/templates/panel_plugins.html @@ -5,16 +5,16 @@ {{range .ItemList}}
- {{.Name}}
- {{lang "panel_plugins_author_prefix"}}{{.Author}} + {{.Name}}
+ {{lang "panel_plugins_author_prefix"}}{{.Author}} {{if .Settings}}{{lang "panel_plugins_settings"}}{{end}} - {{if .Active}}{{lang "panel_plugins_deactivate"}} + {{if .Active}}{{lang "panel_plugins_deactivate"}} {{else if .Installable}} {{/** TODO: Write a custom template interpreter to fix this nonsense **/}} - {{if .Installed}}{{lang "panel_plugins_activate"}}{{else}}{{lang "panel_plugins_install"}}{{end}} - {{else}}{{lang "panel_plugins_activate"}}{{end}} + {{if .Installed}}{{lang "panel_plugins_activate"}}{{else}}{{lang "panel_plugins_install"}}{{end}} + {{else}}{{lang "panel_plugins_activate"}}{{end}}
{{end}} diff --git a/templates/panel_themes.html b/templates/panel_themes.html index e941c7f4..bc156dc7 100644 --- a/templates/panel_themes.html +++ b/templates/panel_themes.html @@ -11,7 +11,7 @@ {{if .MobileFriendly}}📱{{end}} {{if .Tag}}{{.Tag}}{{end}} - {{if .Active}}{{lang "panel_themes_default"}}{{else}}{{lang "panel_themes_make_default"}}{{end}} + {{if .Active}}{{lang "panel_themes_default"}}{{else}}{{lang "panel_themes_make_default"}}{{end}}
{{end}} @@ -23,14 +23,14 @@
{{range .VariantThemes}}
- + {{.FriendlyName}}
{{lang "panel_themes_author_prefix"}}{{.Creator}} {{if .MobileFriendly}}📱{{end}} {{if .Tag}}{{.Tag}}{{end}} - {{if .Active}}{{lang "panel_themes_default"}}{{else}}{{lang "panel_themes_make_default"}}{{end}} + {{if .Active}}{{lang "panel_themes_default"}}{{else}}{{lang "panel_themes_make_default"}}{{end}}
{{end}} diff --git a/templates/panel_themes_menus_item_edit.html b/templates/panel_themes_menus_item_edit.html index 26c0ca8d..1d961503 100644 --- a/templates/panel_themes_menus_item_edit.html +++ b/templates/panel_themes_menus_item_edit.html @@ -1,62 +1,62 @@ {{/** TODO: Set the order based on the order here **/}} {{/** TODO: Write the backend code and JS code for saving this menu **/}} -
-

{{lang "panel_themes_menus_edit_head"}}

-
-
-
- {{/** TODO: Let an admin move a menu item from one menu to another? **/}} -
-
{{lang "panel_themes_menus_name"}}
-
-
-
-
{{lang "panel_themes_menus_htmlid"}}
-
-
-
-
{{lang "panel_themes_menus_cssclass"}}
-
-
-
-
{{lang "panel_themes_menus_position"}}
-
- -
-
-
-
{{lang "panel_themes_menus_path"}}
-
-
-
-
{{lang "panel_themes_menus_aria"}}
-
-
-
-
{{lang "panel_themes_menus_tooltip"}}
-
-
-
-
{{lang "panel_themes_menus_tmplname"}}
-
-
-
-
{{lang "panel_themes_menus_permissions"}}
-
-
-
-
- -
+
+

{{lang "panel_themes_menus_edit_head"}}

+
+ +
+ {{/** TODO: Let an admin move a menu item from one menu to another? **/}} +
+
{{lang "panel_themes_menus_name"}}
+
+
+
+
{{lang "panel_themes_menus_htmlid"}}
+
+
+
+
{{lang "panel_themes_menus_cssclass"}}
+
+
+
+
{{lang "panel_themes_menus_position"}}
+
+
- \ No newline at end of file +
+
{{lang "panel_themes_menus_path"}}
+
+
+
+
{{lang "panel_themes_menus_aria"}}
+
+
+
+
{{lang "panel_themes_menus_tooltip"}}
+
+
+
+
{{lang "panel_themes_menus_tmplname"}}
+
+
+
+
{{lang "panel_themes_menus_permissions"}}
+
+
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/templates/panel_themes_menus_items.html b/templates/panel_themes_menus_items.html index 69cf156b..789691aa 100644 --- a/templates/panel_themes_menus_items.html +++ b/templates/panel_themes_menus_items.html @@ -11,7 +11,7 @@ {{.Name}} - +
{{end}}
@@ -21,7 +21,7 @@

{{lang "panel_themes_menus_create_head"}}

-
+
{{/** TODO: Let an admin move a menu item from one menu to another? **/}} diff --git a/templates/panel_themes_widgets.html b/templates/panel_themes_widgets.html index 59001d17..1b4e0be4 100644 --- a/templates/panel_themes_widgets.html +++ b/templates/panel_themes_widgets.html @@ -18,7 +18,7 @@ type Widget struct {
{{range $widget := $dock}} -
+
{{$widget.Type}} ({{lang "panel_themes_widgets_disabled"}}) {{$widget.Location}} @@ -44,7 +44,7 @@ type Widget struct {
- + {{template "panel_themes_widgets_widget.html" .BlankWidget }} diff --git a/templates/panel_user_edit.html b/templates/panel_user_edit.html index bf4344d0..0f64bc72 100644 --- a/templates/panel_user_edit.html +++ b/templates/panel_user_edit.html @@ -2,9 +2,9 @@

{{lang "panel_user_head"}}