From c1e74f9af6d7a2fa35463ddb42d17762d7282d67 Mon Sep 17 00:00:00 2001 From: Azareal Date: Sun, 28 Apr 2019 12:57:25 +1000 Subject: [PATCH] Use

for headers in analytics panes instead of Fixed the padding in the analytics panes. Don't load the status phrases in the control panel as they're not really needed there. --- .gitignore | 3 ++- public/init.js | 4 ++-- templates/header.html | 2 +- templates/panel_analytics_agent_views.html | 17 ++++++++--------- templates/panel_analytics_agents.html | 17 ++++++++--------- templates/panel_analytics_forum_views.html | 17 ++++++++--------- templates/panel_analytics_forums.html | 15 +++++++-------- templates/panel_analytics_lang_views.html | 17 ++++++++--------- templates/panel_analytics_langs.html | 15 +++++++-------- templates/panel_analytics_posts.html | 17 ++++++++--------- templates/panel_analytics_referrer_views.html | 17 ++++++++--------- templates/panel_analytics_referrers.html | 17 ++++++++--------- templates/panel_analytics_route_views.html | 17 ++++++++--------- templates/panel_analytics_routes.html | 17 ++++++++--------- templates/panel_analytics_system_views.html | 17 ++++++++--------- templates/panel_analytics_systems.html | 17 ++++++++--------- templates/panel_analytics_time_range.html | 2 +- templates/panel_analytics_topics.html | 15 +++++++-------- templates/panel_analytics_views.html | 17 ++++++++--------- themes/cosora/public/panel.css | 6 ++++++ themes/shadow/public/panel.css | 3 +++ 21 files changed, 132 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index d637105f..b2b79cbf 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ RouterGen Patcher Gosora Installer -template_*.go \ No newline at end of file +template_*.go +template_*.jgo \ No newline at end of file diff --git a/public/init.js b/public/init.js index 2428f4c7..7d35cbfe 100644 --- a/public/init.js +++ b/public/init.js @@ -180,8 +180,8 @@ function initPhrases(loggedIn, panel = false) { let e = ""; if(loggedIn && !panel) e = ",topic_list,topic"; else if(panel) e = ",analytics,panel"; // TODO: Request phrases for just one section of the control panel? - else e = ",topic_list"; - fetchPhrases("status,alerts,paginator"+e) // TODO: Break this up? + else e = ",status,topic_list"; + fetchPhrases("alerts,paginator"+e) // TODO: Break this up? } function fetchPhrases(plist) { diff --git a/templates/header.html b/templates/header.html index 4fae1421..fe999d9e 100644 --- a/templates/header.html +++ b/templates/header.html @@ -7,7 +7,7 @@ {{range .Header.PreScriptsAsync}} {{end}} - + {{range .Header.ScriptsAsync}} {{end}} diff --git a/templates/panel_analytics_agent_views.html b/templates/panel_analytics_agent_views.html index ad644839..7b70f43a 100644 --- a/templates/panel_analytics_agent_views.html +++ b/templates/panel_analytics_agent_views.html @@ -1,20 +1,19 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_agents.html b/templates/panel_analytics_agents.html index 9f206422..7346c99c 100644 --- a/templates/panel_analytics_agents.html +++ b/templates/panel_analytics_agents.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_user_agents_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_user_agents_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -25,4 +24,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_forum_views.html b/templates/panel_analytics_forum_views.html index 1f2ad5ce..abf80441 100644 --- a/templates/panel_analytics_forum_views.html +++ b/templates/panel_analytics_forum_views.html @@ -1,20 +1,19 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_forums.html b/templates/panel_analytics_forums.html index f2eb606e..80d36401 100644 --- a/templates/panel_analytics_forums.html +++ b/templates/panel_analytics_forums.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_forums_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_forums_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
diff --git a/templates/panel_analytics_lang_views.html b/templates/panel_analytics_lang_views.html index 9073ce17..4e82d111 100644 --- a/templates/panel_analytics_lang_views.html +++ b/templates/panel_analytics_lang_views.html @@ -1,20 +1,19 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_langs.html b/templates/panel_analytics_langs.html index df3ec502..1f7792c4 100644 --- a/templates/panel_analytics_langs.html +++ b/templates/panel_analytics_langs.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_languages_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_languages_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
diff --git a/templates/panel_analytics_posts.html b/templates/panel_analytics_posts.html index 27b84d35..1228d913 100644 --- a/templates/panel_analytics_posts.html +++ b/templates/panel_analytics_posts.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_post_counts_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_post_counts_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -28,4 +27,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_referrer_views.html b/templates/panel_analytics_referrer_views.html index edb41d08..011a08da 100644 --- a/templates/panel_analytics_referrer_views.html +++ b/templates/panel_analytics_referrer_views.html @@ -1,20 +1,19 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.Agent}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.Agent}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_referrers.html b/templates/panel_analytics_referrers.html index 63b826fa..fd1e3f7a 100644 --- a/templates/panel_analytics_referrers.html +++ b/templates/panel_analytics_referrers.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_referrers_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_referrers_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{range .ItemList}}
@@ -21,4 +20,4 @@
-{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_route_views.html b/templates/panel_analytics_route_views.html index 9e284d09..9710aa2b 100644 --- a/templates/panel_analytics_route_views.html +++ b/templates/panel_analytics_route_views.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.Route}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.Route}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -28,4 +27,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_routes.html b/templates/panel_analytics_routes.html index 35d9f6cb..39b0963b 100644 --- a/templates/panel_analytics_routes.html +++ b/templates/panel_analytics_routes.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_routes_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_routes_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -25,4 +24,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_system_views.html b/templates/panel_analytics_system_views.html index 7847946c..6364367b 100644 --- a/templates/panel_analytics_system_views.html +++ b/templates/panel_analytics_system_views.html @@ -1,20 +1,19 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_systems.html b/templates/panel_analytics_systems.html index 03c2db43..f1e77b27 100644 --- a/templates/panel_analytics_systems.html +++ b/templates/panel_analytics_systems.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_operating_systems_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_operating_systems_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -25,4 +24,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_time_range.html b/templates/panel_analytics_time_range.html index 02073190..a08d6ea8 100644 --- a/templates/panel_analytics_time_range.html +++ b/templates/panel_analytics_time_range.html @@ -1,4 +1,4 @@ - diff --git a/templates/panel_analytics_topics.html b/templates/panel_analytics_topics.html index 48c057e9..3adf513f 100644 --- a/templates/panel_analytics_topics.html +++ b/templates/panel_analytics_topics.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
- {{lang "panel_statistics_topic_counts_head"}} - {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_topic_counts_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
diff --git a/templates/panel_analytics_views.html b/templates/panel_analytics_views.html index e01f8f27..2cc482f4 100644 --- a/templates/panel_analytics_views.html +++ b/templates/panel_analytics_views.html @@ -1,16 +1,15 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
+
{{template "panel_before_head.html" . }} -
-
-
-

{{lang "panel_statistics_requests_head"}}

- {{template "panel_analytics_time_range.html" . }} -
+
+
+

{{lang "panel_statistics_requests_head"}}

+ {{template "panel_analytics_time_range.html" . }}
- +
@@ -28,4 +27,4 @@
{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "footer.html" . }} \ No newline at end of file diff --git a/themes/cosora/public/panel.css b/themes/cosora/public/panel.css index 3f58dfaa..fa9477cd 100644 --- a/themes/cosora/public/panel.css +++ b/themes/cosora/public/panel.css @@ -304,6 +304,12 @@ .timeRangeSelector { margin-top: -5px; } +.colstack_graph_holder + .rowlist { + margin-top: 8px; +} +.analytics .colstack_head h1 { + margin-top: 2px; +} /* Experimental header tweaks */ .colstack_head a { diff --git a/themes/shadow/public/panel.css b/themes/shadow/public/panel.css index fec4921b..20ae1217 100644 --- a/themes/shadow/public/panel.css +++ b/themes/shadow/public/panel.css @@ -20,6 +20,9 @@ margin-left: 2px; } +.analytics .colstack_head:first-child { + padding-bottom: 4px; +} .timeRangeSelector { padding: 2px; margin-top: -3px;