diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts index bd4a543ff81..0e28f77ade5 100644 --- a/src/addons/mod/resource/services/handlers/module.ts +++ b/src/addons/mod/resource/services/handlers/module.ts @@ -264,7 +264,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase iconIsShape(module?: CoreCourseModuleData | undefined, modicon?: string | undefined): boolean | undefined { const iconUrl = module?.modicon ?? modicon; - return !iconUrl?.startsWith('assets/img/files/'); + return !iconUrl?.startsWith('assets/img/files_legacy/') && !iconUrl?.endsWith('.png'); } } diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts index c4ea9f52a93..d662a57e28c 100644 --- a/src/addons/mod/url/services/handlers/module.ts +++ b/src/addons/mod/url/services/handlers/module.ts @@ -187,7 +187,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple iconIsShape(module?: CoreCourseModuleData | undefined, modicon?: string | undefined): boolean | undefined { const iconUrl = module?.modicon ?? modicon; - return !iconUrl?.startsWith('assets/img/files/'); + return !iconUrl?.startsWith('assets/img/files_legacy/') && !iconUrl?.endsWith('.png'); } /** diff --git a/src/assets/exttomime.json b/src/assets/exttomime.json index f8056e6b088..89aaa388c41 100644 --- a/src/assets/exttomime.json +++ b/src/assets/exttomime.json @@ -5,8 +5,8 @@ "3dml": {"type":"text/vnd.in3d.3dml"}, "3ds": {"type":"image/x-3ds"}, "3g2": {"type":"video/3gpp2"}, -"3gp": {"type":"video/3gpp","icon":"quicktime","string":"video","groups":["video"]}, -"3gpp": {"type":"video/3gpp","icon":"quicktime","string":"video","groups":["video"]}, +"3gp": {"type":"video/3gpp","icon":"video","string":"video","groups":["video"]}, +"3gpp": {"type":"video/3gpp","icon":"video","string":"video","groups":["video"]}, "7z": {"type":"application/x-7z-compressed","icon":"archive","string":"archive","groups":["archive"]}, "a": {"type":"application/octet-stream"}, "aab": {"type":"application/x-authorware-bin"}, @@ -17,7 +17,7 @@ "abw": {"type":"application/x-abiword"}, "ac": {"type":"application/pkix-attr-cert"}, "acc": {"type":"application/vnd.americandynamics.acc"}, -"accdb": {"type":"application/msaccess","icon":"base"}, +"accdb": {"type":"application/msaccess","icon":"database"}, "ace": {"type":"application/x-ace-compressed","icon":"archive"}, "acgi": {"type":"text/html"}, "acu": {"type":"application/vnd.acucobol"}, @@ -53,7 +53,7 @@ "asax": {"type":"application/octet-stream"}, "asc": {"type":"text/plain","icon":"sourcecode"}, "ascx": {"type":"text/plain"}, -"asf": {"type":"video/x-ms-asf","icon":"wmv","string":"video","groups":["video"]}, +"asf": {"type":"video/x-ms-asf","icon":"video","string":"video","groups":["video"]}, "ashx": {"type":"text/plain"}, "asm": {"type":"text/plain","icon":"sourcecode"}, "asmx": {"type":"text/plain"}, @@ -67,7 +67,7 @@ "atomsvc": {"type":"application/atomsvc+xml","icon":"markup"}, "atx": {"type":"application/vnd.antix.game-component"}, "au": {"type":"audio/au","icon":"audio","string":"audio","groups":["audio"]}, -"avi": {"type":"video/x-ms-wm","icon":"avi","string":"video","groups":["video","web_video"]}, +"avi": {"type":"video/x-ms-wm","icon":"video","string":"video","groups":["video","web_video"]}, "avs": {"type":"video/avs-video"}, "aw": {"type":"application/applixware"}, "axd": {"type":"text/plain"}, @@ -84,9 +84,9 @@ "bin": {"type":"application/octet-stream"}, "blb": {"type":"application/x-blorb"}, "blorb": {"type":"application/x-blorb"}, -"bm": {"type":"image/bmp","icon":"bmp","string":"image","groups":["image","web_image"]}, +"bm": {"type":"image/bmp","icon":"image","string":"image","groups":["image","web_image"]}, "bmi": {"type":"application/vnd.bmi"}, -"bmp": {"type":"image/bmp","icon":"bmp","string":"image","groups":["image","web_image"]}, +"bmp": {"type":"image/bmp","icon":"image","string":"image","groups":["image","web_image"]}, "boo": {"type":"application/book"}, "book": {"type":"application/vnd.framemaker"}, "box": {"type":"application/vnd.previewsystems.box"}, @@ -200,7 +200,7 @@ "dfac": {"type":"application/vnd.dreamfactory"}, "dgc": {"type":"application/x-dgc-compressed"}, "dic": {"type":"text/x-c"}, -"dif": {"type":"video/x-dv","icon":"quicktime","string":"video","groups":["video"]}, +"dif": {"type":"video/x-dv","icon":"video","string":"video","groups":["video"]}, "dir": {"type":"application/x-director","icon":"flash"}, "dis": {"type":"application/vnd.mobius.dis"}, "dist": {"type":"application/octet-stream"}, @@ -230,7 +230,7 @@ "dts": {"type":"audio/vnd.dts"}, "dtshd": {"type":"audio/vnd.dts.hd"}, "dump": {"type":"application/octet-stream"}, -"dv": {"type":"video/x-dv","icon":"quicktime","string":"video","groups":["video"]}, +"dv": {"type":"video/x-dv","icon":"video","string":"video","groups":["video"]}, "dvb": {"type":"video/vnd.dvb.file"}, "dvi": {"type":"application/x-dvi"}, "dwf": {"type":"model/vnd.dwf"}, @@ -299,7 +299,7 @@ "fly": {"type":"text/vnd.fly"}, "fm": {"type":"application/vnd.framemaker"}, "fmf": {"type":"video/x-atomic3d-feature"}, -"fmp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, +"fmp4": {"type":"video/mp4","icon":"video","string":"video","groups":["html_video","video","web_video"]}, "fnc": {"type":"application/vnd.frogans.fnc"}, "for": {"type":"text/x-fortran"}, "fpx": {"type":"image/vnd.fpx"}, @@ -333,7 +333,7 @@ "ggb": {"type":"application/vnd.geogebra.file","icon":"archive"}, "ggt": {"type":"application/vnd.geogebra.tool","icon":"archive"}, "ghf": {"type":"application/vnd.groove-help"}, -"gif": {"type":"image/gif","icon":"gif","string":"image","groups":["image","web_image"]}, +"gif": {"type":"image/gif","icon":"gif","string":"image","groups":["image","web_image","optimised_image"]}, "gim": {"type":"application/vnd.groove-identity-message"}, "gl": {"type":"video/gl"}, "gml": {"type":"application/gml+xml"}, @@ -385,8 +385,8 @@ "hta": {"type":"application/octet-stream"}, "htc": {"type":"text/x-component","icon":"markup"}, "htke": {"type":"application/vnd.kenameaapp"}, -"htm": {"type":"text/html","icon":"html","groups":["web_file"]}, -"html": {"type":"text/html","icon":"html","groups":["web_file"]}, +"htm": {"type":"text/html","icon":"markup","groups":["web_file"]}, +"html": {"type":"text/html","icon":"markup","groups":["web_file"]}, "htmls": {"type":"text/html"}, "htt": {"type":"text/webviewhtml"}, "htx": {"type":"text/html"}, @@ -457,9 +457,9 @@ "jmx": {"type":"text/xml","icon":"markup"}, "jnlp": {"type":"application/x-java-jnlp-file","icon":"markup"}, "joda": {"type":"application/vnd.joost.joda-archive"}, -"jpe": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]}, -"jpeg": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]}, -"jpg": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]}, +"jpe": {"type":"image/jpeg","icon":"image","string":"image","groups":["image","web_image","optimised_image"]}, +"jpeg": {"type":"image/jpeg","icon":"image","string":"image","groups":["image","web_image","optimised_image"]}, +"jpg": {"type":"image/jpeg","icon":"image","string":"image","groups":["image","web_image","optimised_image"]}, "jpgm": {"type":"video/jpm"}, "jpgv": {"type":"video/jpeg"}, "jpm": {"type":"video/jpm"}, @@ -528,11 +528,11 @@ "m2a": {"type":"audio/mpeg"}, "m2v": {"type":"video/mpeg"}, "m3a": {"type":"audio/mpeg"}, -"m3u": {"type":"audio/x-mpegurl","icon":"mp3","string":"audio","groups":["audio"]}, -"m3u8": {"type":"application/x-mpegURL","icon":"mpeg","groups":["media_source"]}, -"m4a": {"type":"audio/mp4","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]}, +"m3u": {"type":"audio/x-mpegurl","icon":"audio","string":"audio","groups":["audio"]}, +"m3u8": {"type":"application/x-mpegURL","icon":"video","groups":["media_source"]}, +"m4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "m4u": {"type":"video/vnd.mpegurl"}, -"m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, +"m4v": {"type":"video/mp4","icon":"video","string":"video","groups":["html_video","video","web_video"]}, "ma": {"type":"application/mathematica","string":"math"}, "mads": {"type":"application/mads+xml"}, "mag": {"type":"application/vnd.ecowin.chart"}, @@ -552,7 +552,7 @@ "mcf": {"type":"image/vasa"}, "mcp": {"type":"application/netmc"}, "mcurl": {"type":"text/vnd.curl.mcurl"}, -"mdb": {"type":"application/x-msaccess","icon":"base"}, +"mdb": {"type":"application/x-msaccess","icon":"database"}, "mdi": {"type":"image/vnd.ms-modi"}, "me": {"type":"text/troff"}, "mesh": {"type":"model/mesh"}, @@ -590,22 +590,22 @@ "mod": {"type":"audio/mod"}, "mods": {"type":"application/mods+xml"}, "moov": {"type":"video/quicktime"}, -"mov": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video","html_video"]}, -"movie": {"type":"video/x-sgi-movie","icon":"quicktime","string":"video","groups":["video"]}, +"mov": {"type":"video/quicktime","icon":"video","string":"video","groups":["video","web_video","html_video"]}, +"movie": {"type":"video/x-sgi-movie","icon":"video","string":"video","groups":["video"]}, "mp2": {"type":"audio/mpeg"}, "mp21": {"type":"application/mp21"}, "mp2a": {"type":"audio/mpeg"}, -"mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]}, -"mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, +"mp3": {"type":"audio/mp3","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, +"mp4": {"type":"video/mp4","icon":"video","string":"video","groups":["html_video","video","web_video"]}, "mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "mp4s": {"type":"application/mp4"}, -"mp4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]}, +"mp4v": {"type":"video/mp4","icon":"video","string":"video","groups":["video","web_video"]}, "mpa": {"type":"audio/mpeg"}, "mpc": {"type":"application/vnd.mophun.certificate"}, -"mpd": {"type":"application/dash+xml","icon":"mpeg","groups":["media_source"]}, -"mpe": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, -"mpeg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, -"mpg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, +"mpd": {"type":"application/dash+xml","icon":"video","groups":["media_source"]}, +"mpe": {"type":"video/mpeg","icon":"video","string":"video","groups":["video","web_video"]}, +"mpeg": {"type":"video/mpeg","icon":"video","string":"video","groups":["video","web_video"]}, +"mpg": {"type":"video/mpeg","icon":"video","string":"video","groups":["video","web_video"]}, "mpg4": {"type":"video/mp4"}, "mpga": {"type":"audio/mpeg"}, "mpkg": {"type":"application/vnd.apple.installer+xml"}, @@ -680,7 +680,7 @@ "obd": {"type":"application/x-msbinder"}, "obj": {"type":"application/x-tgif"}, "oda": {"type":"application/oda"}, -"odb": {"type":"application/vnd.oasis.opendocument.database","icon":"base"}, +"odb": {"type":"application/vnd.oasis.opendocument.database","icon":"database"}, "odc": {"type":"application/vnd.oasis.opendocument.chart","icon":"chart"}, "odf": {"type":"application/vnd.oasis.opendocument.formula","icon":"math"}, "odft": {"type":"application/vnd.oasis.opendocument.formula-template","icon":"math"}, @@ -773,7 +773,7 @@ "pm4": {"type":"application/x-pagemaker"}, "pm5": {"type":"application/x-pagemaker"}, "pml": {"type":"application/vnd.ctc-posml"}, -"png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]}, +"png": {"type":"image/png","icon":"image","string":"image","groups":["image","web_image","optimised_image"]}, "pnm": {"type":"image/x-portable-anymap"}, "portpkg": {"type":"application/vnd.macports.portpkg"}, "pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, @@ -819,7 +819,7 @@ "qfx": {"type":"application/vnd.intu.qfx"}, "qif": {"type":"image/x-quicktime"}, "qps": {"type":"application/vnd.publishare-delta-tree"}, -"qt": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video"]}, +"qt": {"type":"video/quicktime","icon":"video","string":"video","groups":["video","web_video"]}, "qtc": {"type":"video/x-qtc"}, "qti": {"type":"image/x-quicktime"}, "qtif": {"type":"image/x-quicktime"}, @@ -992,8 +992,8 @@ "svgz": {"type":"image/svg+xml","icon":"image","string":"image","groups":["image","web_image"]}, "svr": {"type":"application/x-world"}, "swa": {"type":"application/x-director","icon":"flash"}, -"swf": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video"]}, -"swfl": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video"]}, +"swf": {"type":"application/x-shockwave-flash","icon":"flash"}, +"swfl": {"type":"application/x-shockwave-flash","icon":"flash"}, "swi": {"type":"application/vnd.aristanetworks.swi"}, "sxc": {"type":"application/vnd.sun.xml.calc","icon":"calc"}, "sxd": {"type":"application/vnd.sun.xml.draw","icon":"draw"}, @@ -1023,8 +1023,8 @@ "tga": {"type":"image/x-tga"}, "tgz": {"type":"application/g-zip","icon":"archive","string":"archive","groups":["archive"]}, "thmx": {"type":"application/vnd.ms-officetheme"}, -"tif": {"type":"image/tiff","icon":"tiff","string":"image","groups":["image"]}, -"tiff": {"type":"image/tiff","icon":"tiff","string":"image","groups":["image"]}, +"tif": {"type":"image/tiff","icon":"image","string":"image","groups":["image"]}, +"tiff": {"type":"image/tiff","icon":"image","string":"image","groups":["image"]}, "tmo": {"type":"application/vnd.tmobile-livetv"}, "torrent": {"type":"application/x-bittorrent"}, "tpl": {"type":"application/vnd.groove-tool-template"}, @@ -1032,7 +1032,7 @@ "tr": {"type":"text/troff"}, "tra": {"type":"application/vnd.trueapp"}, "trm": {"type":"application/x-msterminal"}, -"ts": {"type":"video/MP2T","icon":"mpeg","string":"video","groups":["video","web_video"]}, +"ts": {"type":"video/MP2T","icon":"video","string":"video","groups":["video","web_video"]}, "tsd": {"type":"application/timestamped-data"}, "tsi": {"type":"audio/tsp-audio"}, "tsp": {"type":"application/dsptype"}, @@ -1129,7 +1129,7 @@ "w61": {"type":"application/wordperfect6.1"}, "w6w": {"type":"application/msword"}, "wad": {"type":"application/x-doom"}, -"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","html_audio","web_audio"]}, +"wav": {"type":"audio/wav","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "wax": {"type":"audio/x-ms-wax"}, "wb1": {"type":"application/x-qpro"}, "wbmp": {"type":"image/vnd.wap.wbmp"}, @@ -1155,7 +1155,7 @@ "wmlc": {"type":"application/vnd.wap.wmlc"}, "wmls": {"type":"text/vnd.wap.wmlscript"}, "wmlsc": {"type":"application/vnd.wap.wmlscriptc"}, -"wmv": {"type":"video/x-ms-wmv","icon":"wmv","string":"video","groups":["video"]}, +"wmv": {"type":"video/x-ms-wmv","icon":"video","string":"video","groups":["video"]}, "wmx": {"type":"video/x-ms-wmx"}, "wmz": {"type":"application/x-ms-wmz"}, "woff": {"type":"application/x-font-woff"}, @@ -1178,7 +1178,7 @@ "wtb": {"type":"application/vnd.webturbo"}, "wtk": {"type":"application/x-wintalk"}, "wvx": {"type":"video/x-ms-wvx"}, -"x-png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]}, +"x-png": {"type":"image/png","icon":"image","string":"image","groups":["image","web_image"]}, "x3d": {"type":"model/x3d+xml"}, "x3db": {"type":"model/x3d+binary"}, "x3dbz": {"type":"model/x3d+binary"}, @@ -1205,7 +1205,7 @@ "xfdl": {"type":"application/vnd.xfdl"}, "xgz": {"type":"xgl/drawing"}, "xht": {"type":"application/xhtml+xml"}, -"xhtml": {"type":"application/xhtml+xml","icon":"html","groups":["web_file"]}, +"xhtml": {"type":"application/xhtml+xml","icon":"markup","groups":["web_file"]}, "xhvml": {"type":"application/xv+xml"}, "xif": {"type":"image/vnd.xiff"}, "xl": {"type":"application/excel"}, diff --git a/src/assets/img/files/archive.svg b/src/assets/img/files/archive.svg new file mode 100644 index 00000000000..144930aab6a --- /dev/null +++ b/src/assets/img/files/archive.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/files/audio.svg b/src/assets/img/files/audio.svg new file mode 100644 index 00000000000..343f1daf7d7 --- /dev/null +++ b/src/assets/img/files/audio.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/avi-64.png b/src/assets/img/files/avi-64.png deleted file mode 100644 index ec1a942cd13..00000000000 Binary files a/src/assets/img/files/avi-64.png and /dev/null differ diff --git a/src/assets/img/files/base-64.png b/src/assets/img/files/base-64.png deleted file mode 100644 index cf698f52540..00000000000 Binary files a/src/assets/img/files/base-64.png and /dev/null differ diff --git a/src/assets/img/files/bmp-64.png b/src/assets/img/files/bmp-64.png deleted file mode 100644 index 562e7bbab34..00000000000 Binary files a/src/assets/img/files/bmp-64.png and /dev/null differ diff --git a/src/assets/img/files/calc.svg b/src/assets/img/files/calc.svg new file mode 100644 index 00000000000..269815c31aa --- /dev/null +++ b/src/assets/img/files/calc.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/chart.svg b/src/assets/img/files/chart.svg new file mode 100644 index 00000000000..08bad2546f3 --- /dev/null +++ b/src/assets/img/files/chart.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/files/database.svg b/src/assets/img/files/database.svg new file mode 100644 index 00000000000..1267140a7cf --- /dev/null +++ b/src/assets/img/files/database.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/document.svg b/src/assets/img/files/document.svg new file mode 100644 index 00000000000..75555427f6a --- /dev/null +++ b/src/assets/img/files/document.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/draw.svg b/src/assets/img/files/draw.svg new file mode 100644 index 00000000000..22afc2e56c9 --- /dev/null +++ b/src/assets/img/files/draw.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/eps.svg b/src/assets/img/files/eps.svg new file mode 100644 index 00000000000..a0888248150 --- /dev/null +++ b/src/assets/img/files/eps.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/epub.svg b/src/assets/img/files/epub.svg new file mode 100644 index 00000000000..afbdf666c03 --- /dev/null +++ b/src/assets/img/files/epub.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/flash.svg b/src/assets/img/files/flash.svg new file mode 100644 index 00000000000..17aaaa29f20 --- /dev/null +++ b/src/assets/img/files/flash.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/folder-open-64.png b/src/assets/img/files/folder-open-64.png deleted file mode 100644 index 27f7271bd09..00000000000 Binary files a/src/assets/img/files/folder-open-64.png and /dev/null differ diff --git a/src/assets/img/files/folder.svg b/src/assets/img/files/folder.svg new file mode 100644 index 00000000000..af66c75007c --- /dev/null +++ b/src/assets/img/files/folder.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/files/gif.svg b/src/assets/img/files/gif.svg new file mode 100644 index 00000000000..c8c14942b50 --- /dev/null +++ b/src/assets/img/files/gif.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/h5p.svg b/src/assets/img/files/h5p.svg new file mode 100644 index 00000000000..865fdc07ed5 --- /dev/null +++ b/src/assets/img/files/h5p.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/html-64.png b/src/assets/img/files/html-64.png deleted file mode 100644 index 7f703bb834a..00000000000 Binary files a/src/assets/img/files/html-64.png and /dev/null differ diff --git a/src/assets/img/files/image.svg b/src/assets/img/files/image.svg new file mode 100644 index 00000000000..f2f631ce1fa --- /dev/null +++ b/src/assets/img/files/image.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/impress.svg b/src/assets/img/files/impress.svg new file mode 100644 index 00000000000..e12f5326f03 --- /dev/null +++ b/src/assets/img/files/impress.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/img/files/isf.svg b/src/assets/img/files/isf.svg new file mode 100644 index 00000000000..6ddc91aeff5 --- /dev/null +++ b/src/assets/img/files/isf.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/jpeg-64.png b/src/assets/img/files/jpeg-64.png deleted file mode 100644 index b4fc0c998aa..00000000000 Binary files a/src/assets/img/files/jpeg-64.png and /dev/null differ diff --git a/src/assets/img/files/markup.svg b/src/assets/img/files/markup.svg new file mode 100644 index 00000000000..2b78e5670dc --- /dev/null +++ b/src/assets/img/files/markup.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/math.svg b/src/assets/img/files/math.svg new file mode 100644 index 00000000000..86cd68958cf --- /dev/null +++ b/src/assets/img/files/math.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/moodle.svg b/src/assets/img/files/moodle.svg new file mode 100644 index 00000000000..59cf42dae14 --- /dev/null +++ b/src/assets/img/files/moodle.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/files/mp3-64.png b/src/assets/img/files/mp3-64.png deleted file mode 100644 index 13b8da0b8d9..00000000000 Binary files a/src/assets/img/files/mp3-64.png and /dev/null differ diff --git a/src/assets/img/files/mpeg-64.png b/src/assets/img/files/mpeg-64.png deleted file mode 100644 index 05d77fa7bd6..00000000000 Binary files a/src/assets/img/files/mpeg-64.png and /dev/null differ diff --git a/src/assets/img/files/oth.svg b/src/assets/img/files/oth.svg new file mode 100644 index 00000000000..8600831c204 --- /dev/null +++ b/src/assets/img/files/oth.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/pdf.svg b/src/assets/img/files/pdf.svg new file mode 100644 index 00000000000..71d27c390d2 --- /dev/null +++ b/src/assets/img/files/pdf.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/png-64.png b/src/assets/img/files/png-64.png deleted file mode 100644 index 3ecf3e5df73..00000000000 Binary files a/src/assets/img/files/png-64.png and /dev/null differ diff --git a/src/assets/img/files/powerpoint.svg b/src/assets/img/files/powerpoint.svg new file mode 100644 index 00000000000..3ce58d45182 --- /dev/null +++ b/src/assets/img/files/powerpoint.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/psd.svg b/src/assets/img/files/psd.svg new file mode 100644 index 00000000000..6476d869f9d --- /dev/null +++ b/src/assets/img/files/psd.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/publisher.svg b/src/assets/img/files/publisher.svg new file mode 100644 index 00000000000..2525ea17b6d --- /dev/null +++ b/src/assets/img/files/publisher.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/quicktime-64.png b/src/assets/img/files/quicktime-64.png deleted file mode 100644 index 90f2fbc0d1b..00000000000 Binary files a/src/assets/img/files/quicktime-64.png and /dev/null differ diff --git a/src/assets/img/files/sourcecode.svg b/src/assets/img/files/sourcecode.svg new file mode 100644 index 00000000000..ae7c4a24c1d --- /dev/null +++ b/src/assets/img/files/sourcecode.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/spreadsheet.svg b/src/assets/img/files/spreadsheet.svg new file mode 100644 index 00000000000..3f11d1b6d91 --- /dev/null +++ b/src/assets/img/files/spreadsheet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/files/text.svg b/src/assets/img/files/text.svg new file mode 100644 index 00000000000..58d3429b5f1 --- /dev/null +++ b/src/assets/img/files/text.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/img/files/tiff-64.png b/src/assets/img/files/tiff-64.png deleted file mode 100644 index c11a85e28b7..00000000000 Binary files a/src/assets/img/files/tiff-64.png and /dev/null differ diff --git a/src/assets/img/files/unknown.svg b/src/assets/img/files/unknown.svg new file mode 100644 index 00000000000..b202196dcfb --- /dev/null +++ b/src/assets/img/files/unknown.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/video.svg b/src/assets/img/files/video.svg new file mode 100644 index 00000000000..23e462d7062 --- /dev/null +++ b/src/assets/img/files/video.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/files/wav-64.png b/src/assets/img/files/wav-64.png deleted file mode 100644 index 819781a9b56..00000000000 Binary files a/src/assets/img/files/wav-64.png and /dev/null differ diff --git a/src/assets/img/files/wmv-64.png b/src/assets/img/files/wmv-64.png deleted file mode 100644 index 570c4b2b319..00000000000 Binary files a/src/assets/img/files/wmv-64.png and /dev/null differ diff --git a/src/assets/img/files/writer.svg b/src/assets/img/files/writer.svg new file mode 100644 index 00000000000..c693aa0627a --- /dev/null +++ b/src/assets/img/files/writer.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/img/files/archive-64.png b/src/assets/img/files_legacy/archive-64.png similarity index 100% rename from src/assets/img/files/archive-64.png rename to src/assets/img/files_legacy/archive-64.png diff --git a/src/assets/img/files/audio-64.png b/src/assets/img/files_legacy/audio-64.png similarity index 100% rename from src/assets/img/files/audio-64.png rename to src/assets/img/files_legacy/audio-64.png diff --git a/src/assets/img/files/calc-64.png b/src/assets/img/files_legacy/calc-64.png similarity index 100% rename from src/assets/img/files/calc-64.png rename to src/assets/img/files_legacy/calc-64.png diff --git a/src/assets/img/files/chart-64.png b/src/assets/img/files_legacy/chart-64.png similarity index 100% rename from src/assets/img/files/chart-64.png rename to src/assets/img/files_legacy/chart-64.png diff --git a/src/assets/img/files/database-64.png b/src/assets/img/files_legacy/database-64.png similarity index 100% rename from src/assets/img/files/database-64.png rename to src/assets/img/files_legacy/database-64.png diff --git a/src/assets/img/files/document-64.png b/src/assets/img/files_legacy/document-64.png similarity index 100% rename from src/assets/img/files/document-64.png rename to src/assets/img/files_legacy/document-64.png diff --git a/src/assets/img/files/draw-64.png b/src/assets/img/files_legacy/draw-64.png similarity index 100% rename from src/assets/img/files/draw-64.png rename to src/assets/img/files_legacy/draw-64.png diff --git a/src/assets/img/files/eps-64.png b/src/assets/img/files_legacy/eps-64.png similarity index 100% rename from src/assets/img/files/eps-64.png rename to src/assets/img/files_legacy/eps-64.png diff --git a/src/assets/img/files/epub-64.png b/src/assets/img/files_legacy/epub-64.png similarity index 100% rename from src/assets/img/files/epub-64.png rename to src/assets/img/files_legacy/epub-64.png diff --git a/src/assets/img/files/flash-64.png b/src/assets/img/files_legacy/flash-64.png similarity index 100% rename from src/assets/img/files/flash-64.png rename to src/assets/img/files_legacy/flash-64.png diff --git a/src/assets/img/files/folder-64.png b/src/assets/img/files_legacy/folder-64.png similarity index 100% rename from src/assets/img/files/folder-64.png rename to src/assets/img/files_legacy/folder-64.png diff --git a/src/assets/img/files/gif-64.png b/src/assets/img/files_legacy/gif-64.png similarity index 100% rename from src/assets/img/files/gif-64.png rename to src/assets/img/files_legacy/gif-64.png diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files_legacy/h5p-64.png similarity index 100% rename from src/assets/img/files/h5p-64.png rename to src/assets/img/files_legacy/h5p-64.png diff --git a/src/assets/img/files/image-64.png b/src/assets/img/files_legacy/image-64.png similarity index 100% rename from src/assets/img/files/image-64.png rename to src/assets/img/files_legacy/image-64.png diff --git a/src/assets/img/files/impress-64.png b/src/assets/img/files_legacy/impress-64.png similarity index 100% rename from src/assets/img/files/impress-64.png rename to src/assets/img/files_legacy/impress-64.png diff --git a/src/assets/img/files/isf-64.png b/src/assets/img/files_legacy/isf-64.png similarity index 100% rename from src/assets/img/files/isf-64.png rename to src/assets/img/files_legacy/isf-64.png diff --git a/src/assets/img/files/markup-64.png b/src/assets/img/files_legacy/markup-64.png similarity index 100% rename from src/assets/img/files/markup-64.png rename to src/assets/img/files_legacy/markup-64.png diff --git a/src/assets/img/files/math-64.png b/src/assets/img/files_legacy/math-64.png similarity index 100% rename from src/assets/img/files/math-64.png rename to src/assets/img/files_legacy/math-64.png diff --git a/src/assets/img/files/moodle-64.png b/src/assets/img/files_legacy/moodle-64.png similarity index 100% rename from src/assets/img/files/moodle-64.png rename to src/assets/img/files_legacy/moodle-64.png diff --git a/src/assets/img/files/oth-64.png b/src/assets/img/files_legacy/oth-64.png similarity index 100% rename from src/assets/img/files/oth-64.png rename to src/assets/img/files_legacy/oth-64.png diff --git a/src/assets/img/files/pdf-64.png b/src/assets/img/files_legacy/pdf-64.png similarity index 100% rename from src/assets/img/files/pdf-64.png rename to src/assets/img/files_legacy/pdf-64.png diff --git a/src/assets/img/files/powerpoint-64.png b/src/assets/img/files_legacy/powerpoint-64.png similarity index 100% rename from src/assets/img/files/powerpoint-64.png rename to src/assets/img/files_legacy/powerpoint-64.png diff --git a/src/assets/img/files/psd-64.png b/src/assets/img/files_legacy/psd-64.png similarity index 100% rename from src/assets/img/files/psd-64.png rename to src/assets/img/files_legacy/psd-64.png diff --git a/src/assets/img/files/publisher-64.png b/src/assets/img/files_legacy/publisher-64.png similarity index 100% rename from src/assets/img/files/publisher-64.png rename to src/assets/img/files_legacy/publisher-64.png diff --git a/src/assets/img/files/sourcecode-64.png b/src/assets/img/files_legacy/sourcecode-64.png similarity index 100% rename from src/assets/img/files/sourcecode-64.png rename to src/assets/img/files_legacy/sourcecode-64.png diff --git a/src/assets/img/files/spreadsheet-64.png b/src/assets/img/files_legacy/spreadsheet-64.png similarity index 100% rename from src/assets/img/files/spreadsheet-64.png rename to src/assets/img/files_legacy/spreadsheet-64.png diff --git a/src/assets/img/files/text-64.png b/src/assets/img/files_legacy/text-64.png similarity index 100% rename from src/assets/img/files/text-64.png rename to src/assets/img/files_legacy/text-64.png diff --git a/src/assets/img/files/unknown-64.png b/src/assets/img/files_legacy/unknown-64.png similarity index 100% rename from src/assets/img/files/unknown-64.png rename to src/assets/img/files_legacy/unknown-64.png diff --git a/src/assets/img/files/video-64.png b/src/assets/img/files_legacy/video-64.png similarity index 100% rename from src/assets/img/files/video-64.png rename to src/assets/img/files_legacy/video-64.png diff --git a/src/assets/img/files/writer-64.png b/src/assets/img/files_legacy/writer-64.png similarity index 100% rename from src/assets/img/files/writer-64.png rename to src/assets/img/files_legacy/writer-64.png diff --git a/src/core/components/file/file.ts b/src/core/components/file/file.ts index 8ed6c3050ad..157b06a74d8 100644 --- a/src/core/components/file/file.ts +++ b/src/core/components/file/file.ts @@ -115,7 +115,7 @@ export class CoreFileComponent implements OnInit, OnDestroy { this.observer = CoreEvents.on(eventName, () => { this.calculateState(); }); - } catch (error) { + } catch { // File not downloadable. } } diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts index 8c1a3f7498b..e563cf843ed 100644 --- a/src/core/services/utils/mimetype.ts +++ b/src/core/services/utils/mimetype.ts @@ -26,6 +26,7 @@ import extToMime from '@/assets/exttomime.json'; import mimeToExt from '@/assets/mimetoext.json'; import { CoreFileEntry, CoreFileHelper } from '@services/file-helper'; import { CoreUrl } from '@singletons/url'; +import { CoreSites } from '@services/sites'; interface MimeTypeInfo { type: string; @@ -282,7 +283,11 @@ export class CoreMimetypeUtilsProvider { * @returns The path to a folder icon. */ getFolderIcon(): string { - return 'assets/img/files/folder-64.png'; + if (CoreSites.getCurrentSite() === undefined || CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { + return 'assets/img/files/folder.svg'; + } + + return 'assets/img/files_legacy/folder-64.png'; } /** @@ -292,7 +297,11 @@ export class CoreMimetypeUtilsProvider { * @returns The icon path. */ getFileIconForType(type: string): string { - return 'assets/img/files/' + type + '-64.png'; + if (CoreSites.getCurrentSite() === undefined || CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { + return 'assets/img/files/' + type + '.svg'; + } + + return 'assets/img/files_legacy/' + type + '-64.png'; } /**