From 6f0fcd6cb1c2599d74c7aaa33ce891e5d76bd88e Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 14 Mar 2016 12:15:28 +0800
Subject: [PATCH] [lib list] modification about 'icon_title'

---
 seahub/templates/js/templates.html            | 36 +++----------------
 static/scripts/app/models/repo.js             | 13 +++++++
 static/scripts/app/views/group-repo.js        |  3 +-
 static/scripts/app/views/organization-repo.js |  5 ++-
 static/scripts/app/views/repo.js              |  5 ++-
 static/scripts/app/views/shared-repo.js       |  5 ++-
 6 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index f7065dee38..bb103c0b1d 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -30,11 +30,7 @@
 </script>
 <script type="text/template" id="repo-tmpl">
     <td>
-        <% if (encrypted) { %>
-        <img src="<%- icon_url %>" title="{% trans "Encrypted" %}" alt="" width="24" />
-        <% } else { %>
-        <img src="<%- icon_url %>" title="{% trans "Read-Write" %}" alt="" width="24" />
-        <% } %>
+        <img src="<%= icon_url %>" title="<%= icon_title %>" alt="" width="24" />
     </td>
     <% if (name) { %>
     <td><span class="repo-name-span"><a href="#my-libs/lib/<%= id %>"><%- name %></a></span></td>
@@ -67,15 +63,7 @@
 </script>
 <script type="text/template" id="group-repo-tmpl">
     <td>
-        <% if (encrypted) { %>
-        <img src="<%- icon_url %>" title="{% trans "Encrypted" %}" alt="" width="24" />
-        <% } else { %>
-            <% if (permission == 'rw') { %>
-        <img src="<%- icon_url %>" title="{% trans "Read-Write" %}" alt="" width="24" />
-            <% } else { %>
-        <img src="<%- icon_url %>" title="{% trans "Read-Only" %}" alt="" width="24" />
-            <% } %>
-        <% } %>
+        <img src="<%= icon_url %>" title="<%= icon_title %>" alt="" width="24" />
     </td>
     <td><a href="#group/<%= group_id %>/lib/<%= id %>"><%- name %></a></td>
     <td class="alc">
@@ -91,15 +79,7 @@
 </script>
 <script type="text/template" id="organization-repo-tmpl">
     <td>
-        <% if (encrypted) { %>
-        <img src="<%- icon_url %>" title="{% trans "Encrypted" %}" alt="" width="24" />
-        <% } else { %>
-            <% if (permission == 'rw') { %>
-        <img src="<%- icon_url %>" title="{% trans "Read-Write" %}" alt="" width="24" />
-            <% } else { %>
-        <img src="<%- icon_url %>" title="{% trans "Read-Only" %}" alt="" width="24" />
-            <% } %>
-        <% } %>
+        <img src="<%= icon_url %>" title="<%= icon_title %>" alt="" width="24" />
     </td>
     <td><a href="#org/lib/<%= id %>"><%- name %></a></td>
     <td class="alc">
@@ -603,15 +583,7 @@
 </script>
 <script type="text/template" id="shared-repo-tmpl">
     <td>
-        <% if (encrypted) { %>
-            <img src="<%- icon_url %>" title="{% trans "Read-Write" %}" alt="" width="24" />
-        <% } else { %>
-            <% if (permission == 'rw') { %>
-            <img src="<%- icon_url %>" title="{% trans "Read-Write" %}" alt="" width="24" />
-            <% } else { %>
-            <img src="<%- icon_url %>" title="{% trans "Read-Only" %}" alt="" width="24" />
-            <% } %>
-        <% } %>
+        <img src="<%= icon_url %>" title="<%= icon_title %>" alt="" width="24" />
     </td>
     <td><a href="#shared-libs/lib/<%= id %>"><%- name %></a></td>
     <td class="alc">
diff --git a/static/scripts/app/models/repo.js b/static/scripts/app/models/repo.js
index 8c958824f5..2b5a99c52e 100644
--- a/static/scripts/app/models/repo.js
+++ b/static/scripts/app/models/repo.js
@@ -45,6 +45,19 @@ define([
             var is_encrypted = this.get('encrypted');
             var is_readonly = this.get('permission') == "r" ? true : false;
             return Common.getLibIconUrl(is_encrypted, is_readonly, size);
+        },
+
+        getIconTitle: function() {
+            var icon_title = '';
+            if (this.get('encrypted')) {
+                icon_title = gettext("Encrypted");
+            } else if (this.get('permission') == "rw") {
+                icon_title = gettext("Read-Write");
+            } else {
+                icon_title = gettext("Read-Only");
+            }
+
+            return icon_title;
         }
 
     });
diff --git a/static/scripts/app/views/group-repo.js b/static/scripts/app/views/group-repo.js
index d71c243e2e..f4d4952321 100644
--- a/static/scripts/app/views/group-repo.js
+++ b/static/scripts/app/views/group-repo.js
@@ -41,7 +41,8 @@ define([
                 // 'owner_name' for '#groups', 'owner_nickname' for '#group/id/'
                 owner_name: this.model.get('owner_nickname') || this.model.get('owner_name'),
                 show_shared_by: this.show_shared_by,
-                icon_url: icon_url
+                icon_url: icon_url,
+                icon_title: this.model.getIconTitle()
             });
             this.$el.html(this.template(obj));
             return this;
diff --git a/static/scripts/app/views/organization-repo.js b/static/scripts/app/views/organization-repo.js
index 14d452fdbd..8fa7b918e8 100644
--- a/static/scripts/app/views/organization-repo.js
+++ b/static/scripts/app/views/organization-repo.js
@@ -18,7 +18,10 @@ define([
             var obj = this.model.toJSON();
             var icon_size = Common.isHiDPI() ? 96 : 24;
             var icon_url = this.model.getIconUrl(icon_size);
-            _.extend(obj, { 'icon_url': icon_url });
+            _.extend(obj, {
+                'icon_url': icon_url,
+                'icon_title': this.model.getIconTitle()
+            });
             this.$el.html(this.template(obj));
             return this;
         },
diff --git a/static/scripts/app/views/repo.js b/static/scripts/app/views/repo.js
index 6f13e865b2..bc1f10c3c5 100644
--- a/static/scripts/app/views/repo.js
+++ b/static/scripts/app/views/repo.js
@@ -42,7 +42,10 @@ define([
             var obj = this.model.toJSON();
             var icon_size = Common.isHiDPI() ? 96 : 24;
             var icon_url = this.model.getIconUrl(icon_size);
-            _.extend(obj, { 'icon_url': icon_url });
+            _.extend(obj, {
+                'icon_url': icon_url,
+                'icon_title': this.model.getIconTitle()
+            });
             this.$el.html(this.template(obj));
             return this;
         },
diff --git a/static/scripts/app/views/shared-repo.js b/static/scripts/app/views/shared-repo.js
index 7644dd8ce8..caa04844fc 100644
--- a/static/scripts/app/views/shared-repo.js
+++ b/static/scripts/app/views/shared-repo.js
@@ -50,7 +50,10 @@ define([
             var obj = this.model.toJSON();
             var icon_size = Common.isHiDPI() ? 96 : 24;
             var icon_url = this.model.getIconUrl(icon_size);
-            _.extend(obj, { 'icon_url': icon_url });
+            _.extend(obj, {
+                'icon_url': icon_url,
+                'icon_title': this.model.getIconTitle()
+            });
             this.$el.html(this.template(obj));
             return this;
         },