From ad450d6df9ea88dc588824d024ecf7eca8570e3b Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 31 Aug 2015 16:56:14 +0800
Subject: [PATCH] add 'virus scan' icon to sidenav, modified 'repo
 setting/history/trash' ui code

---
 media/css/seahub.css                | 12 ++++--------
 seahub/templates/js/templates.html  | 16 +++++++++-------
 seahub/templates/sysadmin/base.html |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index b7f0ad2bb7..9d6c6ffc9f 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -119,7 +119,7 @@
 .sf2-icon-history:before { content:"\e014"; }
 .sf2-icon-settings:before { content:"\e015"; }
 .sf2-icon-trash:before { content:"\e016"; }
-.sf2-icon-anti-virus:before { content:"\e017"; }
+.sf2-icon-security:before { content:"\e017"; }
 .sf2-icon-edit:before { content:"\e018"; }
 .sf2-icon-eye:before { content:"\e019"; }
 
@@ -3355,21 +3355,17 @@ textarea:-moz-placeholder {/* for FF */
 }
 /* multi repo operation */
 .repo-op .op-link {
-    width:30px;
+    display:inline-block;
     height:30px;
-    text-align:center;
-    margin-right:10px;
+    margin-right:15px;
     color:#8a8a8a;
+    font-size:22px;
     outline:none; /* removing the dotted outline for FireFox */
 }
 .repo-op .op-link:hover {
     color:#eb8205;
     text-decoration:none;
 }
-.repo-op .op-link [class^="sf2-icon-"] {
-    font-size:22px;
-    line-height:31px;
-}
 /* multi dirents operation */
 #multi-dirents-op {
     padding: 0 10px;
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 6ad165c107..02c152a3cb 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -134,13 +134,15 @@
     <button class="op-btn" id="share-cur-dir">{% trans "Share" %}</button>
     <% } %>
     <% if (path == '/') { %>
-    <a class="op-link fright" href="<%= site_root %>repo/history/<%- repo_id %>/" target="_blank" title="{% trans 'History' %}"><span class="sf2-icon-history"></span></a>
-    <% if (user_perm == 'rw') { %>
-    <a class="op-link fright" href="<%= site_root %>repo/recycle/<%- repo_id %>/" target="_blank" title="{% trans 'Trash' %}"><span class="sf2-icon-trash"></span></a>
-    <% } %>
-    <% if (is_repo_owner && !is_virtual) { %>
-    <a class="op-link fright" href="<%= site_root %>repo/<%- repo_id %>/settings/" target="_blank" title="{% trans 'Settings' %}"><span class="sf2-icon-settings"></span></a>
-    <% } %>
+        <div class="fright">
+            <% if (is_repo_owner && !is_virtual) { %>
+            <a class="op-link sf2-icon-settings" href="<%= site_root %>repo/<%- repo_id %>/settings/" target="_blank" title="{% trans 'Settings' %}"></a>
+            <% } %>
+            <% if (user_perm == 'rw') { %>
+            <a class="op-link sf2-icon-trash" href="<%= site_root %>repo/recycle/<%- repo_id %>/" target="_blank" title="{% trans 'Trash' %}"></a>
+            <% } %>
+            <a class="op-link sf2-icon-history" href="<%= site_root %>repo/history/<%- repo_id %>/" target="_blank" title="{% trans 'History' %}"></a>
+        </div>
     <% } %>
 </script>
 <script type="text/template" id="dir-path-bar-tmpl">
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 5483174042..d3c5be9a62 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -40,7 +40,7 @@
         {% endif %}
         {% if events_enabled %}
         <li class="tab {% block cur_virus_scan %}{% endblock %}">
-            <a href="{{ SITE_ROOT }}sys/virus_scan_records/" class="security">{% trans "Virus Scan" %}</a>
+            <a href="{{ SITE_ROOT }}sys/virus_scan_records/"><span class="sf2-icon-security"></span>{% trans "Virus Scan" %}</a>
         </li>
         {% endif %}
     </ul>