From 6eae9a71143fe3fd3ae0dc96e9b73b4ce6ba8645 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 29 May 2014 14:10:34 +0200 Subject: [PATCH] Make fallback as simple and fast as possible. --- src/_h5ai/client/js/inc/core/resource.js | 4 ++-- src/_h5ai/server/php/inc/class-app.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js index 032ba4ab..9d6cf746 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/client/js/inc/core/resource.js @@ -8,8 +8,8 @@ modulejs.define('core/resource', ['core/settings'], function (settings) { icon = function (id) { - return settings.h5aiAbsHref + 'client/themes/faenza/icons/' + id + '.png'; - // return settings.h5aiAbsHref + 'client/themes/evolvere/icons/' + id + '.svg'; + // return settings.h5aiAbsHref + 'client/themes/faenza/icons/' + id + '.png'; + return settings.h5aiAbsHref + 'client/themes/evolvere/icons/' + id + '.svg'; }; return { diff --git a/src/_h5ai/server/php/inc/class-app.php b/src/_h5ai/server/php/inc/class-app.php index c39512c1..a6ed378d 100644 --- a/src/_h5ai/server/php/inc/class-app.php +++ b/src/_h5ai/server/php/inc/class-app.php @@ -182,10 +182,7 @@ class App { } foreach ($items as $item) { - $type = "file"; - if ($item->is_folder) { - $type = $this->is_managed_url($item->url) ? "folder" : "folder-page"; - } + $type = $item->is_folder ? "folder" : "file"; $html .= ""; $html .= "" . $type . "";