diff --git a/src/_h5ai/client/images/fallback/ar.svg b/src/_h5ai/client/images/fallback/ar.svg new file mode 100644 index 00000000..58fc6b2c --- /dev/null +++ b/src/_h5ai/client/images/fallback/ar.svg @@ -0,0 +1,25 @@ + + + + + + + diff --git a/src/_h5ai/client/images/fallback/aud.svg b/src/_h5ai/client/images/fallback/aud.svg new file mode 100644 index 00000000..6adf5216 --- /dev/null +++ b/src/_h5ai/client/images/fallback/aud.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/file.svg b/src/_h5ai/client/images/fallback/file.svg index 48ea7c04..2dec0e16 100644 --- a/src/_h5ai/client/images/fallback/file.svg +++ b/src/_h5ai/client/images/fallback/file.svg @@ -2,70 +2,13 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - + height="96" + version="1.1"> - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> + + + + + + + diff --git a/src/_h5ai/client/images/fallback/txt.svg b/src/_h5ai/client/images/fallback/txt.svg new file mode 100644 index 00000000..92b938f8 --- /dev/null +++ b/src/_h5ai/client/images/fallback/txt.svg @@ -0,0 +1,39 @@ + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/vid.svg b/src/_h5ai/client/images/fallback/vid.svg new file mode 100644 index 00000000..2593bccd --- /dev/null +++ b/src/_h5ai/client/images/fallback/vid.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js index d5d799bc..4c864488 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/client/js/inc/core/resource.js @@ -4,7 +4,7 @@ modulejs.define('core/resource', ['config', 'core/settings'], function (config, var imagesHref = settings.appHref + 'client/images/', fallbackHref = settings.appHref + 'client/images/fallback/', themesHref = settings.appHref + 'client/themes/', - fallbacks = ['file', 'folder', 'folder-page', 'folder-parent'], + fallbacks = ['file', 'folder', 'folder-page', 'folder-parent', 'ar', 'aud', 'img', 'txt', 'vid'], image = function (id) { @@ -23,6 +23,11 @@ modulejs.define('core/resource', ['config', 'core/settings'], function (config, if (fallbacks.indexOf(id) >= 0) { return fallbackHref + id + '.svg'; } + + if (fallbacks.indexOf(baseId) >= 0) { + return fallbackHref + baseId + '.svg'; + } + return fallbackHref + 'file.svg'; }; diff --git a/src/_h5ai/client/themes/evolvere/icons/pkg-apk.svg b/src/_h5ai/client/themes/evolvere/icons/ar-apk.svg similarity index 100% rename from src/_h5ai/client/themes/evolvere/icons/pkg-apk.svg rename to src/_h5ai/client/themes/evolvere/icons/ar-apk.svg diff --git a/src/_h5ai/client/themes/evolvere/icons/pkg-deb.svg b/src/_h5ai/client/themes/evolvere/icons/ar-deb.svg similarity index 100% rename from src/_h5ai/client/themes/evolvere/icons/pkg-deb.svg rename to src/_h5ai/client/themes/evolvere/icons/ar-deb.svg diff --git a/src/_h5ai/client/themes/evolvere/icons/pkg-rpm.svg b/src/_h5ai/client/themes/evolvere/icons/ar-rpm.svg similarity index 100% rename from src/_h5ai/client/themes/evolvere/icons/pkg-rpm.svg rename to src/_h5ai/client/themes/evolvere/icons/ar-rpm.svg diff --git a/src/_h5ai/client/themes/evolvere/icons/pkg.svg b/src/_h5ai/client/themes/evolvere/icons/pkg.svg deleted file mode 100755 index d8b409f7..00000000 --- a/src/_h5ai/client/themes/evolvere/icons/pkg.svg +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/_h5ai/client/themes/faenza/icons/pkg-deb.png b/src/_h5ai/client/themes/faenza/icons/ar-deb.png similarity index 100% rename from src/_h5ai/client/themes/faenza/icons/pkg-deb.png rename to src/_h5ai/client/themes/faenza/icons/ar-deb.png diff --git a/src/_h5ai/client/themes/faenza/icons/pkg-rpm.png b/src/_h5ai/client/themes/faenza/icons/ar-rpm.png similarity index 100% rename from src/_h5ai/client/themes/faenza/icons/pkg-rpm.png rename to src/_h5ai/client/themes/faenza/icons/ar-rpm.png diff --git a/src/_h5ai/client/themes/faenza/icons/pkg.png b/src/_h5ai/client/themes/faenza/icons/pkg.png deleted file mode 100644 index d75909d3..00000000 Binary files a/src/_h5ai/client/themes/faenza/icons/pkg.png and /dev/null differ diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 89a0b9e1..62d824d3 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -54,9 +54,9 @@ Options "setParentFolderLabels": true, "sizes": [48, 24, 96], "smartBrowsing": true, - // "theme": "fallback", + "theme": "fallback", // "theme": "faenza", - "theme": "evolvere", + // "theme": "evolvere", "unmanaged": ["index.html", "index.htm", "index.php"], "unmanagedInNewWindow": false }, diff --git a/src/_h5ai/conf/types.json b/src/_h5ai/conf/types.json index fc9d9b90..aa684349 100644 --- a/src/_h5ai/conf/types.json +++ b/src/_h5ai/conf/types.json @@ -12,8 +12,11 @@ File types mapped to file extensions "txt-readme": ["readme*"], "ar": ["*.tar.bz2", "*.tar.gz", "*.tgz"], + "ar-apk": ["*.apk"], + "ar-deb": ["*.deb"], "ar-gz": ["*.gz"], "ar-rar": ["*.rar"], + "ar-rpm": ["*.rpm"], "ar-tar": ["*.tar"], "ar-zip": ["*.7z", "*.bz2", "*.jar", "*.lzma", "*.war", "*.z", "*.Z", "*.zip"], "aud": ["*.aif", "*.aiff", "*.flac", "*.m4a", "*.mid", "*.mp3", "*.mpa", "*.ra", "*.ogg", "*.wav", "*.wma"], @@ -29,10 +32,6 @@ File types mapped to file extensions "img-jpg": ["*.jpg", "*.jpeg"], "img-png": ["*.png"], "img-tiff": ["*.tiff"], - "pkg": [], - "pkg-apk": ["*.apk"], - "pkg-deb": ["*.deb"], - "pkg-rpm": ["*.rpm"], "txt": ["*.text", "*.txt"], "txt-build": ["*.pom", "build.xml", "pom.xml"], "txt-c": ["*.c"],