From f76af39a117282966bcde5c8540e5d5239a6c431 Mon Sep 17 00:00:00 2001 From: Azareal Date: Fri, 11 Oct 2019 19:33:01 +1000 Subject: [PATCH] Finish playing with panel_debug for now. Eliminate unnecessary indentation in panel_plugins. Add panel_debug_subhead template. Add panel_debug_memory_stats_mcachesys phrase. Add panel_debug_memory_stats_gcsys phrase. Add panel_debug_memory_stats_othersys phrase. Add panel_debug_database_post_analytics phrase. Add panel_debug_database_topic_analytics phrase. --- langs/english.json | 5 ++++ templates/panel_debug.html | 29 +++++++--------------- templates/panel_debug_subhead.html | 3 +++ templates/panel_plugins.html | 40 +++++++++++++++--------------- 4 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 templates/panel_debug_subhead.html diff --git a/langs/english.json b/langs/english.json index c03586bb..1f310c3a 100644 --- a/langs/english.json +++ b/langs/english.json @@ -1098,6 +1098,9 @@ "panel_debug_memory_stats_mspaninuse":"MSpanInuse", "panel_debug_memory_stats_mcacheinuse":"MCacheInuse", "panel_debug_memory_stats_mspansys":"MSpanSys", + "panel_debug_memory_stats_mcachesys":"MCacheSys", + "panel_debug_memory_stats_gcsys":"GCSys", + "panel_debug_memory_stats_othersys":"OtherSys", "panel_debug_caches":"Caches", "panel_debug_caches_topic":"Topic Cache", @@ -1124,6 +1127,8 @@ "panel_debug_database_views_langs":"Views Langs", "panel_debug_database_views_referrers":"Views Referrers", "panel_debug_database_views_systems":"Views Systems", + "panel_debug_database_post_analytics":"Post Analytics", + "panel_debug_database_topic_analytics":"Topic Analytics", "panel_debug_disk":"Disk", "panel_debug_disk_static_files":"Static Files", diff --git a/templates/panel_debug.html b/templates/panel_debug.html index a493203c..4f45c22d 100644 --- a/templates/panel_debug.html +++ b/templates/panel_debug.html @@ -24,10 +24,7 @@ {{template "panel_debug_stat.html" .CPUs}} {{template "panel_debug_stat_q.html"}} - -
-

{{lang "panel_debug_memory_stats"}}

-
{{flush}} +{{template "panel_debug_subhead.html" "panel_debug_memory_stats"}}
{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_sys"}} {{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapsys"}} @@ -50,18 +47,14 @@
{{.MemStats.MCacheInuse}} ({{bunit .MemStats.MCacheInuse}})
{{.MemStats.MSpanSys}} ({{bunit .MemStats.MSpanSys}})
- -
MCacheSys
-
GCSys
-
OtherSys
- + {{template "panel_debug_stat_head.html" "panel_debug_memory_stats_mcachesys"}} + {{template "panel_debug_stat_head.html" "panel_debug_memory_stats_gcsys"}} + {{template "panel_debug_stat_head.html" "panel_debug_memory_stats_othersys"}}
{{.MemStats.MCacheSys}} ({{bunit .MemStats.MCacheSys}})
{{.MemStats.GCSys}} ({{bunit .MemStats.GCSys}})
{{.MemStats.OtherSys}} ({{bunit .MemStats.OtherSys}})
-
-

{{lang "panel_debug_caches"}}

-
+{{template "panel_debug_subhead.html" "panel_debug_caches"}}
{{template "panel_debug_stat_head.html" "panel_debug_caches_topic"}} {{template "panel_debug_stat_head.html" "panel_debug_caches_user"}} @@ -77,9 +70,7 @@ {{template "panel_debug_stat_q.html"}} {{template "panel_debug_stat_q.html"}}
-
-

{{lang "panel_debug_database"}}

-
{{flush}} +{{template "panel_debug_subhead.html" "panel_debug_database"}}
{{template "panel_debug_stat_head.html" "panel_debug_database_topics"}} {{template "panel_debug_stat_head.html" "panel_debug_database_users"}} @@ -130,16 +121,14 @@ {{template "panel_debug_stat.html" .Database.ViewsReferrers}} {{template "panel_debug_stat.html" .Database.ViewsSystems}} -
Post Analytics
-
Topic Analytics
+ {{template "panel_debug_stat_head.html" "panel_debug_database_post_analytics"}} + {{template "panel_debug_stat_head.html" "panel_debug_database_topic_analytics"}} {{template "panel_debug_stat_head_q.html"}} {{template "panel_debug_stat.html" .Database.PostChunks}} {{template "panel_debug_stat.html" .Database.TopicChunks}} {{template "panel_debug_stat_q.html"}}
-
-

{{lang "panel_debug_disk"}}

-
{{flush}} +{{template "panel_debug_subhead.html" "panel_debug_disk"}}
{{template "panel_debug_stat_head.html" "panel_debug_disk_static_files"}} {{template "panel_debug_stat_head.html" "panel_debug_disk_attachments"}} diff --git a/templates/panel_debug_subhead.html b/templates/panel_debug_subhead.html new file mode 100644 index 00000000..f450b5b4 --- /dev/null +++ b/templates/panel_debug_subhead.html @@ -0,0 +1,3 @@ +
+

{{lang .}}

+
{{flush}} \ No newline at end of file diff --git a/templates/panel_plugins.html b/templates/panel_plugins.html index c361161b..252cd791 100644 --- a/templates/panel_plugins.html +++ b/templates/panel_plugins.html @@ -1,21 +1,21 @@ -
-

{{lang "panel_plugins_head"}}

+
+

{{lang "panel_plugins_head"}}

+
+
+ {{range .ItemList}} +
+ + {{.Name}}
+ {{lang "panel_plugins_author_prefix"}}{{.Author}} + + + {{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}} +
-
- {{range .ItemList}} -
- - {{.Name}}
- {{lang "panel_plugins_author_prefix"}}{{.Author}} - - - {{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}} - -
- {{end}} -
\ No newline at end of file + {{end}} +
\ No newline at end of file