diff --git a/media/img/file/192/video.png b/media/img/file/192/video.png new file mode 100644 index 0000000000..b8bf63d61e Binary files /dev/null and b/media/img/file/192/video.png differ diff --git a/media/img/file/24/video.png b/media/img/file/24/video.png new file mode 100644 index 0000000000..af35e8c299 Binary files /dev/null and b/media/img/file/24/video.png differ diff --git a/media/img/file/excel-192.png b/media/img/file/excel-192.png deleted file mode 100644 index bf3266e4c2..0000000000 Binary files a/media/img/file/excel-192.png and /dev/null differ diff --git a/media/img/file/excel.png b/media/img/file/excel.png deleted file mode 100644 index 99f9aaaa9a..0000000000 Binary files a/media/img/file/excel.png and /dev/null differ diff --git a/media/img/file/file-192.png b/media/img/file/file-192.png deleted file mode 100644 index df1352f761..0000000000 Binary files a/media/img/file/file-192.png and /dev/null differ diff --git a/media/img/file/file.png b/media/img/file/file.png deleted file mode 100644 index 4c5e246b30..0000000000 Binary files a/media/img/file/file.png and /dev/null differ diff --git a/media/img/file/music-192.png b/media/img/file/music-192.png deleted file mode 100644 index 6057c995c7..0000000000 Binary files a/media/img/file/music-192.png and /dev/null differ diff --git a/media/img/file/music.png b/media/img/file/music.png deleted file mode 100644 index 3a91d035c8..0000000000 Binary files a/media/img/file/music.png and /dev/null differ diff --git a/media/img/file/pdf-192.png b/media/img/file/pdf-192.png deleted file mode 100644 index 576808cf39..0000000000 Binary files a/media/img/file/pdf-192.png and /dev/null differ diff --git a/media/img/file/pdf.png b/media/img/file/pdf.png deleted file mode 100644 index 11f0d637fa..0000000000 Binary files a/media/img/file/pdf.png and /dev/null differ diff --git a/media/img/file/pic-192.png b/media/img/file/pic-192.png deleted file mode 100644 index 31e0c19f86..0000000000 Binary files a/media/img/file/pic-192.png and /dev/null differ diff --git a/media/img/file/pic.png b/media/img/file/pic.png deleted file mode 100644 index d628f47363..0000000000 Binary files a/media/img/file/pic.png and /dev/null differ diff --git a/media/img/file/ppt-192.png b/media/img/file/ppt-192.png deleted file mode 100644 index bd2b8dd214..0000000000 Binary files a/media/img/file/ppt-192.png and /dev/null differ diff --git a/media/img/file/ppt.png b/media/img/file/ppt.png deleted file mode 100644 index 6aa676fd03..0000000000 Binary files a/media/img/file/ppt.png and /dev/null differ diff --git a/media/img/file/txt-192.png b/media/img/file/txt-192.png deleted file mode 100644 index 3d8d4b5550..0000000000 Binary files a/media/img/file/txt-192.png and /dev/null differ diff --git a/media/img/file/txt.png b/media/img/file/txt.png deleted file mode 100644 index 281abef98e..0000000000 Binary files a/media/img/file/txt.png and /dev/null differ diff --git a/media/img/file/word-192.png b/media/img/file/word-192.png deleted file mode 100644 index 9018b64caf..0000000000 Binary files a/media/img/file/word-192.png and /dev/null differ diff --git a/media/img/file/word.png b/media/img/file/word.png deleted file mode 100644 index 61f26a99a4..0000000000 Binary files a/media/img/file/word.png and /dev/null differ diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py index 92f9a6ccb4..2b9421061f 100644 --- a/seahub/base/templatetags/seahub_tags.py +++ b/seahub/base/templatetags/seahub_tags.py @@ -46,22 +46,39 @@ def tsstr_day(value): # Supported file extensions and file icon name. FILEEXT_ICON_MAP = { + + # text file + 'md': 'txt.png', + 'txt': 'txt.png', + # pdf file 'pdf' : 'pdf.png', + # document file 'doc' : 'word.png', 'docx' : 'word.png', - 'ppt' : 'ppt.png', - 'pptx' : 'ppt.png', - 'xls' : 'excel.png', - 'xlsx' : 'excel.png', - 'txt' : 'txt.png', 'odt' : 'word.png', 'fodt' : 'word.png', - 'ods' : 'excel.png', - 'fods' : 'excel.png', + + 'ppt' : 'ppt.png', + 'pptx' : 'ppt.png', 'odp' : 'ppt.png', 'fodp' : 'ppt.png', + + 'xls' : 'excel.png', + 'xlsx' : 'excel.png', + 'ods' : 'excel.png', + 'fods' : 'excel.png', + + # video + 'mp4': 'video.png', + 'ogv': 'video.png', + 'webm': 'video.png', + 'mov': 'video.png', + 'flv': 'video.png', + 'wmv': 'video.png', + 'rmvb': 'video.png', + # music file 'mp3' : 'music.png', 'oga' : 'music.png', @@ -70,7 +87,8 @@ FILEEXT_ICON_MAP = { 'aac' : 'music.png', 'ac3' : 'music.png', 'wma' : 'music.png', - # picture file + + # image file 'jpg' : 'pic.png', 'jpeg' : 'pic.png', 'png' : 'pic.png', @@ -78,44 +96,9 @@ FILEEXT_ICON_MAP = { 'gif' : 'pic.png', 'bmp' : 'pic.png', 'ico' : 'pic.png', - # normal file and unknown file - 'default' : 'file.png', - # for 192 pixel icon - # pdf file - 'pdf-192' : 'pdf-192.png', - # document file - 'doc-192' : 'word-192.png', - 'docx-192' : 'word-192.png', - 'ppt-192' : 'ppt-192.png', - 'pptx-192' : 'ppt-192.png', - 'xls-192' : 'excel-192.png', - 'xlsx-192' : 'excel-192.png', - 'txt-192' : 'txt-192.png', - 'odt-192' : 'word-192.png', - 'fodt-192' : 'word-192.png', - 'ods-192' : 'excel-192.png', - 'fods-192' : 'excel-192.png', - 'odp-192' : 'ppt-192.png', - 'fodp-192' : 'ppt-192.png', - # music file - 'mp3-192' : 'music-192.png', - 'oga-192' : 'music-192.png', - 'ogg-192' : 'music-192.png', - 'flac-192' : 'music-192.png', - 'aac-192' : 'music-192.png', - 'ac3-192' : 'music-192.png', - 'wma-192' : 'music-192.png', - # picture file - 'jpg-192' : 'pic-192.png', - 'jpeg-192' : 'pic-192.png', - 'png-192' : 'pic-192.png', - 'svg-192' : 'pic-192.png', - 'gif-192' : 'pic-192.png', - 'bmp-192' : 'pic-192.png', - 'ico-192' : 'pic-192.png', - # normal file and unknown file - 'default-192' : 'file-192.png', + # default + 'default' : 'file.png', } @register.filter(name='file_icon_filter') def file_icon_filter(value, size=None): @@ -127,14 +110,14 @@ def file_icon_filter(value, size=None): if file_ext and FILEEXT_ICON_MAP.has_key(file_ext): if size == 192: - return FILEEXT_ICON_MAP.get(file_ext + '-192') + return '192/' + FILEEXT_ICON_MAP.get(file_ext) else: - return FILEEXT_ICON_MAP.get(file_ext) + return '24/' + FILEEXT_ICON_MAP.get(file_ext) else: if size == 192: - return FILEEXT_ICON_MAP.get('default-192') + return '192/' + FILEEXT_ICON_MAP.get('default') else: - return FILEEXT_ICON_MAP.get('default') + return '24/' + FILEEXT_ICON_MAP.get('default') # This way of translation looks silly, but works well. COMMIT_MSG_TRANSLATION_MAP = { diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 81be5fc969..a4943c147c 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -49,7 +49,7 @@ from seahub.base.accounts import User from seahub.thumbnail.utils import get_thumbnail_src from seahub.utils.file_types import IMAGE from seahub.base.templatetags.seahub_tags import translate_seahub_time, \ - file_icon_filter, email2nickname, tsstr_sec + email2nickname, tsstr_sec # Get an instance of a logger logger = logging.getLogger(__name__) @@ -332,7 +332,6 @@ def list_lib_dir(request, repo_id): for f in file_list: f_ = {} f_['is_file'] = True - f_['file_icon'] = file_icon_filter(f.obj_name) f_['obj_name'] = f.obj_name f_['last_modified'] = f.last_modified f_['last_update'] = translate_seahub_time(f.last_modified) diff --git a/static/scripts/common.js b/static/scripts/common.js index 3a32fe1c5e..b4fe42c262 100644 --- a/static/scripts/common.js +++ b/static/scripts/common.js @@ -184,26 +184,39 @@ define([ }, FILEEXT_ICON_MAP: { + // text file 'md': 'txt.png', 'txt': 'txt.png', // pdf file 'pdf' : 'pdf.png', + // document file 'doc' : 'word.png', 'docx' : 'word.png', - 'ppt' : 'ppt.png', - 'pptx' : 'ppt.png', - 'xls' : 'excel.png', - 'xlsx' : 'excel.png', - 'txt' : 'txt.png', 'odt' : 'word.png', 'fodt' : 'word.png', - 'ods' : 'excel.png', - 'fods' : 'excel.png', + + 'ppt' : 'ppt.png', + 'pptx' : 'ppt.png', 'odp' : 'ppt.png', 'fodp' : 'ppt.png', + + 'xls' : 'excel.png', + 'xlsx' : 'excel.png', + 'ods' : 'excel.png', + 'fods' : 'excel.png', + + // video + 'mp4': 'video.png', + 'ogv': 'video.png', + 'webm': 'video.png', + 'mov': 'video.png', + 'flv': 'video.png', + 'wmv': 'video.png', + 'rmvb': 'video.png', + // music file 'mp3' : 'music.png', 'oga' : 'music.png', @@ -212,6 +225,7 @@ define([ 'aac' : 'music.png', 'ac3' : 'music.png', 'wma' : 'music.png', + // image file 'jpg' : 'pic.png', 'jpeg' : 'pic.png', @@ -220,6 +234,7 @@ define([ 'gif' : 'pic.png', 'bmp' : 'pic.png', 'ico' : 'pic.png', + // default 'default' : 'file.png' },