diff --git a/src/_h5ai/client/icons/scalable/folder-page.svg b/src/_h5ai/client/icons/scalable/folder-page.svg deleted file mode 100644 index 0381df9b..00000000 --- a/src/_h5ai/client/icons/scalable/folder-page.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - diff --git a/src/_h5ai/client/icons/scalable/folder-parent.svg b/src/_h5ai/client/icons/scalable/folder-parent.svg deleted file mode 100644 index 06566450..00000000 --- a/src/_h5ai/client/icons/scalable/folder-parent.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - diff --git a/src/_h5ai/client/icons/scalable/folder.svg b/src/_h5ai/client/icons/scalable/folder.svg deleted file mode 100644 index 3104365f..00000000 --- a/src/_h5ai/client/icons/scalable/folder.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - diff --git a/src/_h5ai/client/images/fallback/file.png b/src/_h5ai/client/images/fallback/file.png new file mode 100644 index 00000000..f44acd91 Binary files /dev/null and b/src/_h5ai/client/images/fallback/file.png differ diff --git a/src/_h5ai/client/images/fallback/folder-page.png b/src/_h5ai/client/images/fallback/folder-page.png new file mode 100644 index 00000000..aa216a6f Binary files /dev/null and b/src/_h5ai/client/images/fallback/folder-page.png differ diff --git a/src/_h5ai/client/icons/96/folder.png b/src/_h5ai/client/images/fallback/folder.png similarity index 100% rename from src/_h5ai/client/icons/96/folder.png rename to src/_h5ai/client/images/fallback/folder.png diff --git a/src/_h5ai/client/icons/96/folder-parent.png b/src/_h5ai/client/images/fallback/parent.png similarity index 100% rename from src/_h5ai/client/icons/96/folder-parent.png rename to src/_h5ai/client/images/fallback/parent.png diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 0a62f8c7..87cfdde2 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -85,7 +85,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event _.each(json.items, function (jsonItem) { - var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.status, jsonItem.content); + var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.is_managed, jsonItem.content); found[e.absHref] = true; }); @@ -155,7 +155,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event $el.attr('href', item.absHref); - if (history && item.isFolder() && item.status === '=h5ai=') { + if (history && item.isFolder() && item.isManaged) { $el.on('click', function () { setLocation(item.absHref); @@ -163,7 +163,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event }); } - if (settings.extInNewWindow && item.status !== '=h5ai=') { + if (settings.extInNewWindow && !item.isManaged) { $el.attr('target', '_blank'); } }; diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js index 152dc6de..032ba4ab 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/client/js/inc/core/resource.js @@ -8,7 +8,8 @@ modulejs.define('core/resource', ['core/settings'], function (settings) { icon = function (id) { - return settings.h5aiAbsHref + 'client/icons/96/' + id + '.png'; + return settings.h5aiAbsHref + 'client/themes/faenza/icons/' + id + '.png'; + // return settings.h5aiAbsHref + 'client/themes/evolvere/icons/' + id + '.svg'; }; return { diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index 028a799b..86f0ef5a 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -44,12 +44,8 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ $html.addClass('current'); } - if (_.isNumber(item.status)) { - if (item.status === 200) { - $a.append($(pageHintTemplate)); - } else { - $a.append($(statusHintTemplate).text('(' + item.status + ')')); - } + if (!item.isManaged) { + $a.append($(pageHintTemplate)); } if (item.$crumb) { diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 5ab8c6bc..946dcae3 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -18,8 +18,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e '', statusHintTemplate = '', - magicSequence = '=h5ai=', - update = function (item) { var $html = $(template), @@ -30,8 +28,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e $html .addClass(item.isFolder() ? 'folder' : 'file') - .data('item', item) - .data('status', item.status); + .data('item', item); location.setLink($a, item); $img.attr('src', resource.image('folder')); @@ -42,11 +39,11 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e var subfolders = item.getSubfolders(); // indicator - if (!item.status || (item.status === magicSequence && !item.isContentFetched) || subfolders.length) { + if ((item.isManaged && !item.isContentFetched) || subfolders.length) { $indicator.removeClass('none'); - if (!item.status || (item.status === magicSequence && !item.isContentFetched)) { + if ((item.isManaged && !item.isContentFetched)) { $indicator.addClass('unknown'); } else if (item.isContentVisible) { $indicator.addClass('open'); @@ -92,13 +89,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e } // reflect folder status - if (_.isNumber(item.status)) { - if (item.status === 200) { - $img.attr('src', resource.image('folder-page')); - } else { - $html.addClass('error'); - $a.append($(statusHintTemplate).text(item.status)); - } + if (!item.isManaged) { + $img.attr('src', resource.image('folder-page')); } } diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/client/js/inc/model/item.js index adf7d0d3..1d82cb1c 100644 --- a/src/_h5ai/client/js/inc/model/item.js +++ b/src/_h5ai/client/js/inc/model/item.js @@ -41,7 +41,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', cache = {}, - getItem = function (absHref, time, size, status, isContentFetched) { + getItem = function (absHref, time, size, isManaged, isContentFetched) { absHref = location.forceEncoding(absHref); @@ -57,8 +57,8 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', if (_.isNumber(size)) { self.size = size; } - if (status) { - self.status = status; + if (isManaged) { + self.isManaged = true; } if (isContentFetched) { self.isContentFetched = true; @@ -100,7 +100,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', if (response.items) { _.each(response.items, function (item) { - getItem(item.absHref, item.time, item.size, item.status, item.content); + getItem(item.absHref, item.time, item.size, item.is_managed, item.content); }); } @@ -123,7 +123,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', this.time = null; this.size = null; this.parent = null; - this.status = null; + this.isManaged = null; this.content = {}; if (split.parent) { diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 58008e33..9955b1af 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -56,14 +56,9 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $date.data('time', item.time).text(format.formatDate(item.time)); $size.data('bytes', item.size).text(format.formatSize(item.size)); - if (item.isFolder() && _.isNumber(item.status)) { - if (item.status === 200) { - $html.addClass('page'); - $iconImg.attr('src', resource.icon('folder-page')); - } else { - $html.addClass('error'); - $label.append($(hintTemplate).text(' ' + item.status + ' ')); - } + if (item.isFolder() && !item.isManaged) { + $html.addClass('page'); + $iconImg.attr('src', resource.icon('folder-page')); } if (item.isCurrentParentFolder()) { diff --git a/src/_h5ai/client/themes/evolvere/icons/7zip.svg b/src/_h5ai/client/themes/evolvere/icons/7zip.svg new file mode 100755 index 00000000..defc7585 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/7zip.svg @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/ace.svg b/src/_h5ai/client/themes/evolvere/icons/ace.svg new file mode 100755 index 00000000..dcb46463 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/ace.svg @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/apk.svg b/src/_h5ai/client/themes/evolvere/icons/apk.svg new file mode 100755 index 00000000..faa3d402 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/apk.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/archive.svg b/src/_h5ai/client/themes/evolvere/icons/archive.svg new file mode 100755 index 00000000..d8b409f7 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/archive.svg @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/audio.svg b/src/_h5ai/client/themes/evolvere/icons/audio.svg new file mode 100755 index 00000000..b9090b0b --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/audio.svg @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/bak.svg b/src/_h5ai/client/themes/evolvere/icons/bak.svg new file mode 100755 index 00000000..e06c0768 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/bak.svg @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/bin.svg b/src/_h5ai/client/themes/evolvere/icons/bin.svg new file mode 100755 index 00000000..395a5cdf --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/bin.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/bmp.svg b/src/_h5ai/client/themes/evolvere/icons/bmp.svg new file mode 100755 index 00000000..4385e420 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/bmp.svg @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/bz.svg b/src/_h5ai/client/themes/evolvere/icons/bz.svg new file mode 100755 index 00000000..7d8a0ea0 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/bz.svg @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/c.svg b/src/_h5ai/client/themes/evolvere/icons/c.svg new file mode 100755 index 00000000..dcdd791f --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/c.svg @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/calc.svg b/src/_h5ai/client/themes/evolvere/icons/calc.svg new file mode 100755 index 00000000..fb1bc1bf --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/calc.svg @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/cpp.svg b/src/_h5ai/client/themes/evolvere/icons/cpp.svg new file mode 100755 index 00000000..340f9061 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/cpp.svg @@ -0,0 +1,1079 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/csv.svg b/src/_h5ai/client/themes/evolvere/icons/csv.svg new file mode 100755 index 00000000..db3d15d0 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/csv.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/db.svg b/src/_h5ai/client/themes/evolvere/icons/db.svg new file mode 100755 index 00000000..5537f688 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/db.svg @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/deb.svg b/src/_h5ai/client/themes/evolvere/icons/deb.svg new file mode 100755 index 00000000..a94d019b --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/deb.svg @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/default.svg b/src/_h5ai/client/themes/evolvere/icons/default.svg new file mode 100755 index 00000000..3522b369 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/default.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/doc.svg b/src/_h5ai/client/themes/evolvere/icons/doc.svg new file mode 100755 index 00000000..05544230 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/doc.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/email.svg b/src/_h5ai/client/themes/evolvere/icons/email.svg new file mode 100755 index 00000000..8729bc2c --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/email.svg @@ -0,0 +1,633 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/exe.svg b/src/_h5ai/client/themes/evolvere/icons/exe.svg new file mode 100755 index 00000000..3bbbe8cf --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/exe.svg @@ -0,0 +1,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/flash.svg b/src/_h5ai/client/themes/evolvere/icons/flash.svg new file mode 100755 index 00000000..bb092fc9 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/flash.svg @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/folder-page.svg b/src/_h5ai/client/themes/evolvere/icons/folder-page.svg new file mode 100755 index 00000000..5ee1dbdb --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/folder-page.svg @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/folder-parent-1.svg b/src/_h5ai/client/themes/evolvere/icons/folder-parent-1.svg new file mode 100755 index 00000000..e65216fd --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/folder-parent-1.svg @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/folder-parent.svg b/src/_h5ai/client/themes/evolvere/icons/folder-parent.svg new file mode 100755 index 00000000..4c68a512 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/folder-parent.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/folder.svg b/src/_h5ai/client/themes/evolvere/icons/folder.svg new file mode 100755 index 00000000..be9eeb79 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/folder.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/font.svg b/src/_h5ai/client/themes/evolvere/icons/font.svg new file mode 100755 index 00000000..e2988bbc --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/font.svg @@ -0,0 +1,857 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + AaBb + Aa + AaBbcc + BbCc + DdEeFfGg + diff --git a/src/_h5ai/client/themes/evolvere/icons/fortran.svg b/src/_h5ai/client/themes/evolvere/icons/fortran.svg new file mode 100755 index 00000000..956b1848 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/fortran.svg @@ -0,0 +1,1115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/gif.svg b/src/_h5ai/client/themes/evolvere/icons/gif.svg new file mode 100755 index 00000000..a5063f9f --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/gif.svg @@ -0,0 +1,575 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/gzip.svg b/src/_h5ai/client/themes/evolvere/icons/gzip.svg new file mode 100755 index 00000000..8f023ea9 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/gzip.svg @@ -0,0 +1,497 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/h.svg b/src/_h5ai/client/themes/evolvere/icons/h.svg new file mode 100755 index 00000000..16085c3b --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/h.svg @@ -0,0 +1,970 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/hpp.svg b/src/_h5ai/client/themes/evolvere/icons/hpp.svg new file mode 100755 index 00000000..0483d83e --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/hpp.svg @@ -0,0 +1,904 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/html.svg b/src/_h5ai/client/themes/evolvere/icons/html.svg new file mode 100755 index 00000000..4b9f5901 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/html.svg @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/ico.svg b/src/_h5ai/client/themes/evolvere/icons/ico.svg new file mode 100755 index 00000000..fd223efb --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/ico.svg @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/image.svg b/src/_h5ai/client/themes/evolvere/icons/image.svg new file mode 100755 index 00000000..3ca66a9d --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/image.svg @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/install.svg b/src/_h5ai/client/themes/evolvere/icons/install.svg new file mode 100755 index 00000000..3684485a --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/install.svg @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/iso.svg b/src/_h5ai/client/themes/evolvere/icons/iso.svg new file mode 100755 index 00000000..e190343a --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/iso.svg @@ -0,0 +1,1744 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/jar.svg b/src/_h5ai/client/themes/evolvere/icons/jar.svg new file mode 100755 index 00000000..a47e4a96 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/jar.svg @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/java.svg b/src/_h5ai/client/themes/evolvere/icons/java.svg new file mode 100755 index 00000000..7be3a793 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/java.svg @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/jpg.svg b/src/_h5ai/client/themes/evolvere/icons/jpg.svg new file mode 100755 index 00000000..f09c1370 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/jpg.svg @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/js.svg b/src/_h5ai/client/themes/evolvere/icons/js.svg new file mode 100755 index 00000000..a23aba1e --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/js.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/json.svg b/src/_h5ai/client/themes/evolvere/icons/json.svg new file mode 100755 index 00000000..a23aba1e --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/json.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/license.svg b/src/_h5ai/client/themes/evolvere/icons/license.svg new file mode 100755 index 00000000..bd15a1ee --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/license.svg @@ -0,0 +1,923 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/log.svg b/src/_h5ai/client/themes/evolvere/icons/log.svg new file mode 100755 index 00000000..267bee04 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/log.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/package.svg b/src/_h5ai/client/themes/evolvere/icons/package.svg new file mode 100755 index 00000000..d8b409f7 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/package.svg @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/pdf.svg b/src/_h5ai/client/themes/evolvere/icons/pdf.svg new file mode 100755 index 00000000..89ad4052 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/pdf.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/php.svg b/src/_h5ai/client/themes/evolvere/icons/php.svg new file mode 100755 index 00000000..1a5c91a8 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/php.svg @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/png.svg b/src/_h5ai/client/themes/evolvere/icons/png.svg new file mode 100755 index 00000000..b72b65ec --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/png.svg @@ -0,0 +1,544 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/pres.svg b/src/_h5ai/client/themes/evolvere/icons/pres.svg new file mode 100755 index 00000000..8dce7415 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/pres.svg @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/py.svg b/src/_h5ai/client/themes/evolvere/icons/py.svg new file mode 100755 index 00000000..3494c5cd --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/py.svg @@ -0,0 +1,1092 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/rar.svg b/src/_h5ai/client/themes/evolvere/icons/rar.svg new file mode 100755 index 00000000..8889c28f --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/rar.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/readme.svg b/src/_h5ai/client/themes/evolvere/icons/readme.svg new file mode 100755 index 00000000..f90f30d5 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/readme.svg @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/rpm.svg b/src/_h5ai/client/themes/evolvere/icons/rpm.svg new file mode 100755 index 00000000..14b34ccc --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/rpm.svg @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/rss.svg b/src/_h5ai/client/themes/evolvere/icons/rss.svg new file mode 100755 index 00000000..b2ccc797 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/rss.svg @@ -0,0 +1,1794 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/script.svg b/src/_h5ai/client/themes/evolvere/icons/script.svg new file mode 100755 index 00000000..c0df93ea --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/script.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/settings.svg b/src/_h5ai/client/themes/evolvere/icons/settings.svg new file mode 100755 index 00000000..8384b783 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/settings.svg @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/svg.svg b/src/_h5ai/client/themes/evolvere/icons/svg.svg new file mode 100755 index 00000000..fc8a3fec --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/svg.svg @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/tar.svg b/src/_h5ai/client/themes/evolvere/icons/tar.svg new file mode 100755 index 00000000..94685842 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/tar.svg @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/text.svg b/src/_h5ai/client/themes/evolvere/icons/text.svg new file mode 100755 index 00000000..ffda30aa --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/text.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/tgz.svg b/src/_h5ai/client/themes/evolvere/icons/tgz.svg new file mode 100755 index 00000000..fe1cbc5a --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/tgz.svg @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/tiff.svg b/src/_h5ai/client/themes/evolvere/icons/tiff.svg new file mode 100755 index 00000000..4fb30250 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/tiff.svg @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/torrent.svg b/src/_h5ai/client/themes/evolvere/icons/torrent.svg new file mode 100755 index 00000000..538b2cbe --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/torrent.svg @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/unknown.svg b/src/_h5ai/client/themes/evolvere/icons/unknown.svg new file mode 100755 index 00000000..e3ec2e17 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/unknown.svg @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/vcal.svg b/src/_h5ai/client/themes/evolvere/icons/vcal.svg new file mode 100755 index 00000000..90669e8e --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/vcal.svg @@ -0,0 +1,642 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/video.svg b/src/_h5ai/client/themes/evolvere/icons/video.svg new file mode 100755 index 00000000..c3f1c38e --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/video.svg @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/xml.svg b/src/_h5ai/client/themes/evolvere/icons/xml.svg new file mode 100755 index 00000000..7c2a085f --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/xml.svg @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/themes/evolvere/icons/zip.svg b/src/_h5ai/client/themes/evolvere/icons/zip.svg new file mode 100755 index 00000000..35fe82e7 --- /dev/null +++ b/src/_h5ai/client/themes/evolvere/icons/zip.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/icons/96/7zip.png b/src/_h5ai/client/themes/faenza/icons/7zip.png similarity index 100% rename from src/_h5ai/client/icons/96/7zip.png rename to src/_h5ai/client/themes/faenza/icons/7zip.png diff --git a/src/_h5ai/client/icons/96/ace.png b/src/_h5ai/client/themes/faenza/icons/ace.png similarity index 100% rename from src/_h5ai/client/icons/96/ace.png rename to src/_h5ai/client/themes/faenza/icons/ace.png diff --git a/src/_h5ai/client/icons/96/archive.png b/src/_h5ai/client/themes/faenza/icons/archive.png similarity index 100% rename from src/_h5ai/client/icons/96/archive.png rename to src/_h5ai/client/themes/faenza/icons/archive.png diff --git a/src/_h5ai/client/icons/96/audio.png b/src/_h5ai/client/themes/faenza/icons/audio.png similarity index 100% rename from src/_h5ai/client/icons/96/audio.png rename to src/_h5ai/client/themes/faenza/icons/audio.png diff --git a/src/_h5ai/client/icons/96/authors.png b/src/_h5ai/client/themes/faenza/icons/authors.png similarity index 100% rename from src/_h5ai/client/icons/96/authors.png rename to src/_h5ai/client/themes/faenza/icons/authors.png diff --git a/src/_h5ai/client/icons/96/bak.png b/src/_h5ai/client/themes/faenza/icons/bak.png similarity index 100% rename from src/_h5ai/client/icons/96/bak.png rename to src/_h5ai/client/themes/faenza/icons/bak.png diff --git a/src/_h5ai/client/icons/96/bin.png b/src/_h5ai/client/themes/faenza/icons/bin.png similarity index 100% rename from src/_h5ai/client/icons/96/bin.png rename to src/_h5ai/client/themes/faenza/icons/bin.png diff --git a/src/_h5ai/client/icons/96/blank.png b/src/_h5ai/client/themes/faenza/icons/blank.png similarity index 100% rename from src/_h5ai/client/icons/96/blank.png rename to src/_h5ai/client/themes/faenza/icons/blank.png diff --git a/src/_h5ai/client/icons/96/bmp.png b/src/_h5ai/client/themes/faenza/icons/bmp.png similarity index 100% rename from src/_h5ai/client/icons/96/bmp.png rename to src/_h5ai/client/themes/faenza/icons/bmp.png diff --git a/src/_h5ai/client/icons/96/c.png b/src/_h5ai/client/themes/faenza/icons/c.png similarity index 100% rename from src/_h5ai/client/icons/96/c.png rename to src/_h5ai/client/themes/faenza/icons/c.png diff --git a/src/_h5ai/client/icons/96/calc.png b/src/_h5ai/client/themes/faenza/icons/calc.png similarity index 100% rename from src/_h5ai/client/icons/96/calc.png rename to src/_h5ai/client/themes/faenza/icons/calc.png diff --git a/src/_h5ai/client/icons/96/cd.png b/src/_h5ai/client/themes/faenza/icons/cd.png similarity index 100% rename from src/_h5ai/client/icons/96/cd.png rename to src/_h5ai/client/themes/faenza/icons/cd.png diff --git a/src/_h5ai/client/icons/96/copying.png b/src/_h5ai/client/themes/faenza/icons/copying.png similarity index 100% rename from src/_h5ai/client/icons/96/copying.png rename to src/_h5ai/client/themes/faenza/icons/copying.png diff --git a/src/_h5ai/client/icons/96/cpp.png b/src/_h5ai/client/themes/faenza/icons/cpp.png similarity index 100% rename from src/_h5ai/client/icons/96/cpp.png rename to src/_h5ai/client/themes/faenza/icons/cpp.png diff --git a/src/_h5ai/client/icons/96/css.png b/src/_h5ai/client/themes/faenza/icons/css.png similarity index 100% rename from src/_h5ai/client/icons/96/css.png rename to src/_h5ai/client/themes/faenza/icons/css.png diff --git a/src/_h5ai/client/icons/96/cue.png b/src/_h5ai/client/themes/faenza/icons/cue.png similarity index 100% rename from src/_h5ai/client/icons/96/cue.png rename to src/_h5ai/client/themes/faenza/icons/cue.png diff --git a/src/_h5ai/client/icons/96/deb.png b/src/_h5ai/client/themes/faenza/icons/deb.png similarity index 100% rename from src/_h5ai/client/icons/96/deb.png rename to src/_h5ai/client/themes/faenza/icons/deb.png diff --git a/src/_h5ai/client/icons/96/default.png b/src/_h5ai/client/themes/faenza/icons/default.png similarity index 100% rename from src/_h5ai/client/icons/96/default.png rename to src/_h5ai/client/themes/faenza/icons/default.png diff --git a/src/_h5ai/client/icons/96/dia.png b/src/_h5ai/client/themes/faenza/icons/dia.png similarity index 100% rename from src/_h5ai/client/icons/96/dia.png rename to src/_h5ai/client/themes/faenza/icons/dia.png diff --git a/src/_h5ai/client/icons/96/diff.png b/src/_h5ai/client/themes/faenza/icons/diff.png similarity index 100% rename from src/_h5ai/client/icons/96/diff.png rename to src/_h5ai/client/themes/faenza/icons/diff.png diff --git a/src/_h5ai/client/icons/96/doc.png b/src/_h5ai/client/themes/faenza/icons/doc.png similarity index 100% rename from src/_h5ai/client/icons/96/doc.png rename to src/_h5ai/client/themes/faenza/icons/doc.png diff --git a/src/_h5ai/client/icons/96/draw.png b/src/_h5ai/client/themes/faenza/icons/draw.png similarity index 100% rename from src/_h5ai/client/icons/96/draw.png rename to src/_h5ai/client/themes/faenza/icons/draw.png diff --git a/src/_h5ai/client/icons/96/encrypted.png b/src/_h5ai/client/themes/faenza/icons/encrypted.png similarity index 100% rename from src/_h5ai/client/icons/96/encrypted.png rename to src/_h5ai/client/themes/faenza/icons/encrypted.png diff --git a/src/_h5ai/client/icons/96/eps.png b/src/_h5ai/client/themes/faenza/icons/eps.png similarity index 100% rename from src/_h5ai/client/icons/96/eps.png rename to src/_h5ai/client/themes/faenza/icons/eps.png diff --git a/src/_h5ai/client/icons/96/exe.png b/src/_h5ai/client/themes/faenza/icons/exe.png similarity index 100% rename from src/_h5ai/client/icons/96/exe.png rename to src/_h5ai/client/themes/faenza/icons/exe.png diff --git a/src/_h5ai/client/icons/96/flash.png b/src/_h5ai/client/themes/faenza/icons/flash.png similarity index 100% rename from src/_h5ai/client/icons/96/flash.png rename to src/_h5ai/client/themes/faenza/icons/flash.png diff --git a/src/_h5ai/client/icons/96/folder-page.png b/src/_h5ai/client/themes/faenza/icons/folder-page.png similarity index 100% rename from src/_h5ai/client/icons/96/folder-page.png rename to src/_h5ai/client/themes/faenza/icons/folder-page.png diff --git a/src/_h5ai/client/themes/faenza/icons/folder-parent.png b/src/_h5ai/client/themes/faenza/icons/folder-parent.png new file mode 100644 index 00000000..f47cc6e0 Binary files /dev/null and b/src/_h5ai/client/themes/faenza/icons/folder-parent.png differ diff --git a/src/_h5ai/client/themes/faenza/icons/folder.png b/src/_h5ai/client/themes/faenza/icons/folder.png new file mode 100644 index 00000000..a7bf9334 Binary files /dev/null and b/src/_h5ai/client/themes/faenza/icons/folder.png differ diff --git a/src/_h5ai/client/icons/96/font.png b/src/_h5ai/client/themes/faenza/icons/font.png similarity index 100% rename from src/_h5ai/client/icons/96/font.png rename to src/_h5ai/client/themes/faenza/icons/font.png diff --git a/src/_h5ai/client/icons/96/gif.png b/src/_h5ai/client/themes/faenza/icons/gif.png similarity index 100% rename from src/_h5ai/client/icons/96/gif.png rename to src/_h5ai/client/themes/faenza/icons/gif.png diff --git a/src/_h5ai/client/icons/96/glade.png b/src/_h5ai/client/themes/faenza/icons/glade.png similarity index 100% rename from src/_h5ai/client/icons/96/glade.png rename to src/_h5ai/client/themes/faenza/icons/glade.png diff --git a/src/_h5ai/client/icons/96/gzip.png b/src/_h5ai/client/themes/faenza/icons/gzip.png similarity index 100% rename from src/_h5ai/client/icons/96/gzip.png rename to src/_h5ai/client/themes/faenza/icons/gzip.png diff --git a/src/_h5ai/client/icons/96/h.png b/src/_h5ai/client/themes/faenza/icons/h.png similarity index 100% rename from src/_h5ai/client/icons/96/h.png rename to src/_h5ai/client/themes/faenza/icons/h.png diff --git a/src/_h5ai/client/icons/96/hpp.png b/src/_h5ai/client/themes/faenza/icons/hpp.png similarity index 100% rename from src/_h5ai/client/icons/96/hpp.png rename to src/_h5ai/client/themes/faenza/icons/hpp.png diff --git a/src/_h5ai/client/icons/96/html.png b/src/_h5ai/client/themes/faenza/icons/html.png similarity index 100% rename from src/_h5ai/client/icons/96/html.png rename to src/_h5ai/client/themes/faenza/icons/html.png diff --git a/src/_h5ai/client/icons/96/ico.png b/src/_h5ai/client/themes/faenza/icons/ico.png similarity index 100% rename from src/_h5ai/client/icons/96/ico.png rename to src/_h5ai/client/themes/faenza/icons/ico.png diff --git a/src/_h5ai/client/icons/96/image.png b/src/_h5ai/client/themes/faenza/icons/image.png similarity index 100% rename from src/_h5ai/client/icons/96/image.png rename to src/_h5ai/client/themes/faenza/icons/image.png diff --git a/src/_h5ai/client/icons/96/install.png b/src/_h5ai/client/themes/faenza/icons/install.png similarity index 100% rename from src/_h5ai/client/icons/96/install.png rename to src/_h5ai/client/themes/faenza/icons/install.png diff --git a/src/_h5ai/client/icons/96/jar.png b/src/_h5ai/client/themes/faenza/icons/jar.png similarity index 100% rename from src/_h5ai/client/icons/96/jar.png rename to src/_h5ai/client/themes/faenza/icons/jar.png diff --git a/src/_h5ai/client/icons/96/java.png b/src/_h5ai/client/themes/faenza/icons/java.png similarity index 100% rename from src/_h5ai/client/icons/96/java.png rename to src/_h5ai/client/themes/faenza/icons/java.png diff --git a/src/_h5ai/client/icons/96/jpg.png b/src/_h5ai/client/themes/faenza/icons/jpg.png similarity index 100% rename from src/_h5ai/client/icons/96/jpg.png rename to src/_h5ai/client/themes/faenza/icons/jpg.png diff --git a/src/_h5ai/client/icons/96/js.png b/src/_h5ai/client/themes/faenza/icons/js.png similarity index 100% rename from src/_h5ai/client/icons/96/js.png rename to src/_h5ai/client/themes/faenza/icons/js.png diff --git a/src/_h5ai/client/icons/96/json.png b/src/_h5ai/client/themes/faenza/icons/json.png similarity index 100% rename from src/_h5ai/client/icons/96/json.png rename to src/_h5ai/client/themes/faenza/icons/json.png diff --git a/src/_h5ai/client/icons/96/log.png b/src/_h5ai/client/themes/faenza/icons/log.png similarity index 100% rename from src/_h5ai/client/icons/96/log.png rename to src/_h5ai/client/themes/faenza/icons/log.png diff --git a/src/_h5ai/client/icons/96/makefile.png b/src/_h5ai/client/themes/faenza/icons/makefile.png similarity index 100% rename from src/_h5ai/client/icons/96/makefile.png rename to src/_h5ai/client/themes/faenza/icons/makefile.png diff --git a/src/_h5ai/client/icons/96/markdown.png b/src/_h5ai/client/themes/faenza/icons/markdown.png similarity index 100% rename from src/_h5ai/client/icons/96/markdown.png rename to src/_h5ai/client/themes/faenza/icons/markdown.png diff --git a/src/_h5ai/client/icons/96/message.png b/src/_h5ai/client/themes/faenza/icons/message.png similarity index 100% rename from src/_h5ai/client/icons/96/message.png rename to src/_h5ai/client/themes/faenza/icons/message.png diff --git a/src/_h5ai/client/icons/96/mp3.png b/src/_h5ai/client/themes/faenza/icons/mp3.png similarity index 100% rename from src/_h5ai/client/icons/96/mp3.png rename to src/_h5ai/client/themes/faenza/icons/mp3.png diff --git a/src/_h5ai/client/icons/96/ogg.png b/src/_h5ai/client/themes/faenza/icons/ogg.png similarity index 100% rename from src/_h5ai/client/icons/96/ogg.png rename to src/_h5ai/client/themes/faenza/icons/ogg.png diff --git a/src/_h5ai/client/icons/96/package.png b/src/_h5ai/client/themes/faenza/icons/package.png similarity index 100% rename from src/_h5ai/client/icons/96/package.png rename to src/_h5ai/client/themes/faenza/icons/package.png diff --git a/src/_h5ai/client/icons/96/pdf.png b/src/_h5ai/client/themes/faenza/icons/pdf.png similarity index 100% rename from src/_h5ai/client/icons/96/pdf.png rename to src/_h5ai/client/themes/faenza/icons/pdf.png diff --git a/src/_h5ai/client/icons/96/pgp.png b/src/_h5ai/client/themes/faenza/icons/pgp.png similarity index 100% rename from src/_h5ai/client/icons/96/pgp.png rename to src/_h5ai/client/themes/faenza/icons/pgp.png diff --git a/src/_h5ai/client/icons/96/php.png b/src/_h5ai/client/themes/faenza/icons/php.png similarity index 100% rename from src/_h5ai/client/icons/96/php.png rename to src/_h5ai/client/themes/faenza/icons/php.png diff --git a/src/_h5ai/client/icons/96/playlist.png b/src/_h5ai/client/themes/faenza/icons/playlist.png similarity index 100% rename from src/_h5ai/client/icons/96/playlist.png rename to src/_h5ai/client/themes/faenza/icons/playlist.png diff --git a/src/_h5ai/client/icons/96/png.png b/src/_h5ai/client/themes/faenza/icons/png.png similarity index 100% rename from src/_h5ai/client/icons/96/png.png rename to src/_h5ai/client/themes/faenza/icons/png.png diff --git a/src/_h5ai/client/icons/96/pres.png b/src/_h5ai/client/themes/faenza/icons/pres.png similarity index 100% rename from src/_h5ai/client/icons/96/pres.png rename to src/_h5ai/client/themes/faenza/icons/pres.png diff --git a/src/_h5ai/client/icons/96/ps.png b/src/_h5ai/client/themes/faenza/icons/ps.png similarity index 100% rename from src/_h5ai/client/icons/96/ps.png rename to src/_h5ai/client/themes/faenza/icons/ps.png diff --git a/src/_h5ai/client/icons/96/psd.png b/src/_h5ai/client/themes/faenza/icons/psd.png similarity index 100% rename from src/_h5ai/client/icons/96/psd.png rename to src/_h5ai/client/themes/faenza/icons/psd.png diff --git a/src/_h5ai/client/icons/96/py.png b/src/_h5ai/client/themes/faenza/icons/py.png similarity index 100% rename from src/_h5ai/client/icons/96/py.png rename to src/_h5ai/client/themes/faenza/icons/py.png diff --git a/src/_h5ai/client/icons/96/rar.png b/src/_h5ai/client/themes/faenza/icons/rar.png similarity index 100% rename from src/_h5ai/client/icons/96/rar.png rename to src/_h5ai/client/themes/faenza/icons/rar.png diff --git a/src/_h5ai/client/icons/96/rb.png b/src/_h5ai/client/themes/faenza/icons/rb.png similarity index 100% rename from src/_h5ai/client/icons/96/rb.png rename to src/_h5ai/client/themes/faenza/icons/rb.png diff --git a/src/_h5ai/client/icons/96/readme.png b/src/_h5ai/client/themes/faenza/icons/readme.png similarity index 100% rename from src/_h5ai/client/icons/96/readme.png rename to src/_h5ai/client/themes/faenza/icons/readme.png diff --git a/src/_h5ai/client/icons/96/rpm.png b/src/_h5ai/client/themes/faenza/icons/rpm.png similarity index 100% rename from src/_h5ai/client/icons/96/rpm.png rename to src/_h5ai/client/themes/faenza/icons/rpm.png diff --git a/src/_h5ai/client/icons/96/rss.png b/src/_h5ai/client/themes/faenza/icons/rss.png similarity index 100% rename from src/_h5ai/client/icons/96/rss.png rename to src/_h5ai/client/themes/faenza/icons/rss.png diff --git a/src/_h5ai/client/icons/96/rtf.png b/src/_h5ai/client/themes/faenza/icons/rtf.png similarity index 100% rename from src/_h5ai/client/icons/96/rtf.png rename to src/_h5ai/client/themes/faenza/icons/rtf.png diff --git a/src/_h5ai/client/icons/96/script.png b/src/_h5ai/client/themes/faenza/icons/script.png similarity index 100% rename from src/_h5ai/client/icons/96/script.png rename to src/_h5ai/client/themes/faenza/icons/script.png diff --git a/src/_h5ai/client/icons/96/source.png b/src/_h5ai/client/themes/faenza/icons/source.png similarity index 100% rename from src/_h5ai/client/icons/96/source.png rename to src/_h5ai/client/themes/faenza/icons/source.png diff --git a/src/_h5ai/client/icons/96/sql.png b/src/_h5ai/client/themes/faenza/icons/sql.png similarity index 100% rename from src/_h5ai/client/icons/96/sql.png rename to src/_h5ai/client/themes/faenza/icons/sql.png diff --git a/src/_h5ai/client/icons/96/svg.png b/src/_h5ai/client/themes/faenza/icons/svg.png similarity index 100% rename from src/_h5ai/client/icons/96/svg.png rename to src/_h5ai/client/themes/faenza/icons/svg.png diff --git a/src/_h5ai/client/icons/96/tar.png b/src/_h5ai/client/themes/faenza/icons/tar.png similarity index 100% rename from src/_h5ai/client/icons/96/tar.png rename to src/_h5ai/client/themes/faenza/icons/tar.png diff --git a/src/_h5ai/client/icons/96/tex-bib.png b/src/_h5ai/client/themes/faenza/icons/tex-bib.png similarity index 100% rename from src/_h5ai/client/icons/96/tex-bib.png rename to src/_h5ai/client/themes/faenza/icons/tex-bib.png diff --git a/src/_h5ai/client/icons/96/tex.png b/src/_h5ai/client/themes/faenza/icons/tex.png similarity index 100% rename from src/_h5ai/client/icons/96/tex.png rename to src/_h5ai/client/themes/faenza/icons/tex.png diff --git a/src/_h5ai/client/icons/96/text.png b/src/_h5ai/client/themes/faenza/icons/text.png similarity index 100% rename from src/_h5ai/client/icons/96/text.png rename to src/_h5ai/client/themes/faenza/icons/text.png diff --git a/src/_h5ai/client/icons/96/theme.png b/src/_h5ai/client/themes/faenza/icons/theme.png similarity index 100% rename from src/_h5ai/client/icons/96/theme.png rename to src/_h5ai/client/themes/faenza/icons/theme.png diff --git a/src/_h5ai/client/icons/96/tiff.png b/src/_h5ai/client/themes/faenza/icons/tiff.png similarity index 100% rename from src/_h5ai/client/icons/96/tiff.png rename to src/_h5ai/client/themes/faenza/icons/tiff.png diff --git a/src/_h5ai/client/icons/96/torrent.png b/src/_h5ai/client/themes/faenza/icons/torrent.png similarity index 100% rename from src/_h5ai/client/icons/96/torrent.png rename to src/_h5ai/client/themes/faenza/icons/torrent.png diff --git a/src/_h5ai/client/icons/96/unknown.png b/src/_h5ai/client/themes/faenza/icons/unknown.png similarity index 100% rename from src/_h5ai/client/icons/96/unknown.png rename to src/_h5ai/client/themes/faenza/icons/unknown.png diff --git a/src/_h5ai/client/icons/96/vcal.png b/src/_h5ai/client/themes/faenza/icons/vcal.png similarity index 100% rename from src/_h5ai/client/icons/96/vcal.png rename to src/_h5ai/client/themes/faenza/icons/vcal.png diff --git a/src/_h5ai/client/icons/96/video.png b/src/_h5ai/client/themes/faenza/icons/video.png similarity index 100% rename from src/_h5ai/client/icons/96/video.png rename to src/_h5ai/client/themes/faenza/icons/video.png diff --git a/src/_h5ai/client/icons/96/wav.png b/src/_h5ai/client/themes/faenza/icons/wav.png similarity index 100% rename from src/_h5ai/client/icons/96/wav.png rename to src/_h5ai/client/themes/faenza/icons/wav.png diff --git a/src/_h5ai/client/icons/96/wma.png b/src/_h5ai/client/themes/faenza/icons/wma.png similarity index 100% rename from src/_h5ai/client/icons/96/wma.png rename to src/_h5ai/client/themes/faenza/icons/wma.png diff --git a/src/_h5ai/client/icons/96/xcf.png b/src/_h5ai/client/themes/faenza/icons/xcf.png similarity index 100% rename from src/_h5ai/client/icons/96/xcf.png rename to src/_h5ai/client/themes/faenza/icons/xcf.png diff --git a/src/_h5ai/client/icons/96/xhtml.png b/src/_h5ai/client/themes/faenza/icons/xhtml.png similarity index 100% rename from src/_h5ai/client/icons/96/xhtml.png rename to src/_h5ai/client/themes/faenza/icons/xhtml.png diff --git a/src/_h5ai/client/icons/96/xml.png b/src/_h5ai/client/themes/faenza/icons/xml.png similarity index 100% rename from src/_h5ai/client/icons/96/xml.png rename to src/_h5ai/client/themes/faenza/icons/xml.png diff --git a/src/_h5ai/client/icons/96/zip.png b/src/_h5ai/client/themes/faenza/icons/zip.png similarity index 100% rename from src/_h5ai/client/icons/96/zip.png rename to src/_h5ai/client/themes/faenza/icons/zip.png diff --git a/src/_h5ai/server/php/inc/class-api.php b/src/_h5ai/server/php/inc/class-api.php index 2f202de3..0a55da6b 100644 --- a/src/_h5ai/server/php/inc/class-api.php +++ b/src/_h5ai/server/php/inc/class-api.php @@ -139,9 +139,8 @@ class Api { json_fail(4, "folders not supported", file_get_contents($userfile["tmp_name"]) === "null"); $upload_dir = $this->app->to_path($href); - $code = $this->app->get_http_code($href); - json_fail(5, "upload dir no h5ai folder or ignored", $code !== MAGIC_SEQUENCE || $this->app->is_ignored($upload_dir)); + json_fail(5, "upload dir no h5ai folder or ignored", !$this->app->is_managed_url($href) || $this->app->is_ignored($upload_dir)); $dest = $upload_dir . "/" . utf8_encode($userfile["name"]); @@ -165,9 +164,7 @@ class Api { $d = normalize_path(dirname($href), true); $n = basename($href); - $code = $this->app->get_http_code($d); - - if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) { + if ($this->app->is_managed_url($href) && !$this->app->is_ignored($n)) { $path = $this->app->to_path($href); @@ -192,9 +189,7 @@ class Api { $d = normalize_path(dirname($href), true); $n = basename($href); - $code = $this->app->get_http_code($d); - - if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) { + if ($this->app->is_managed_url($d) && !$this->app->is_ignored($n)) { $path = $this->app->to_path($href); $folder = normalize_path(dirname($path)); diff --git a/src/_h5ai/server/php/inc/class-app.php b/src/_h5ai/server/php/inc/class-app.php index 78ae48ea..c39512c1 100644 --- a/src/_h5ai/server/php/inc/class-app.php +++ b/src/_h5ai/server/php/inc/class-app.php @@ -91,38 +91,41 @@ class App { } - public function get_http_code($url) { + public function is_managed_url($url) { - $path = $this->to_path($url); + return $this->is_managed_path($this->to_path($url)); + } + + + public function is_managed_path($path) { if (!is_dir($path) || strpos($path, '../') || strpos($path, '/..') || $path == '..') { - return 500; + return false; } foreach ($this->options["view"]["indexFiles"] as $name) { if (file_exists($path . "/" . $name)) { - return 200; + return false; } } while ($path !== ROOT_PATH) { if (@is_dir($path . "/_h5ai/server")) { - return 200; + return false; } $parent_path = normalize_path(dirname($path)); if ($parent_path === $path) { - return 200; + return false; } $path = $parent_path; } - return MAGIC_SEQUENCE; + return true; } public function get_items($url, $what) { - $code = $this->get_http_code($url); - if ($code !== MAGIC_SEQUENCE) { + if (!$this->is_managed_url($url)) { return array(); } @@ -171,7 +174,7 @@ class App { if ($folder->get_parent($cache)) { $html .= ""; - $html .= "folder-parent"; + $html .= "folder-parent"; $html .= "Parent Directory"; $html .= ""; $html .= ""; @@ -179,10 +182,13 @@ class App { } foreach ($items as $item) { - $type = $item->is_folder ? "folder" : "default"; + $type = "file"; + if ($item->is_folder) { + $type = $this->is_managed_url($item->url) ? "folder" : "folder-page"; + } $html .= ""; - $html .= "" . $type . ""; + $html .= "" . $type . ""; $html .= "" . basename($item->path) . ""; $html .= "" . date("Y-m-d H:i", $item->date) . ""; $html .= "" . ($item->size !== null ? intval($item->size / 1000) . " KB" : "" ) . ""; diff --git a/src/_h5ai/server/php/inc/class-archive.php b/src/_h5ai/server/php/inc/class-archive.php index 8adae371..a0aaabc7 100644 --- a/src/_h5ai/server/php/inc/class-archive.php +++ b/src/_h5ai/server/php/inc/class-archive.php @@ -148,9 +148,7 @@ class Archive { $d = normalize_path(dirname($href), true); $n = basename($href); - $code = $this->app->get_http_code($d); - - if ($code === MAGIC_SEQUENCE && !$this->app->is_ignored($n)) { + if ($this->app->is_managed_url($d) && !$this->app->is_ignored($n)) { $real_file = $this->app->to_path($href); $archived_file = preg_replace("!^" . preg_quote(normalize_path(CURRENT_PATH, true)) . "!", "", $real_file); @@ -175,9 +173,7 @@ class Archive { private function add_dir($real_dir, $archived_dir) { - $code = $this->app->get_http_code($this->app->to_url($real_dir)); - - if ($code === MAGIC_SEQUENCE) { + if ($this->app->is_managed_path($real_dir)) { $this->dirs[] = $archived_dir; $files = $this->app->read_dir($real_dir); diff --git a/src/_h5ai/server/php/inc/class-item.php b/src/_h5ai/server/php/inc/class-item.php index 16f02ae6..482669fd 100644 --- a/src/_h5ai/server/php/inc/class-item.php +++ b/src/_h5ai/server/php/inc/class-item.php @@ -99,7 +99,7 @@ class Item { ); if ($this->is_folder) { - $obj["status"] = $this->app->get_http_code($this->url); + $obj["is_managed"] = $this->app->is_managed_url($this->url); $obj["content"] = $this->is_content_fetched; } @@ -121,7 +121,7 @@ class Item { $items = array(); - if ($this->app->get_http_code($this->url) !== MAGIC_SEQUENCE) { + if (!$this->app->is_managed_url($this->url)) { return $items; } diff --git a/src/_h5ai/server/php/inc/setup.php b/src/_h5ai/server/php/inc/setup.php index b107e758..3fef311c 100644 --- a/src/_h5ai/server/php/inc/setup.php +++ b/src/_h5ai/server/php/inc/setup.php @@ -10,7 +10,6 @@ function setup() { define("BACKEND", "PHP"); define("API", true); - define("MAGIC_SEQUENCE", "={{pkg.name}}="); define("FILE_PREFIX", "_{{pkg.name}}");