From 06d6715c474439b6edc6ad1952945ecfacf9cf92 Mon Sep 17 00:00:00 2001 From: Azareal Date: Fri, 10 Aug 2018 17:58:25 +1000 Subject: [PATCH] Many HTML / CSS / Template changes. Added the grid_stat_head CSS class to Panel Debug. Added the panel_plugin_meta CSS class to the Plugin Manager. Added some missing panel_right_button classes to the buttons for the rows in the Plugin Manager. Added some missing the_form CSS classes for Nox. Added a missing phrase for an update button in panel_themes_menus_items. Replaced a legacy float: right; in the User Manager with to_right. Removed some superfluous legacy inline CSS in the User Manager. Tweaked the amount of padding for the title in the Account Manager for Nox. Tweaked the amount of padding for the title in the Control Panel for Nox. Tweaked the padding for panel_right_button for Nox. Fixed the UI for the Plugin Manager in Nox. Tweaked the padding for the grid heads in Panel Debug for Nox. Began work on a nicer looking User Manager in Nox. --- templates/panel_debug.html | 12 ++--- templates/panel_plugins.html | 14 ++--- templates/panel_themes_menus_item_edit.html | 2 +- templates/panel_themes_menus_items.html | 4 +- templates/panel_users.html | 2 +- themes/nox/public/account.css | 2 +- themes/nox/public/panel.css | 59 ++++++++++++++++++++- 7 files changed, 77 insertions(+), 18 deletions(-) diff --git a/templates/panel_debug.html b/templates/panel_debug.html index 7fd8d35c..c92ea160 100644 --- a/templates/panel_debug.html +++ b/templates/panel_debug.html @@ -6,18 +6,18 @@

{{lang "panel_debug_head"}}

-
{{lang "panel_debug_uptime_label"}}
-
{{lang "panel_debug_go_version_label"}}
-
{{lang "panel_debug_database_version_label"}}
+
{{lang "panel_debug_uptime_label"}}
+
{{lang "panel_debug_go_version_label"}}
+
{{lang "panel_debug_database_version_label"}}
{{.Uptime}}
{{.GoVersion}}
{{.DBVersion}}
-
{{lang "panel_debug_open_database_connections_label"}}
-
{{lang "panel_debug_adapter_label"}}
-
???
+
{{lang "panel_debug_open_database_connections_label"}}
+
{{lang "panel_debug_adapter_label"}}
+
???
{{.OpenConns}}
{{.DBAdapter}}
diff --git a/templates/panel_plugins.html b/templates/panel_plugins.html index 1cb92dcc..ba682d25 100644 --- a/templates/panel_plugins.html +++ b/templates/panel_plugins.html @@ -9,15 +9,17 @@
{{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 .Settings}}{{lang "panel_plugins_settings"}}{{end}} + {{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_menus_item_edit.html b/templates/panel_themes_menus_item_edit.html index 3f333337..877be147 100644 --- a/templates/panel_themes_menus_item_edit.html +++ b/templates/panel_themes_menus_item_edit.html @@ -8,7 +8,7 @@

{{lang "panel_themes_menus_edit_head"}}

-
+
{{/** TODO: Let an admin move a menu item from one menu to another? **/}}
{{lang "panel_themes_menus_name"}}
diff --git a/templates/panel_themes_menus_items.html b/templates/panel_themes_menus_items.html index 49ff21b0..086028a6 100644 --- a/templates/panel_themes_menus_items.html +++ b/templates/panel_themes_menus_items.html @@ -16,14 +16,14 @@
{{end}}
-
+

{{lang "panel_themes_menus_create_head"}}

-
+
{{/** TODO: Let an admin move a menu item from one menu to another? **/}}
{{lang "panel_themes_menus_name"}}
diff --git a/templates/panel_users.html b/templates/panel_users.html index 010df9eb..59b9d892 100644 --- a/templates/panel_users.html +++ b/templates/panel_users.html @@ -12,7 +12,7 @@ {{.Name}}'s Avatar {{.Name}} {{lang "panel_users_profile"}} - {{if (.Tag) and (.IsSuperMod)}}{{.Tag}}{{end}} + {{if (.Tag) and (.IsSuperMod)}}{{.Tag}}{{end}} {{if .IsBanned}}{{lang "panel_users_unban"}}{{else if not .IsSuperMod}}{{lang "panel_users_ban"}}{{end}} {{if not .Active}}{{lang "panel_users_activate"}}{{end}} diff --git a/themes/nox/public/account.css b/themes/nox/public/account.css index 00406351..6d6a0c82 100644 --- a/themes/nox/public/account.css +++ b/themes/nox/public/account.css @@ -43,7 +43,7 @@ padding-left: 24px; } .colstack_right .colstack_head { - margin-bottom: 4px; + margin-bottom: 6px; } .colstack_right .colstack_head h1 { font-size: 21px; diff --git a/themes/nox/public/panel.css b/themes/nox/public/panel.css index b8d10c4e..e7760d5a 100644 --- a/themes/nox/public/panel.css +++ b/themes/nox/public/panel.css @@ -55,7 +55,7 @@ padding-left: 24px; } .colstack_right .colstack_head { - margin-bottom: 4px; + margin-bottom: 5px; } .colstack_right .colstack_head h1 { font-size: 21px; @@ -123,6 +123,9 @@ button, .formbutton, .panel_right_button { } .panel_right_button { margin-left: 2px; + padding: 5px; + padding-left: 6px; + padding-right: 6px; } .edit_button:after { content: "{{index .Phrases "panel_edit_button_text"}}"; @@ -154,10 +157,64 @@ button, .formbutton, .panel_right_button { stroke: rgb(125,125,125); } +.rowlist.bgavatars { + display: grid; + grid-gap: 16px; + grid-row-gap: 0px; + grid-template-columns: repeat(3, 1fr); +} +.rowlist.bgavatars .rowitem { + display: flex; + flex-direction: column; + width: 180px; +} +.rowlist.bgavatars .bgsub, .rowlist.bgavatars .rowTitle { + margin-left: auto; + margin-right: auto; +} +.rowlist.bgavatars .bgsub { + border-radius: 32px; + height: 64px; + width: 64px; +} +.rowlist.bgavatars .rowTitle { + font-size: 18px; + margin-top: 4px; +} + #panel_setting .formlabel { display: none; } #panel_setting textarea { width: 100%; height: 80px; +} + +.panel_submitrow { + margin-top: 8px; +} + +.panel_plugin_meta { + display: flex; + flex-direction: column; +} +.panel_plugin_meta br { + display: none; +} +.panel_plugin_meta small { + margin-left: 0px !important; + margin-top: 1px; +} +/* TODO: Switch out this hack for vertically aligning the buttons */ +/* margin-top: 10px; */ +#panel_plugins .to_right { + display: flex; +} +#panel_plugins .to_right .panel_right_button { + margin-top: auto; + margin-bottom: auto; +} + +#panel_debug .grid_stat:not(.grid_stat_head) { + margin-bottom: 5px; } \ No newline at end of file