From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Jan 2011 19:28:57 +0000 (+0100)
Subject: fireinfo: Add flags to geo statistics.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=665ef07e0fbfd3db2dd6a39e405cb6542349b6f7;p=ipfire.org.git

fireinfo: Add flags to geo statistics.
---

diff --git a/www/static/images/flags/en.png b/www/static/images/flags/en.png
new file mode 120000
index 00000000..288cc7b2
--- /dev/null
+++ b/www/static/images/flags/en.png
@@ -0,0 +1 @@
+gb.png
\ No newline at end of file
diff --git a/www/templates/modules/stasy-table.html b/www/templates/modules/stasy-table.html
index 0c1353ed..7717b784 100644
--- a/www/templates/modules/stasy-table.html
+++ b/www/templates/modules/stasy-table.html
@@ -1,7 +1,12 @@
 <table class="stats">
 	{% for k, v in items %}
 		<tr>
-			<td class="key">{{ k }}</td>
+			<td class="key">
+				{% if flags %}
+					<img src="{{ static_url("images/flags/%s.png" % k) }}" />
+				{% end %}
+				{{ k }}
+			</td>
 			<td class="bar"><p style="{{ "width: %.2f%%" % v }}">&nbsp;</p></td>
 			<td class="value">{{ "%.2f" % v }}%</td>
 		</tr>
diff --git a/www/templates/stasy-stats-geo.html b/www/templates/stasy-stats-geo.html
index ca9d8aa5..ee296e74 100644
--- a/www/templates/stasy-stats-geo.html
+++ b/www/templates/stasy-stats-geo.html
@@ -8,12 +8,12 @@
 		This will give a short overview about what languages are configured
 		on the IPFire webinterface.
 	</p>
-	{{ modules.StasyTable(languages, sortby="percentage") }}
+	{{ modules.StasyTable(languages, sortby="percentage", flags=True) }}
 
 
 	<h3>{{ _("Geo locations") }}</h3>
 	<p>
 		This chart shows us in which country IPFire is running.
 	</p>
-	{{ modules.StasyTable(geo_locations, sortby="percentage") }}
+	{{ modules.StasyTable(geo_locations, sortby="percentage", flags=True) }}
 {% end block %}
diff --git a/www/webapp/ui_modules.py b/www/webapp/ui_modules.py
index eefb8426..a3964ffa 100644
--- a/www/webapp/ui_modules.py
+++ b/www/webapp/ui_modules.py
@@ -141,7 +141,7 @@ class TrackerPeerListModule(UIModule):
 
 
 class StasyTableModule(UIModule):
-	def render(self, items, sortby="key", reverse=False, percentage=False):
+	def render(self, items, sortby="key", reverse=False, percentage=False, flags=False):
 		hundred_percent = 0
 		for v in items.values():
 			hundred_percent += v
@@ -174,7 +174,7 @@ class StasyTableModule(UIModule):
 				_items.append((k, v))
 			items = _items
 
-		return self.render_string("modules/stasy-table.html", items=items)
+		return self.render_string("modules/stasy-table.html", items=items, flags=flags)
 
 
 class StasyDeviceTableModule(UIModule):