Replace folder-icon-24.png with folder-icon.png

Conflicts:
	seahub/group/templates/group/group_discuss.html
	seahub/group/templates/group/new_msg_reply.html

seahub/api2/templates/api2/discussion.html

@@ -33,7 +33,7 @@
                             {% endif %}
                         {% endif %}
                     {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
+                    <img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
                     <span class="name vam">{{ ma.name }}</span>
                     {% endif %}
                     {% endif %}

seahub/api2/templates/api2/discussion_posted.html

@@ -26,7 +26,7 @@
                             {% endif %}
                         {% endif %}
                     {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
+                    <img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
                     <span class="name vam">{{ ma.name }}</span>
                     {% endif %}
                     {% endif %}

seahub/api2/templates/api2/new_msg_reply.html

@@ -34,7 +34,7 @@
                             {% endif %}
                         {% endif %}
                     {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
+                    <img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
                     <span class="name vam">{{ ma.name }}</span>
                     {% endif %}
                     {% endif %}

seahub/share/templates/share/links.html

@@ -29,7 +29,7 @@
                 <td class="alc"><img src="{{ MEDIA_URL }}img/file/{{ fs.filename|file_icon_filter }}" alt="{% trans "File"%}" /></td>
                 <td><a href="{% url 'view_lib_file' fs.repo.id fs.path %}">{{ fs.filename }}</a></td>
                 {% else %}
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td><a href="{% url 'view_common_lib_dir' fs.repo.id fs.path|strip_slash %}">{{ fs.filename }}</a></td>
                 {% endif %}
                 <td><a href="{% url 'view_common_lib_dir' fs.repo.id '' %}">{{ fs.repo.name }}</a></td>
@@ -70,7 +70,7 @@
             </tr>
             {% for link in uploadlinks %}
             <tr>
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td><a href="{% url 'view_common_lib_dir' link.repo.id link.path|strip_slash %}">{{ link.dir_name }}</a></td>
                 <td><a href="{% url 'view_common_lib_dir' link.repo.id '' %}">{{ link.repo.name }}</a></td>
                 <td>{{ link.view_cnt }}</td>

seahub/share/templates/share/list_priv_shared_folders.html

@@ -19,7 +19,7 @@
     </tr>
     {% for repo in shared_folders %}
     <tr data="{{repo.props.share_type}}">
-        <td><img src="{{MEDIA_URL}}img/folder-icon-24.png" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
+        <td><img src="{{MEDIA_URL}}img/folder-24.png" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
         <td data="{{ repo.props.repo_id }}"><a href="{% url 'view_common_lib_dir' repo.origin_repo_id repo.origin_path|strip_slash %}">{{ repo.props.repo_name }}</a></td>
         <td data="{{repo.props.user_info}}" title="{{ repo.props.user }}">{{ repo.props.user | email2nickname }}</td>
         <td>

seahub/templates/js/templates.html

@@ -1218,7 +1218,7 @@
 </script>
 <script type="text/template" id="repo-shared-link-tmpl">
     <% if (share_type == 'd') { %>
-    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
     <td><a href="#my-libs/lib/<%= repo_id %><%= encoded_path %>"><%- name %></a></td>
     <% } else { %>
     <td class="alc"><img src="{{ MEDIA_URL }}img/file/file.png" alt="{% trans "File"%}" /></td>

seahub/templates/repo_history_view.html

@@ -61,7 +61,7 @@
 
                 {% for dirent in dir_list %}
                 <tr>
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory"%}" /></td>
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory"%}" /></td>
                     <td><a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a></td>
                     <td></td>
                     <td><a class="op vh restore-dir" href="#" data-url="{% url 'repo_revert_dir' repo.id %}?commit={{ current_commit.id }}&p={{ path|urlencode }}{{dirent.obj_name|urlencode}}">{% trans "Restore" %}</a></td>

seahub/templates/snippets/repo_dir_trash_tr.html

@@ -3,7 +3,7 @@
 {% for dirent in dir_entries %}
 {% if dirent.is_dir %}
 <tr>
-    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory" %}" /></td>
+    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory" %}" /></td>
     {% if show_recycle_root %}
     <td><a href="?commit_id={{ dirent.commit_id }}&base={{ dirent.basedir|urlencode }}&p=/{{ dirent.obj_name|urlencode }}&dir_path={{dir_path|urlencode}}">{{ dirent.obj_name }}</a></td>
     <td>{{ dirent.delete_time|translate_seahub_time }}</td>

seahub/templates/sysadmin/userinfo.html

@@ -171,7 +171,7 @@
                     <td>{{ link.filename }}</td>
                     <td>{{ link.file_size|filesizeformat}}</td>
                     {% else %}
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                     <td>{{ link.filename }}</td>
                     <td>{{ link.dir_size|filesizeformat}}</td>
                     {% endif %}
@@ -181,7 +181,7 @@
                         <a class="op vh rm-link" href="#" data-url="{% url 'sys_publink_remove' %}" data-token="{{ link.token }}">{% trans "Remove"%}</a>
                     </td>
                 {% else %}
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                     <td>{{ link.dir_name }}</td>
                     <td>--</td>
                     <td>{% trans "Upload" %}</td>

seahub/templates/view_shared_dir.html

@@ -57,7 +57,7 @@
         <tbody>
             {% for dirent in dir_list %}
             <tr>
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td>
                     <a href="?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&mode={{mode}}" class="normal">{{ dirent.obj_name }}</a>
                 </td>