From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Dec 2012 11:41:21 +0000 (+0100)
Subject: Update statistics page a little bit.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5690ee3f0944a879825c489890c484fa50808f3;p=pbs.git

Update statistics page a little bit.
---

diff --git a/data/templates/index.html b/data/templates/index.html
index 9bc3ee95..93dc3777 100644
--- a/data/templates/index.html
+++ b/data/templates/index.html
@@ -71,5 +71,9 @@
 		{% module JobsList(jobs) %}
 	{% end %}
 
-	<a href="/jobs">{{ _("Show more build jobs") }}</a>
+	<ul class="nav nav-pills">
+		<li>
+			<a href="/jobs">{{ _("Show more build jobs") }}</a>
+		</li>
+	</ul>
 {% end %}
diff --git a/data/templates/statistics-main.html b/data/templates/statistics/index.html
similarity index 52%
rename from data/templates/statistics-main.html
rename to data/templates/statistics/index.html
index f9d5c9e3..312a87ee 100644
--- a/data/templates/statistics-main.html
+++ b/data/templates/statistics/index.html
@@ -1,28 +1,24 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Statistics") }}{% end block %}
 
 {% block body %}
-	<h1>{{ _("Statistics") }}</h1>
+	<div class="page-header">
+		<h2>{{ _("Statistics") }}</h2>
+	</div>
+
 	<p>
 		{{ _("On this page, you will find a lot of information bundled in graphs and figures.") }}
 		{{ _("They give a very quick overview about what is going on in the build service.") }}
 	</p>
 
-	<h2>{{ _("Builds") }}</h2>
+	<h3>{{ _("Builds") }}</h3>
 	<ul>
 		<li>
 			{{ _("The average build time is %.1f minutes.") % (jobs_avg_build_time / 60) }}
 		</li>
 		<li>
-			{{ _("There %(builds_count)s builds containing %(jobs_count_all)s jobs.") % globals() }}
+			{{ _("There are %(builds_count)s builds containing %(jobs_count_all)s jobs.") % { "builds_count" : builds_count, "jobs_count_all" : jobs_count_all } }}
 		</li>
 	</ul>
-
-	<h2>{{ _("Users") }}</h2>
-	<p>
-		{{ _("There is currently one user account.", "There are currently %s user accounts.", users_count) % users_count }}
-	</p>
-
-	<div style="clear: both;">&nbsp;</div>
 {% end block %}
diff --git a/web/handlers.py b/web/handlers.py
index d10fe2e9..06ae96da 100644
--- a/web/handlers.py
+++ b/web/handlers.py
@@ -52,12 +52,7 @@ class StatisticsMainHandler(BaseHandler):
 			"jobs_avg_build_time" : self.pakfire.jobs.get_average_build_time(),
 		})
 
-		# User statistics.
-		args.update({
-			"users_count" : self.pakfire.users.count(),
-		})
-
-		self.render("statistics-main.html", **args)
+		self.render("statistics/index.html", **args)
 
 
 class UploadsHandler(BaseHandler):