From 7effd00162b971efaae8e633d34f40a6ac3fcd7a Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 27 Feb 2014 12:01:25 +0800
Subject: [PATCH] [traffic admin] improved ui

---
 media/css/seahub.css                          |   7 +++
 media/img/traffic.png                         | Bin 0 -> 141 bytes
 media/img/traffic_w.png                       | Bin 0 -> 141 bytes
 seahub/templates/sysadmin/base.html           |   2 +-
 .../templates/sysadmin/sys_trafficadmin.html  |  53 ++++++++++--------
 5 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 media/img/traffic.png
 create mode 100644 media/img/traffic_w.png

diff --git a/media/css/seahub.css b/media/css/seahub.css
index c745ae85c4..79067d1136 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -457,6 +457,13 @@ textarea:-moz-placeholder {/* for FF */
 .side-tabnav-tabs .tab-cur .group {
     background-image:url('../img/groups_w.png');
 }
+.side-tabnav-tabs .tab .traffic {
+    background-image:url('../img/traffic.png');
+    background-position: 13px 50%;
+}
+.side-tabnav-tabs .tab-cur .traffic {
+    background-image:url('../img/traffic_w.png');
+}
 .side-tabnav-tabs .tab a:hover {
     background-color:#feefb8;
     text-decoration:none;
diff --git a/media/img/traffic.png b/media/img/traffic.png
new file mode 100644
index 0000000000000000000000000000000000000000..316e75ae0fbcaf3d81451e8bab90562ab142932b
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv*!2%@X&i1?nQX!r$jv*C{$w>|j%xxM9CJ6_a
zCQQv_tn_i1)L^8>;prf`>}$nT#Wm^+coJ=$82A-pCC}_+nR0NBw}a%Noj;n`Jf-3<
p2n4Wg?!LwNN!sT>W0H*yL*0Gey=)naErI4Uc)I$ztaD0e0ss$eDeV9N

literal 0
HcmV?d00001

diff --git a/media/img/traffic_w.png b/media/img/traffic_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..50d592c92ebe1160c26fe53c634af13864783a21
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv*!3HG19C1kkQX!r$jv*Ddu1+xIVo=~={#{|O
z<G1SwU(*GPj=~GgI+A=s(Toa}uRM%c8F(izJIORX)h2er#}Z$$A700fa~au%O=kUO
p9jAJtVyYVV9^KP3M2h`(^F;@)xW0H^LM_mI22WQ%mvv4FO#s<QEolG%

literal 0
HcmV?d00001

diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index d0d5a022d4..18924ef128 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -22,7 +22,7 @@
         </li>
         {% if traffic_stats_enabled %}
         <li class="tab {% block cur_traffic %}{% endblock %}">
-            <a href="{{ SITE_ROOT }}sys/trafficadmin/" class="links">{% trans "Traffic" %}</a>
+            <a href="{{ SITE_ROOT }}sys/trafficadmin/" class="traffic">{% trans "Traffic" %}</a>
         </li>
         {% endif %}
     </ul>
diff --git a/seahub/templates/sysadmin/sys_trafficadmin.html b/seahub/templates/sysadmin/sys_trafficadmin.html
index d90eb6299e..b1642b95bf 100644
--- a/seahub/templates/sysadmin/sys_trafficadmin.html
+++ b/seahub/templates/sysadmin/sys_trafficadmin.html
@@ -1,32 +1,39 @@
-{% extends "admin_base.html" %}
+{% extends "sysadmin/base.html" %}
+
 {% load seahub_tags i18n %}
-{% block nav_trafficadmin_class %}class="cur"{% endblock %}
 
-{% block main_panel %}
+{% block cur_traffic %}tab-cur{% endblock %}
 
-<form action="{{ sys_traffic_admin }}" method="GET" autocomplete="off">
-  <label for="month">{% trans "Month (like 201403):" %}</label>
-  <input type="text" name="month" maxlength="6" value="{{ month }}" />
+{% block extra_style %}
+<style type="text/css">
+#traffic-month-form {
+    margin-top:10px; 
+}
+#traffic-month-form .input {
+    width:100px;
+}
+</style>
+{% endblock %}
+
+{% block right_panel %}
+<h3 class="hd">{% trans "User Traffic" %}</h3>
+
+<form action="{{ sys_traffic_admin }}" method="get" autocomplete="off" id="traffic-month-form">
+    <label for="month">{% trans "Month:" %}</label>
+    <input type="text" name="month" maxlength="6" value="{{ month }}" class="input" />
 </form>
 
 <table>
-  <tr>
-    <th>{% trans "User" %}</th>
-    <th>{% trans "Total Usage" %}</th>
-    <th>{% trans "Shared File View" %}</th>
-    <th>{% trans "Shared File Download" %}</th>
-    <th>{% trans "Shared Folder Download" %}</th>
-  </tr>
-  {% for info in traffic_info_list %}
-  <tr>
-    <td>{{ info.email }}</td>
-    <td>{{ info.total |filesizeformat }}</td>
-    <td>{{ info.file_view |filesizeformat }}</td>
-    <td>{{ info.file_download |filesizeformat }}</td>
-    <td>{{ info.dir_download |filesizeformat }}</td>
-    <td></td>
-  </tr>
-  {% endfor %}
+    <tr>
+        <th>{% trans "User" %}</th>
+        <th>{% trans "Total Usage" %}</th>
+    </tr>
+    {% for info in traffic_info_list %}
+    <tr>
+        <td>{{ info.email }}</td>
+        <td>{{ info.total |filesizeformat }}</td>
+    </tr>
+    {% endfor %}
 </table>
 
 <div id="paginator">