From 6bed36b8c61a0aa40d59eab84521722151b4aeca Mon Sep 17 00:00:00 2001 From: Azareal Date: Mon, 29 Apr 2019 16:11:26 +1000 Subject: [PATCH] Use dyntmpl for the analytics panes. Localised a few more things on the dashboard. Use questions marks instead of numbers for placeholders on the dashboard. Added the panel_dashboard_cpu phrase. Added the panel_dashboard_ram phrase. --- common/pages.go | 14 +++++++ common/template_init.go | 3 +- common/websockets.go | 14 +++---- langs/english.json | 2 + routes/panel/analytics.go | 38 ++++++++++--------- routes/panel/dashboard.go | 12 +++--- templates/panel.html | 2 +- templates/panel_analytics_agent_views.html | 12 +----- templates/panel_analytics_agents.html | 12 +----- templates/panel_analytics_forum_views.html | 12 +----- templates/panel_analytics_forums.html | 12 +----- templates/panel_analytics_lang_views.html | 12 +----- templates/panel_analytics_langs.html | 12 +----- templates/panel_analytics_posts.html | 12 +----- templates/panel_analytics_referrer_views.html | 12 +----- templates/panel_analytics_referrers.html | 12 +----- templates/panel_analytics_route_views.html | 12 +----- templates/panel_analytics_routes.html | 12 +----- templates/panel_analytics_system_views.html | 12 +----- templates/panel_analytics_systems.html | 12 +----- templates/panel_analytics_topics.html | 12 +----- templates/panel_analytics_views.html | 12 +----- 22 files changed, 82 insertions(+), 183 deletions(-) diff --git a/common/pages.go b/common/pages.go index e498ed9b..17e1fcfc 100644 --- a/common/pages.go +++ b/common/pages.go @@ -283,9 +283,23 @@ type ResetPage struct { type Panel struct { *BasePanelPage HTMLID string + ClassNames string TmplName string Inner nobreak } +type PanelAnalytics struct { + *BasePanelPage + FormAction string + TmplName string + Inner nobreak +} +type PanelAnalyticsStd struct{ + Graph PanelTimeGraph + ViewItems []PanelAnalyticsItem + TimeRange string + Unit string + TimeType string +} type PanelStats struct { Users int diff --git a/common/template_init.go b/common/template_init.go index dc6797b6..5c909ca0 100644 --- a/common/template_init.go +++ b/common/template_init.go @@ -301,7 +301,8 @@ func compileTemplates(wg *sync.WaitGroup, c *tmpl.CTemplateSet, themeName string tmpls.AddStd("account", "common.Account", accountPage) basePage := &BasePanelPage{header, PanelStats{}, "dashboard", ReportForumID} - tmpls.AddStd("panel", "common.Panel", Panel{basePage, "panel_dashboard_right","panel_dashboard", inter}) + tmpls.AddStd("panel", "common.Panel", Panel{basePage, "panel_dashboard_right","","panel_dashboard", inter}) + //tmpls.AddStd("panel_analytics", "common.PanelAnalytics", Panel{basePage, "panel_dashboard_right","panel_dashboard", inter}) var writeTemplate = func(name string, content interface{}) { log.Print("Writing template '" + name + "'") diff --git a/common/websockets.go b/common/websockets.go index 9aa898d2..ece72ea0 100644 --- a/common/websockets.go +++ b/common/websockets.go @@ -3,7 +3,7 @@ /* * * Gosora WebSocket Subsystem -* Copyright Azareal 2017 - 2019 +* Copyright Azareal 2017 - 2020 * */ package common @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/Azareal/Gosora/common/phrases" + p "github.com/Azareal/Gosora/common/phrases" "github.com/Azareal/gopsutil/cpu" "github.com/Azareal/gopsutil/mem" "github.com/gorilla/websocket" @@ -375,9 +375,9 @@ AdminStatLoop: // nolint // TODO: Use JSON for this to make things more portable and easier to convert to MessagePack, if need be? if !noStatUpdates { - w.Write([]byte("set #dash-totonline " + phrases.GetTmplPhrasef("panel_dashboard_online", totonline, totunit) + "\r")) - w.Write([]byte("set #dash-gonline " + phrases.GetTmplPhrasef("panel_dashboard_guests_online", gonline, gunit) + "\r")) - w.Write([]byte("set #dash-uonline " + phrases.GetTmplPhrasef("panel_dashboard_users_online", uonline, uunit) + "\r")) + w.Write([]byte("set #dash-totonline " + p.GetTmplPhrasef("panel_dashboard_online", totonline, totunit) + "\r")) + w.Write([]byte("set #dash-gonline " + p.GetTmplPhrasef("panel_dashboard_guests_online", gonline, gunit) + "\r")) + w.Write([]byte("set #dash-uonline " + p.GetTmplPhrasef("panel_dashboard_users_online", uonline, uunit) + "\r")) w.Write([]byte("set #dash-reqs " + strconv.Itoa(reqCount) + " reqs / second\r")) w.Write([]byte("set-class #dash-totonline grid_item grid_stat " + onlineColour + "\r")) @@ -386,11 +386,11 @@ AdminStatLoop: //w.Write([]byte("set-class #dash-reqs grid_item grid_stat grid_end_group \r")) } - w.Write([]byte("set #dash-cpu CPU: " + cpustr + "%\r")) + w.Write([]byte("set #dash-cpu " + p.GetTmplPhrasef("panel_dashboard_cpu",cpustr) + "%\r")) w.Write([]byte("set-class #dash-cpu grid_item grid_istat " + cpuColour + "\r")) if !noRAMUpdates { - w.Write([]byte("set #dash-ram RAM: " + ramstr + "\r")) + w.Write([]byte("set #dash-ram " + p.GetTmplPhrasef("panel_dashboard_ram",ramstr) + "\r")) w.Write([]byte("set-class #dash-ram grid_item grid_istat " + ramColour + "\r")) } diff --git a/langs/english.json b/langs/english.json index b66ff2a4..d471a05d 100644 --- a/langs/english.json +++ b/langs/english.json @@ -751,7 +751,9 @@ "panel_menu_debug":"Debug", "panel_dashboard_head":"Dashboard", + "panel_dashboard_cpu":"CPU: %s", "panel_dashboard_cpu_desc":"The global CPU usage of this server", + "panel_dashboard_ram":"RAM: %s", "panel_dashboard_ram_desc":"The global RAM usage of this server", "panel_dashboard_online": "%d%s online", "panel_dashboard_online_desc":"The number of people who are currently online", diff --git a/routes/panel/analytics.go b/routes/panel/analytics.go index 6d6c1a01..17283607 100644 --- a/routes/panel/analytics.go +++ b/routes/panel/analytics.go @@ -164,8 +164,9 @@ func AnalyticsViews(w http.ResponseWriter, r *http.Request, user c.User) c.Route if timeRange.Range == "six-hours" || timeRange.Range == "twelve-hours" || timeRange.Range == "one-day" { ttime = "time" } - pi := c.PanelAnalyticsPage{basePage, graph, viewItems, timeRange.Range, timeRange.Unit, ttime} - return renderTemplate("panel_analytics_views", w, r, basePage.Header, &pi) + + pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, ttime} + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_views", pi}) } func AnalyticsRouteViews(w http.ResponseWriter, r *http.Request, user c.User, route string) c.RouteError { @@ -200,7 +201,7 @@ func AnalyticsRouteViews(w http.ResponseWriter, r *http.Request, user c.User, ro c.DebugLogf("graph: %+v\n", graph) pi := c.PanelAnalyticsRoutePage{basePage, c.SanitiseSingleLine(route), graph, viewItems, timeRange.Range} - return renderTemplate("panel_analytics_route_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_route_views", pi}) } func AnalyticsAgentViews(w http.ResponseWriter, r *http.Request, user c.User, agent string) c.RouteError { @@ -240,7 +241,7 @@ func AnalyticsAgentViews(w http.ResponseWriter, r *http.Request, user c.User, ag } pi := c.PanelAnalyticsAgentPage{basePage, agent, friendlyAgent, graph, timeRange.Range} - return renderTemplate("panel_analytics_agent_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_agent_views", pi}) } func AnalyticsForumViews(w http.ResponseWriter, r *http.Request, user c.User, sfid string) c.RouteError { @@ -283,7 +284,7 @@ func AnalyticsForumViews(w http.ResponseWriter, r *http.Request, user c.User, sf } pi := c.PanelAnalyticsAgentPage{basePage, sfid, forum.Name, graph, timeRange.Range} - return renderTemplate("panel_analytics_forum_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_forum_views", pi}) } func AnalyticsSystemViews(w http.ResponseWriter, r *http.Request, user c.User, system string) c.RouteError { @@ -322,7 +323,7 @@ func AnalyticsSystemViews(w http.ResponseWriter, r *http.Request, user c.User, s } pi := c.PanelAnalyticsAgentPage{basePage, system, friendlySystem, graph, timeRange.Range} - return renderTemplate("panel_analytics_system_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_system_views", pi}) } func AnalyticsLanguageViews(w http.ResponseWriter, r *http.Request, user c.User, lang string) c.RouteError { @@ -362,7 +363,7 @@ func AnalyticsLanguageViews(w http.ResponseWriter, r *http.Request, user c.User, } pi := c.PanelAnalyticsAgentPage{basePage, lang, friendlyLang, graph, timeRange.Range} - return renderTemplate("panel_analytics_lang_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_lang_views", pi}) } func AnalyticsReferrerViews(w http.ResponseWriter, r *http.Request, user c.User, domain string) c.RouteError { @@ -394,7 +395,7 @@ func AnalyticsReferrerViews(w http.ResponseWriter, r *http.Request, user c.User, graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList} c.DebugLogf("graph: %+v\n", graph) pi := c.PanelAnalyticsAgentPage{basePage, c.SanitiseSingleLine(domain), "", graph, timeRange.Range} - return renderTemplate("panel_analytics_referrer_views", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_referrer_views", pi}) } func AnalyticsTopics(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -426,8 +427,8 @@ func AnalyticsTopics(w http.ResponseWriter, r *http.Request, user c.User) c.Rout } graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList} c.DebugLogf("graph: %+v\n", graph) - pi := c.PanelAnalyticsPage{basePage, graph, viewItems, timeRange.Range, timeRange.Unit, "time"} - return renderTemplate("panel_analytics_topics", w, r, basePage.Header, &pi) + pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, "time"} + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_topics", pi}) } func AnalyticsPosts(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -459,8 +460,8 @@ func AnalyticsPosts(w http.ResponseWriter, r *http.Request, user c.User) c.Route } graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList} c.DebugLogf("graph: %+v\n", graph) - pi := c.PanelAnalyticsPage{basePage, graph, viewItems, timeRange.Range, timeRange.Unit, "time"} - return renderTemplate("panel_analytics_posts", w, r, basePage.Header, &pi) + pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, "time"} + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_posts", pi}) } func analyticsRowsToNameMap(rows *sql.Rows) (map[string]int, error) { @@ -504,6 +505,7 @@ func analyticsRowsToDuoMap(rows *sql.Rows, labelList []int64, viewMap map[int64] log.Print("createdAt: ", createdAt) log.Print("unixCreatedAt: ", unixCreatedAt) } + vvMap, ok := vMap[name] if !ok { vvMap = make(map[int64]int64) @@ -639,7 +641,7 @@ func AnalyticsForums(w http.ResponseWriter, r *http.Request, user c.User) c.Rout } pi := c.PanelAnalyticsDuoPage{basePage, forumItems, graph, timeRange.Range} - return renderTemplate("panel_analytics_forums", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_forums", pi}) } func AnalyticsRoutes(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -694,7 +696,7 @@ func AnalyticsRoutes(w http.ResponseWriter, r *http.Request, user c.User) c.Rout } pi := c.PanelAnalyticsRoutesPage{basePage, routeItems, graph, timeRange.Range} - return renderTemplate("panel_analytics_routes", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_routes", pi}) } // Trialling multi-series charts @@ -759,7 +761,7 @@ func AnalyticsAgents(w http.ResponseWriter, r *http.Request, user c.User) c.Rout } pi := c.PanelAnalyticsDuoPage{basePage, agentItems, graph, timeRange.Range} - return renderTemplate("panel_analytics_agents", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_agents", pi}) } func AnalyticsSystems(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -823,7 +825,7 @@ func AnalyticsSystems(w http.ResponseWriter, r *http.Request, user c.User) c.Rou } pi := c.PanelAnalyticsDuoPage{basePage, systemItems, graph, timeRange.Range} - return renderTemplate("panel_analytics_systems", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_systems", pi}) } func AnalyticsLanguages(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -888,7 +890,7 @@ func AnalyticsLanguages(w http.ResponseWriter, r *http.Request, user c.User) c.R } pi := c.PanelAnalyticsDuoPage{basePage, langItems, graph, timeRange.Range} - return renderTemplate("panel_analytics_langs", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_langs", pi}) } func AnalyticsReferrers(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError { @@ -920,5 +922,5 @@ func AnalyticsReferrers(w http.ResponseWriter, r *http.Request, user c.User) c.R } pi := c.PanelAnalyticsAgentsPage{basePage, refItems, timeRange.Range} - return renderTemplate("panel_analytics_referrers", w, r, basePage.Header, &pi) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_referrers", pi}) } diff --git a/routes/panel/dashboard.go b/routes/panel/dashboard.go index 460b220f..6cd37252 100644 --- a/routes/panel/dashboard.go +++ b/routes/panel/dashboard.go @@ -172,8 +172,8 @@ func Dashboard(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError //GE{"dash-version", "v" + version.String(), 0, "grid_istat stat_green", "", "", "Gosora is up-to-date :)"}, GE{"dash-version", "v" + c.SoftwareVersion.String(), 0, "grid_istat", "", "", ""}, - GE{"dash-cpu", "CPU: " + cpustr, 1, "grid_istat " + cpuColour, "", "", p.GetTmplPhrase("panel_dashboard_cpu_desc")}, - GE{"dash-ram", "RAM: " + ramstr, 2, "grid_istat " + ramColour, "", "", p.GetTmplPhrase("panel_dashboard_ram_desc")}, + GE{"dash-cpu", p.GetTmplPhrasef("panel_dashboard_cpu",cpustr), 1, "grid_istat " + cpuColour, "", "", p.GetTmplPhrase("panel_dashboard_cpu_desc")}, + GE{"dash-ram", p.GetTmplPhrasef("panel_dashboard_ram",ramstr), 2, "grid_istat " + ramColour, "", "", p.GetTmplPhrase("panel_dashboard_ram_desc")}, } var addElement = func(element GE) { gridElements = append(gridElements, element) @@ -208,10 +208,10 @@ func Dashboard(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError addElement(GE{"dash-reports", strconv.Itoa(reportCount) + " reports" + reportInterval, 11, "grid_stat", "", "", "The number of reports over the last 7 days"}) if false { - addElement(GE{"dash-minperuser", "2 minutes / user / week", 12, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The average number of number of minutes spent by each active user over the last 7 days"*/}) - addElement(GE{"dash-visitorsperweek", "2 visitors / week", 13, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The number of unique visitors we've had over the last 7 days"*/}) - addElement(GE{"dash-postsperuser", "5 posts / user / week", 14, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The average number of posts made by each active user over the past week"*/}) + addElement(GE{"dash-minperuser", "?? minutes / user / week", 12, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The average number of number of minutes spent by each active user over the last 7 days"*/}) + addElement(GE{"dash-visitorsperweek", "?? visitors / week", 13, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The number of unique visitors we've had over the last 7 days"*/}) + addElement(GE{"dash-postsperuser", "?? posts / user / week", 14, "grid_stat stat_disabled", "", "", p.GetTmplPhrase("panel_dashboard_coming_soon") /*"The average number of posts made by each active user over the past week"*/}) } - return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_dashboard_right","panel_dashboard", gridElements}) + return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_dashboard_right","","panel_dashboard", gridElements}) } diff --git a/templates/panel.html b/templates/panel.html index 78be733c..759a8e0b 100644 --- a/templates/panel.html +++ b/templates/panel.html @@ -1,7 +1,7 @@ {{template "header.html" . }}
{{template "panel_menu.html" . }} -
+
{{template "panel_before_head.html" . }} {{dyntmpl .TmplName .Inner .Header}}
diff --git a/templates/panel_analytics_agent_views.html b/templates/panel_analytics_agent_views.html index 7b70f43a..9f591e3e 100644 --- a/templates/panel_analytics_agent_views.html +++ b/templates/panel_analytics_agent_views.html @@ -1,19 +1,11 @@ -{{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" . }}
+
-
-
-{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_agents.html b/templates/panel_analytics_agents.html index 7346c99c..33ad79ae 100644 --- a/templates/panel_analytics_agents.html +++ b/templates/panel_analytics_agents.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_user_agents_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -21,7 +16,4 @@
{{else}}
{{lang "panel_statistics_user_agents_no_user_agents"}}
{{end}}
- - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_forum_views.html b/templates/panel_analytics_forum_views.html index abf80441..128d4b22 100644 --- a/templates/panel_analytics_forum_views.html +++ b/templates/panel_analytics_forum_views.html @@ -1,19 +1,11 @@ -{{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" . }}
+
-
-
-{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_forums.html b/templates/panel_analytics_forums.html index 80d36401..627be8f6 100644 --- a/templates/panel_analytics_forums.html +++ b/templates/panel_analytics_forums.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_forums_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -21,7 +16,4 @@
{{else}}
{{lang "panel_statistics_forums_no_forums"}}
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_lang_views.html b/templates/panel_analytics_lang_views.html index 4e82d111..c12268f4 100644 --- a/templates/panel_analytics_lang_views.html +++ b/templates/panel_analytics_lang_views.html @@ -1,19 +1,11 @@ -{{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" . }}
+
-
-
-{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_langs.html b/templates/panel_analytics_langs.html index 1f7792c4..620df717 100644 --- a/templates/panel_analytics_langs.html +++ b/templates/panel_analytics_langs.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_languages_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -21,7 +16,4 @@
{{else}}
{{lang "panel_statistics_languages_no_languages"}}
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_posts.html b/templates/panel_analytics_posts.html index 1228d913..7675d808 100644 --- a/templates/panel_analytics_posts.html +++ b/templates/panel_analytics_posts.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_post_counts_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -24,7 +19,4 @@
{{else}}
{{lang "panel_statistics_post_counts_no_post_counts"}}
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_referrer_views.html b/templates/panel_analytics_referrer_views.html index 011a08da..c2fc769b 100644 --- a/templates/panel_analytics_referrer_views.html +++ b/templates/panel_analytics_referrer_views.html @@ -1,19 +1,11 @@ -{{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" . }}
+
-
-
-{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_referrers.html b/templates/panel_analytics_referrers.html index fd1e3f7a..3e4c85ad 100644 --- a/templates/panel_analytics_referrers.html +++ b/templates/panel_analytics_referrers.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_referrers_head"}}

{{template "panel_analytics_time_range.html" . }}
+
{{range .ItemList}}
@@ -17,7 +12,4 @@ {{.Count}}{{lang "panel_statistics_views_suffix"}}
{{else}}
{{lang "panel_statistics_referrers_no_referrers"}}
{{end}} -
-
-
-{{template "footer.html" . }} \ No newline at end of file + \ No newline at end of file diff --git a/templates/panel_analytics_route_views.html b/templates/panel_analytics_route_views.html index 9710aa2b..73376e96 100644 --- a/templates/panel_analytics_route_views.html +++ b/templates/panel_analytics_route_views.html @@ -1,15 +1,10 @@ -{{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" . }}
+
@@ -24,7 +19,4 @@
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_routes.html b/templates/panel_analytics_routes.html index 39b0963b..e0577190 100644 --- a/templates/panel_analytics_routes.html +++ b/templates/panel_analytics_routes.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_routes_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -21,7 +16,4 @@
{{else}}
{{lang "panel_statistics_routes_no_routes"}}
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_system_views.html b/templates/panel_analytics_system_views.html index 6364367b..4e36b940 100644 --- a/templates/panel_analytics_system_views.html +++ b/templates/panel_analytics_system_views.html @@ -1,19 +1,11 @@ -{{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" . }}
+
-
-
-{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_systems.html b/templates/panel_analytics_systems.html index f1e77b27..89e05505 100644 --- a/templates/panel_analytics_systems.html +++ b/templates/panel_analytics_systems.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_operating_systems_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -21,7 +16,4 @@
{{else}}
{{lang "panel_statistics_operating_systems_no_operating_systems"}}
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_topics.html b/templates/panel_analytics_topics.html index 3adf513f..8d264f78 100644 --- a/templates/panel_analytics_topics.html +++ b/templates/panel_analytics_topics.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_topic_counts_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -24,7 +19,4 @@
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} +{{template "panel_analytics_script.html" . }} \ No newline at end of file diff --git a/templates/panel_analytics_views.html b/templates/panel_analytics_views.html index 2cc482f4..2c01c7ab 100644 --- a/templates/panel_analytics_views.html +++ b/templates/panel_analytics_views.html @@ -1,15 +1,10 @@ -{{template "header.html" . }} -
-{{template "panel_menu.html" . }} -
-
-{{template "panel_before_head.html" . }}

{{lang "panel_statistics_requests_head"}}

{{template "panel_analytics_time_range.html" . }}
+
@@ -24,7 +19,4 @@
{{end}} - - -{{template "panel_analytics_script.html" . }} -{{template "footer.html" . }} \ No newline at end of file +{{template "panel_analytics_script.html" . }} \ No newline at end of file