haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	seahub/group/templates/group/group_discuss.html
	seahub/group/templates/group/new_msg_reply.html
This commit is contained in:
Daniel Pan
2016-03-23 11:58:08 +08:00
parent aa5d51880b
commit 94ace17c26
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
media/img/folder-icon-24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 283 B

2
seahub/api2/templates/api2/discussion.html
View File

@@ -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 %}

2
seahub/api2/templates/api2/discussion_posted.html
View File

@@ -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 %}

2
seahub/api2/templates/api2/new_msg_reply.html
View File

@@ -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 %}

8
seahub/share/templates/share/links.html
View File

@@ -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>
@@ -162,7 +162,7 @@ $('.by-name, .by-time').click(function() {
// define 'sort by' functions
var by_name_up = function (a, b) {
var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
var b_name_code = b.name.charCodeAt(0);
if ((a_name_code >= 19968 && a_name_code <= 40869) &&
(b_name_code >= 19968 && b_name_code <= 40869)) {
@@ -179,7 +179,7 @@ $('.by-name, .by-time').click(function() {
}
};
var by_name_down = function (a, b) {
var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
var b_name_code = b.name.charCodeAt(0);
if ((a_name_code >= 19968 && a_name_code <= 40869) &&
(b_name_code >= 19968 && b_name_code <= 40869)) {

2
seahub/share/templates/share/list_priv_shared_folders.html
View File

@@ -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>

2
seahub/templates/js/templates.html
View File

@@ -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>

2
seahub/templates/repo_history_view.html
View File

@@ -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>

2
seahub/templates/snippets/repo_dir_trash_tr.html
View File

@@ -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>

4
seahub/templates/sysadmin/userinfo.html
View File

@@ -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>

2
seahub/templates/view_shared_dir.html
View File

@@ -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>