From 1660227a54ab8a34ad16c198c14a2444376e0a09 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 4 Jun 2014 17:03:11 +0200 Subject: [PATCH] Update type system. --- src/_h5ai/client/images/fallback/ar.svg | 25 ++ src/_h5ai/client/images/fallback/aud.svg | 47 ++++ src/_h5ai/client/images/fallback/file.svg | 59 +---- .../client/images/fallback/folder-page.png | Bin 644 -> 0 bytes .../client/images/fallback/folder-page.svg | 59 +---- .../images/fallback/folder-parent-0.png | Bin 380 -> 0 bytes .../images/fallback/folder-parent-0.svg | 59 +---- .../images/fallback/folder-parent-1.png | Bin 784 -> 0 bytes .../images/fallback/folder-parent-1.svg | 59 +---- .../client/images/fallback/folder-parent.svg | 73 +---- src/_h5ai/client/images/fallback/folder.svg | 59 +---- src/_h5ai/client/images/fallback/img.svg | 34 +++ src/_h5ai/client/images/fallback/txt.svg | 39 +++ src/_h5ai/client/images/fallback/vid.svg | 125 +++++++++ src/_h5ai/client/js/inc/core/resource.js | 7 +- .../icons/{pkg-apk.svg => ar-apk.svg} | 0 .../icons/{pkg-deb.svg => ar-deb.svg} | 0 .../icons/{pkg-rpm.svg => ar-rpm.svg} | 0 .../client/themes/evolvere/icons/pkg.svg | 249 ------------------ .../faenza/icons/{pkg-deb.png => ar-deb.png} | Bin .../faenza/icons/{pkg-rpm.png => ar-rpm.png} | Bin src/_h5ai/client/themes/faenza/icons/pkg.png | Bin 4167 -> 0 bytes src/_h5ai/conf/options.json | 4 +- src/_h5ai/conf/types.json | 7 +- 24 files changed, 288 insertions(+), 617 deletions(-) create mode 100644 src/_h5ai/client/images/fallback/ar.svg create mode 100644 src/_h5ai/client/images/fallback/aud.svg delete mode 100644 src/_h5ai/client/images/fallback/folder-page.png delete mode 100644 src/_h5ai/client/images/fallback/folder-parent-0.png delete mode 100644 src/_h5ai/client/images/fallback/folder-parent-1.png create mode 100644 src/_h5ai/client/images/fallback/img.svg create mode 100644 src/_h5ai/client/images/fallback/txt.svg create mode 100644 src/_h5ai/client/images/fallback/vid.svg rename src/_h5ai/client/themes/evolvere/icons/{pkg-apk.svg => ar-apk.svg} (100%) rename src/_h5ai/client/themes/evolvere/icons/{pkg-deb.svg => ar-deb.svg} (100%) rename src/_h5ai/client/themes/evolvere/icons/{pkg-rpm.svg => ar-rpm.svg} (100%) delete mode 100755 src/_h5ai/client/themes/evolvere/icons/pkg.svg rename src/_h5ai/client/themes/faenza/icons/{pkg-deb.png => ar-deb.png} (100%) rename src/_h5ai/client/themes/faenza/icons/{pkg-rpm.png => ar-rpm.png} (100%) delete mode 100644 src/_h5ai/client/themes/faenza/icons/pkg.png 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"> 2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4`<7^~W?*2v=IP=XQZeW4-MhJm3`86r z&feBs+F2o+AiLRRdBWT;tl@tfC$Y3Yo=`k*;)ZwX-eEE><~+_4*SYsLtW{^2!%)C< zfRo|7+0(??>$Cs={lDq@Af=fCe6Cx(8KAo+;?zpcm$-~ zeuzKdY>Uqld#H6ln0Nmbl|!x#>N0gJEnDmv{B8aO1#{Rlm>K*DGUkY9kd~@j$=Nc! z!ifihnHq{`ljKueJXjYbvjQ-y5EkV8`1k%;3jh!T5ls0fn){^F6Dp z%ab{~RmGg#Z3WBN=UDGQQd;rlJJ$zYCdY<&TPeo|Zd)P825noe#7~+pqBNI=-dW>o zdGzU=@0v?HSpD7KHAw636=spRIEjO)Cr6WoQEdxL6NB*TUWEfaSxOuRo1-|G?ga9( zFur>e$HJ&p!r#O&byl~6!_jAdjN%b4+L2|Rl)duW+1Rz;7vEt7hZ;QiNN4 - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> NS%G~10G|-o zP#6FTfS9g9Ssc{*^o2e32?X>=&>woSgi?+UKP}I;mz-ZC*g+a#AjiE zXoJ!TE(gIBwgwI(W(Ss=jORI$*zYK>;9JMS$>#Xbal;7-jaN@5S(zCzb;ac`IluJC zLAz-(Y`-6Pi_9rL?^s~geZ(PLM}{f3)RQGcTaehV6m-(@S~bF zum1_>G`-b-xA{MJnBq78 - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme + version="1.1"> 2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4`<7^~W?*1S@^oVA%dDb*V%tDyq9A^3hb~P)S3^ z<7|zVl?;K$uM2QoW?0m}{;b;!rU|JvxoS<;4%s@+VujzLmw%OHvBK`f}ExEUIza-t>cDL%idUi+D>+8GLoqkd3 z^NvB8RqTkq{TrhioOfRf08HA?k@)!iHneGCuq6NmoG6?~~+Z%}5iU?Q6M&8EKb>!W#V SBJKbaCWEJ|pUXO@geCwTggD#) diff --git a/src/_h5ai/client/images/fallback/folder-parent-1.svg b/src/_h5ai/client/images/fallback/folder-parent-1.svg index 7ef538dc..4a57961d 100644 --- a/src/_h5ai/client/images/fallback/folder-parent-1.svg +++ b/src/_h5ai/client/images/fallback/folder-parent-1.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 - + 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 d75909d3e1cdd315005ea7b66dfd61e71eb7abcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4167 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