diff --git a/mkrfile.js b/mkrfile.js index c3b723cb..7603fc07 100644 --- a/mkrfile.js +++ b/mkrfile.js @@ -60,7 +60,7 @@ module.exports = function (suite) { var fs = require('fs'); var jshint = JSON.parse(fs.readFileSync('.jshintrc', 'utf8')); - $(src + '/_h5ai/js: **/*.js, ! lib/**') + $(src + '/_h5ai/public/js: **/*.js, ! lib/**') .jshint(jshint, jshint.globals); }); @@ -72,15 +72,15 @@ module.exports = function (suite) { var mapSrc = $.map.p(src, build).s('.less', '.css').s('.jade', ''); var mapRoot = $.map.p(root, path.join(build, '_h5ai')); - $(src + ': _h5ai/js/*.js') - .newerThan(mapSrc, $(src + ': _h5ai/js/**')) + $(src + ': _h5ai/public/js/*.js') + .newerThan(mapSrc, $(src + ': _h5ai/public/js/**')) .includeit() .if(!suite.args.uncompressed, function () { this.uglifyjs(); }) .wrap(header) .write(mapSrc, true); - $(src + ': _h5ai/css/*.less') - .newerThan(mapSrc, $(src + ': _h5ai/css/**')) + $(src + ': _h5ai/public/css/*.less') + .newerThan(mapSrc, $(src + ': _h5ai/public/css/**')) .includeit() .less() .autoprefixer() @@ -93,7 +93,7 @@ module.exports = function (suite) { .jade(env) .write(mapSrc, true); - $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade') + $(src + ': **, ! _h5ai/public/js/**, ! _h5ai/public/css/**, ! **/*.jade') .newerThan(mapSrc) .handlebars(env) .write(mapSrc, true); @@ -135,13 +135,13 @@ module.exports = function (suite) { var env = {pkg: pkg}; - $(src + '/_h5ai/css/styles.less') + $(src + '/_h5ai/public/css/styles.less') .includeit() .less() .autoprefixer() .write(build + '/test/h5ai-styles.css', true); - $(src + '/_h5ai/js/scripts.js') + $(src + '/_h5ai/public/js/scripts.js') .includeit() .write(build + '/test/h5ai-scripts.js', true); diff --git a/src/_h5ai/.htaccess b/src/_h5ai/.htaccess index a891b9ba..f65b82f9 100644 --- a/src/_h5ai/.htaccess +++ b/src/_h5ai/.htaccess @@ -1,27 +1,3 @@ Satisfy all -Order allow,deny -Allow from all - -DirectoryIndex disabled - - - Options -Indexes - - -AddDefaultCharset utf-8 - - - AddCharset utf-8 .css .html .js .json .php .svg - - - - ExpiresActive on - ExpiresDefault "access plus 1 month" - - ExpiresByType text/html "access plus 0 seconds" - ExpiresByType application/json "access plus 0 seconds" - - ExpiresByType text/css "access plus 1 week" - ExpiresByType application/javascript "access plus 1 week" - ExpiresByType image/x-icon "access plus 1 week" - +Order deny,allow +Deny from all diff --git a/src/_h5ai/private/php/core/class-setup.php b/src/_h5ai/private/php/core/class-setup.php index dd83f5cb..3ccc1c13 100644 --- a/src/_h5ai/private/php/core/class-setup.php +++ b/src/_h5ai/private/php/core/class-setup.php @@ -102,14 +102,14 @@ class Setup { $script_name = preg_replace('#^.*?//#', '/', $script_name); } - $this->set('H5AI_HREF', Util::normalize_path(dirname($script_name), true)); + $this->set('H5AI_HREF', Util::normalize_path(dirname(dirname($script_name)), true)); $this->set('H5AI_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false)); $this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('H5AI_HREF')), true)); $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('H5AI_PATH')), false)); - $this->set('PUBLIC_HREF', Util::normalize_path($this->get('H5AI_HREF') . '/', true)); - $this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/', false)); + $this->set('PUBLIC_HREF', Util::normalize_path($this->get('H5AI_HREF') . '/public/', true)); + $this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/public/', false)); $this->set('INDEX_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/index.php', false)); $this->set('CACHE_PUB_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/cache', true)); diff --git a/src/_h5ai/public/.htaccess b/src/_h5ai/public/.htaccess new file mode 100644 index 00000000..a891b9ba --- /dev/null +++ b/src/_h5ai/public/.htaccess @@ -0,0 +1,27 @@ +Satisfy all +Order allow,deny +Allow from all + +DirectoryIndex disabled + + + Options -Indexes + + +AddDefaultCharset utf-8 + + + AddCharset utf-8 .css .html .js .json .php .svg + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + ExpiresByType text/html "access plus 0 seconds" + ExpiresByType application/json "access plus 0 seconds" + + ExpiresByType text/css "access plus 1 week" + ExpiresByType application/javascript "access plus 1 week" + ExpiresByType image/x-icon "access plus 1 week" + diff --git a/src/_h5ai/cache/README.md b/src/_h5ai/public/cache/README.md similarity index 100% rename from src/_h5ai/cache/README.md rename to src/_h5ai/public/cache/README.md diff --git a/src/_h5ai/css/inc/colors.less b/src/_h5ai/public/css/inc/colors.less similarity index 100% rename from src/_h5ai/css/inc/colors.less rename to src/_h5ai/public/css/inc/colors.less diff --git a/src/_h5ai/css/inc/ext/contextmenu.less b/src/_h5ai/public/css/inc/ext/contextmenu.less similarity index 100% rename from src/_h5ai/css/inc/ext/contextmenu.less rename to src/_h5ai/public/css/inc/ext/contextmenu.less diff --git a/src/_h5ai/css/inc/ext/crumb.less b/src/_h5ai/public/css/inc/ext/crumb.less similarity index 100% rename from src/_h5ai/css/inc/ext/crumb.less rename to src/_h5ai/public/css/inc/ext/crumb.less diff --git a/src/_h5ai/css/inc/ext/custom.less b/src/_h5ai/public/css/inc/ext/custom.less similarity index 100% rename from src/_h5ai/css/inc/ext/custom.less rename to src/_h5ai/public/css/inc/ext/custom.less diff --git a/src/_h5ai/css/inc/ext/filter.less b/src/_h5ai/public/css/inc/ext/filter.less similarity index 100% rename from src/_h5ai/css/inc/ext/filter.less rename to src/_h5ai/public/css/inc/ext/filter.less diff --git a/src/_h5ai/css/inc/ext/info.less b/src/_h5ai/public/css/inc/ext/info.less similarity index 100% rename from src/_h5ai/css/inc/ext/info.less rename to src/_h5ai/public/css/inc/ext/info.less diff --git a/src/_h5ai/css/inc/ext/preview-aud.less b/src/_h5ai/public/css/inc/ext/preview-aud.less similarity index 100% rename from src/_h5ai/css/inc/ext/preview-aud.less rename to src/_h5ai/public/css/inc/ext/preview-aud.less diff --git a/src/_h5ai/css/inc/ext/preview-img.less b/src/_h5ai/public/css/inc/ext/preview-img.less similarity index 100% rename from src/_h5ai/css/inc/ext/preview-img.less rename to src/_h5ai/public/css/inc/ext/preview-img.less diff --git a/src/_h5ai/css/inc/ext/preview-txt.less b/src/_h5ai/public/css/inc/ext/preview-txt.less similarity index 100% rename from src/_h5ai/css/inc/ext/preview-txt.less rename to src/_h5ai/public/css/inc/ext/preview-txt.less diff --git a/src/_h5ai/css/inc/ext/preview-vid.less b/src/_h5ai/public/css/inc/ext/preview-vid.less similarity index 100% rename from src/_h5ai/css/inc/ext/preview-vid.less rename to src/_h5ai/public/css/inc/ext/preview-vid.less diff --git a/src/_h5ai/css/inc/ext/preview.less b/src/_h5ai/public/css/inc/ext/preview.less similarity index 100% rename from src/_h5ai/css/inc/ext/preview.less rename to src/_h5ai/public/css/inc/ext/preview.less diff --git a/src/_h5ai/css/inc/ext/search.less b/src/_h5ai/public/css/inc/ext/search.less similarity index 100% rename from src/_h5ai/css/inc/ext/search.less rename to src/_h5ai/public/css/inc/ext/search.less diff --git a/src/_h5ai/css/inc/ext/select.less b/src/_h5ai/public/css/inc/ext/select.less similarity index 100% rename from src/_h5ai/css/inc/ext/select.less rename to src/_h5ai/public/css/inc/ext/select.less diff --git a/src/_h5ai/css/inc/ext/tree.less b/src/_h5ai/public/css/inc/ext/tree.less similarity index 100% rename from src/_h5ai/css/inc/ext/tree.less rename to src/_h5ai/public/css/inc/ext/tree.less diff --git a/src/_h5ai/css/inc/fonts.less b/src/_h5ai/public/css/inc/fonts.less similarity index 100% rename from src/_h5ai/css/inc/fonts.less rename to src/_h5ai/public/css/inc/fonts.less diff --git a/src/_h5ai/css/inc/main/info.less b/src/_h5ai/public/css/inc/main/info.less similarity index 100% rename from src/_h5ai/css/inc/main/info.less rename to src/_h5ai/public/css/inc/main/info.less diff --git a/src/_h5ai/css/inc/misc.less b/src/_h5ai/public/css/inc/misc.less similarity index 100% rename from src/_h5ai/css/inc/misc.less rename to src/_h5ai/public/css/inc/misc.less diff --git a/src/_h5ai/css/inc/mixins.less b/src/_h5ai/public/css/inc/mixins.less similarity index 100% rename from src/_h5ai/css/inc/mixins.less rename to src/_h5ai/public/css/inc/mixins.less diff --git a/src/_h5ai/css/inc/responsive.less b/src/_h5ai/public/css/inc/responsive.less similarity index 100% rename from src/_h5ai/css/inc/responsive.less rename to src/_h5ai/public/css/inc/responsive.less diff --git a/src/_h5ai/css/inc/view/content.less b/src/_h5ai/public/css/inc/view/content.less similarity index 100% rename from src/_h5ai/css/inc/view/content.less rename to src/_h5ai/public/css/inc/view/content.less diff --git a/src/_h5ai/css/inc/view/fallback.less b/src/_h5ai/public/css/inc/view/fallback.less similarity index 100% rename from src/_h5ai/css/inc/view/fallback.less rename to src/_h5ai/public/css/inc/view/fallback.less diff --git a/src/_h5ai/css/inc/view/mainrow.less b/src/_h5ai/public/css/inc/view/mainrow.less similarity index 100% rename from src/_h5ai/css/inc/view/mainrow.less rename to src/_h5ai/public/css/inc/view/mainrow.less diff --git a/src/_h5ai/css/inc/view/notification.less b/src/_h5ai/public/css/inc/view/notification.less similarity index 100% rename from src/_h5ai/css/inc/view/notification.less rename to src/_h5ai/public/css/inc/view/notification.less diff --git a/src/_h5ai/css/inc/view/root.less b/src/_h5ai/public/css/inc/view/root.less similarity index 100% rename from src/_h5ai/css/inc/view/root.less rename to src/_h5ai/public/css/inc/view/root.less diff --git a/src/_h5ai/css/inc/view/sidebar.less b/src/_h5ai/public/css/inc/view/sidebar.less similarity index 100% rename from src/_h5ai/css/inc/view/sidebar.less rename to src/_h5ai/public/css/inc/view/sidebar.less diff --git a/src/_h5ai/css/inc/view/topbar.less b/src/_h5ai/public/css/inc/view/topbar.less similarity index 100% rename from src/_h5ai/css/inc/view/topbar.less rename to src/_h5ai/public/css/inc/view/topbar.less diff --git a/src/_h5ai/css/inc/view/view-details.less b/src/_h5ai/public/css/inc/view/view-details.less similarity index 100% rename from src/_h5ai/css/inc/view/view-details.less rename to src/_h5ai/public/css/inc/view/view-details.less diff --git a/src/_h5ai/css/inc/view/view-grid.less b/src/_h5ai/public/css/inc/view/view-grid.less similarity index 100% rename from src/_h5ai/css/inc/view/view-grid.less rename to src/_h5ai/public/css/inc/view/view-grid.less diff --git a/src/_h5ai/css/inc/view/view-icons.less b/src/_h5ai/public/css/inc/view/view-icons.less similarity index 100% rename from src/_h5ai/css/inc/view/view-icons.less rename to src/_h5ai/public/css/inc/view/view-icons.less diff --git a/src/_h5ai/css/inc/view/view.less b/src/_h5ai/public/css/inc/view/view.less similarity index 100% rename from src/_h5ai/css/inc/view/view.less rename to src/_h5ai/public/css/inc/view/view.less diff --git a/src/_h5ai/css/lib/h5bp-main-footer.less b/src/_h5ai/public/css/lib/h5bp-main-footer.less similarity index 100% rename from src/_h5ai/css/lib/h5bp-main-footer.less rename to src/_h5ai/public/css/lib/h5bp-main-footer.less diff --git a/src/_h5ai/css/lib/h5bp-main-header.less b/src/_h5ai/public/css/lib/h5bp-main-header.less similarity index 100% rename from src/_h5ai/css/lib/h5bp-main-header.less rename to src/_h5ai/public/css/lib/h5bp-main-header.less diff --git a/src/_h5ai/css/lib/h5bp-normalize.less b/src/_h5ai/public/css/lib/h5bp-normalize.less similarity index 100% rename from src/_h5ai/css/lib/h5bp-normalize.less rename to src/_h5ai/public/css/lib/h5bp-normalize.less diff --git a/src/_h5ai/css/styles.less b/src/_h5ai/public/css/styles.less similarity index 100% rename from src/_h5ai/css/styles.less rename to src/_h5ai/public/css/styles.less diff --git a/src/_h5ai/ext/README.md b/src/_h5ai/public/ext/README.md similarity index 100% rename from src/_h5ai/ext/README.md rename to src/_h5ai/public/ext/README.md diff --git a/src/_h5ai/images/fallback/file.png b/src/_h5ai/public/images/fallback/file.png similarity index 100% rename from src/_h5ai/images/fallback/file.png rename to src/_h5ai/public/images/fallback/file.png diff --git a/src/_h5ai/images/fallback/folder-parent.png b/src/_h5ai/public/images/fallback/folder-parent.png similarity index 100% rename from src/_h5ai/images/fallback/folder-parent.png rename to src/_h5ai/public/images/fallback/folder-parent.png diff --git a/src/_h5ai/images/fallback/folder.png b/src/_h5ai/public/images/fallback/folder.png similarity index 100% rename from src/_h5ai/images/fallback/folder.png rename to src/_h5ai/public/images/fallback/folder.png diff --git a/src/_h5ai/images/favicon/favicon-152.png b/src/_h5ai/public/images/favicon/favicon-152.png similarity index 100% rename from src/_h5ai/images/favicon/favicon-152.png rename to src/_h5ai/public/images/favicon/favicon-152.png diff --git a/src/_h5ai/images/favicon/favicon-16-32.ico b/src/_h5ai/public/images/favicon/favicon-16-32.ico similarity index 100% rename from src/_h5ai/images/favicon/favicon-16-32.ico rename to src/_h5ai/public/images/favicon/favicon-16-32.ico diff --git a/src/_h5ai/images/favicon/favicon-16.png b/src/_h5ai/public/images/favicon/favicon-16.png similarity index 100% rename from src/_h5ai/images/favicon/favicon-16.png rename to src/_h5ai/public/images/favicon/favicon-16.png diff --git a/src/_h5ai/images/favicon/favicon-32.png b/src/_h5ai/public/images/favicon/favicon-32.png similarity index 100% rename from src/_h5ai/images/favicon/favicon-32.png rename to src/_h5ai/public/images/favicon/favicon-32.png diff --git a/src/_h5ai/images/favicon/favicon.svg b/src/_h5ai/public/images/favicon/favicon.svg similarity index 100% rename from src/_h5ai/images/favicon/favicon.svg rename to src/_h5ai/public/images/favicon/favicon.svg diff --git a/src/_h5ai/images/themes/README.md b/src/_h5ai/public/images/themes/README.md similarity index 100% rename from src/_h5ai/images/themes/README.md rename to src/_h5ai/public/images/themes/README.md diff --git a/src/_h5ai/images/themes/comity/ar-apk.svg b/src/_h5ai/public/images/themes/comity/ar-apk.svg similarity index 100% rename from src/_h5ai/images/themes/comity/ar-apk.svg rename to src/_h5ai/public/images/themes/comity/ar-apk.svg diff --git a/src/_h5ai/images/themes/comity/ar-deb.svg b/src/_h5ai/public/images/themes/comity/ar-deb.svg similarity index 100% rename from src/_h5ai/images/themes/comity/ar-deb.svg rename to src/_h5ai/public/images/themes/comity/ar-deb.svg diff --git a/src/_h5ai/images/themes/comity/ar-rpm.svg b/src/_h5ai/public/images/themes/comity/ar-rpm.svg similarity index 100% rename from src/_h5ai/images/themes/comity/ar-rpm.svg rename to src/_h5ai/public/images/themes/comity/ar-rpm.svg diff --git a/src/_h5ai/images/themes/comity/txt-css.svg b/src/_h5ai/public/images/themes/comity/txt-css.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-css.svg rename to src/_h5ai/public/images/themes/comity/txt-css.svg diff --git a/src/_h5ai/images/themes/comity/txt-go.svg b/src/_h5ai/public/images/themes/comity/txt-go.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-go.svg rename to src/_h5ai/public/images/themes/comity/txt-go.svg diff --git a/src/_h5ai/images/themes/comity/txt-html.svg b/src/_h5ai/public/images/themes/comity/txt-html.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-html.svg rename to src/_h5ai/public/images/themes/comity/txt-html.svg diff --git a/src/_h5ai/images/themes/comity/txt-js.svg b/src/_h5ai/public/images/themes/comity/txt-js.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-js.svg rename to src/_h5ai/public/images/themes/comity/txt-js.svg diff --git a/src/_h5ai/images/themes/comity/txt-less.svg b/src/_h5ai/public/images/themes/comity/txt-less.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-less.svg rename to src/_h5ai/public/images/themes/comity/txt-less.svg diff --git a/src/_h5ai/images/themes/comity/txt-md.svg b/src/_h5ai/public/images/themes/comity/txt-md.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-md.svg rename to src/_h5ai/public/images/themes/comity/txt-md.svg diff --git a/src/_h5ai/images/themes/comity/txt-php.svg b/src/_h5ai/public/images/themes/comity/txt-php.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-php.svg rename to src/_h5ai/public/images/themes/comity/txt-php.svg diff --git a/src/_h5ai/images/themes/comity/txt-py.svg b/src/_h5ai/public/images/themes/comity/txt-py.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-py.svg rename to src/_h5ai/public/images/themes/comity/txt-py.svg diff --git a/src/_h5ai/images/themes/comity/txt-rb.svg b/src/_h5ai/public/images/themes/comity/txt-rb.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-rb.svg rename to src/_h5ai/public/images/themes/comity/txt-rb.svg diff --git a/src/_h5ai/images/themes/comity/txt-script.svg b/src/_h5ai/public/images/themes/comity/txt-script.svg similarity index 100% rename from src/_h5ai/images/themes/comity/txt-script.svg rename to src/_h5ai/public/images/themes/comity/txt-script.svg diff --git a/src/_h5ai/images/themes/comity/x-pdf.svg b/src/_h5ai/public/images/themes/comity/x-pdf.svg similarity index 100% rename from src/_h5ai/images/themes/comity/x-pdf.svg rename to src/_h5ai/public/images/themes/comity/x-pdf.svg diff --git a/src/_h5ai/images/themes/default/ar.svg b/src/_h5ai/public/images/themes/default/ar.svg similarity index 100% rename from src/_h5ai/images/themes/default/ar.svg rename to src/_h5ai/public/images/themes/default/ar.svg diff --git a/src/_h5ai/images/themes/default/aud.svg b/src/_h5ai/public/images/themes/default/aud.svg similarity index 100% rename from src/_h5ai/images/themes/default/aud.svg rename to src/_h5ai/public/images/themes/default/aud.svg diff --git a/src/_h5ai/images/themes/default/bin.svg b/src/_h5ai/public/images/themes/default/bin.svg similarity index 100% rename from src/_h5ai/images/themes/default/bin.svg rename to src/_h5ai/public/images/themes/default/bin.svg diff --git a/src/_h5ai/images/themes/default/file.svg b/src/_h5ai/public/images/themes/default/file.svg similarity index 100% rename from src/_h5ai/images/themes/default/file.svg rename to src/_h5ai/public/images/themes/default/file.svg diff --git a/src/_h5ai/images/themes/default/folder-page.svg b/src/_h5ai/public/images/themes/default/folder-page.svg similarity index 100% rename from src/_h5ai/images/themes/default/folder-page.svg rename to src/_h5ai/public/images/themes/default/folder-page.svg diff --git a/src/_h5ai/images/themes/default/folder-parent.svg b/src/_h5ai/public/images/themes/default/folder-parent.svg similarity index 100% rename from src/_h5ai/images/themes/default/folder-parent.svg rename to src/_h5ai/public/images/themes/default/folder-parent.svg diff --git a/src/_h5ai/images/themes/default/folder.svg b/src/_h5ai/public/images/themes/default/folder.svg similarity index 100% rename from src/_h5ai/images/themes/default/folder.svg rename to src/_h5ai/public/images/themes/default/folder.svg diff --git a/src/_h5ai/images/themes/default/img.svg b/src/_h5ai/public/images/themes/default/img.svg similarity index 100% rename from src/_h5ai/images/themes/default/img.svg rename to src/_h5ai/public/images/themes/default/img.svg diff --git a/src/_h5ai/images/themes/default/txt.svg b/src/_h5ai/public/images/themes/default/txt.svg similarity index 100% rename from src/_h5ai/images/themes/default/txt.svg rename to src/_h5ai/public/images/themes/default/txt.svg diff --git a/src/_h5ai/images/themes/default/vid.svg b/src/_h5ai/public/images/themes/default/vid.svg similarity index 100% rename from src/_h5ai/images/themes/default/vid.svg rename to src/_h5ai/public/images/themes/default/vid.svg diff --git a/src/_h5ai/images/themes/default/x.svg b/src/_h5ai/public/images/themes/default/x.svg similarity index 100% rename from src/_h5ai/images/themes/default/x.svg rename to src/_h5ai/public/images/themes/default/x.svg diff --git a/src/_h5ai/images/ui/back.svg b/src/_h5ai/public/images/ui/back.svg similarity index 100% rename from src/_h5ai/images/ui/back.svg rename to src/_h5ai/public/images/ui/back.svg diff --git a/src/_h5ai/images/ui/crumb.svg b/src/_h5ai/public/images/ui/crumb.svg similarity index 100% rename from src/_h5ai/images/ui/crumb.svg rename to src/_h5ai/public/images/ui/crumb.svg diff --git a/src/_h5ai/images/ui/download.svg b/src/_h5ai/public/images/ui/download.svg similarity index 100% rename from src/_h5ai/images/ui/download.svg rename to src/_h5ai/public/images/ui/download.svg diff --git a/src/_h5ai/images/ui/filter.svg b/src/_h5ai/public/images/ui/filter.svg similarity index 100% rename from src/_h5ai/images/ui/filter.svg rename to src/_h5ai/public/images/ui/filter.svg diff --git a/src/_h5ai/images/ui/info-toggle.svg b/src/_h5ai/public/images/ui/info-toggle.svg similarity index 100% rename from src/_h5ai/images/ui/info-toggle.svg rename to src/_h5ai/public/images/ui/info-toggle.svg diff --git a/src/_h5ai/images/ui/paypal.svg b/src/_h5ai/public/images/ui/paypal.svg similarity index 100% rename from src/_h5ai/images/ui/paypal.svg rename to src/_h5ai/public/images/ui/paypal.svg diff --git a/src/_h5ai/images/ui/preview-close.svg b/src/_h5ai/public/images/ui/preview-close.svg similarity index 100% rename from src/_h5ai/images/ui/preview-close.svg rename to src/_h5ai/public/images/ui/preview-close.svg diff --git a/src/_h5ai/images/ui/preview-fullscreen.svg b/src/_h5ai/public/images/ui/preview-fullscreen.svg similarity index 100% rename from src/_h5ai/images/ui/preview-fullscreen.svg rename to src/_h5ai/public/images/ui/preview-fullscreen.svg diff --git a/src/_h5ai/images/ui/preview-next.svg b/src/_h5ai/public/images/ui/preview-next.svg similarity index 100% rename from src/_h5ai/images/ui/preview-next.svg rename to src/_h5ai/public/images/ui/preview-next.svg diff --git a/src/_h5ai/images/ui/preview-no-fullscreen.svg b/src/_h5ai/public/images/ui/preview-no-fullscreen.svg similarity index 100% rename from src/_h5ai/images/ui/preview-no-fullscreen.svg rename to src/_h5ai/public/images/ui/preview-no-fullscreen.svg diff --git a/src/_h5ai/images/ui/preview-prev.svg b/src/_h5ai/public/images/ui/preview-prev.svg similarity index 100% rename from src/_h5ai/images/ui/preview-prev.svg rename to src/_h5ai/public/images/ui/preview-prev.svg diff --git a/src/_h5ai/images/ui/preview-raw.svg b/src/_h5ai/public/images/ui/preview-raw.svg similarity index 100% rename from src/_h5ai/images/ui/preview-raw.svg rename to src/_h5ai/public/images/ui/preview-raw.svg diff --git a/src/_h5ai/images/ui/search.svg b/src/_h5ai/public/images/ui/search.svg similarity index 100% rename from src/_h5ai/images/ui/search.svg rename to src/_h5ai/public/images/ui/search.svg diff --git a/src/_h5ai/images/ui/selected.svg b/src/_h5ai/public/images/ui/selected.svg similarity index 100% rename from src/_h5ai/images/ui/selected.svg rename to src/_h5ai/public/images/ui/selected.svg diff --git a/src/_h5ai/images/ui/sidebar.svg b/src/_h5ai/public/images/ui/sidebar.svg similarity index 100% rename from src/_h5ai/images/ui/sidebar.svg rename to src/_h5ai/public/images/ui/sidebar.svg diff --git a/src/_h5ai/images/ui/sort.svg b/src/_h5ai/public/images/ui/sort.svg similarity index 100% rename from src/_h5ai/images/ui/sort.svg rename to src/_h5ai/public/images/ui/sort.svg diff --git a/src/_h5ai/images/ui/spinner.svg b/src/_h5ai/public/images/ui/spinner.svg similarity index 100% rename from src/_h5ai/images/ui/spinner.svg rename to src/_h5ai/public/images/ui/spinner.svg diff --git a/src/_h5ai/images/ui/tree-indicator.svg b/src/_h5ai/public/images/ui/tree-indicator.svg similarity index 100% rename from src/_h5ai/images/ui/tree-indicator.svg rename to src/_h5ai/public/images/ui/tree-indicator.svg diff --git a/src/_h5ai/images/ui/tree-toggle.svg b/src/_h5ai/public/images/ui/tree-toggle.svg similarity index 100% rename from src/_h5ai/images/ui/tree-toggle.svg rename to src/_h5ai/public/images/ui/tree-toggle.svg diff --git a/src/_h5ai/images/ui/view-details.svg b/src/_h5ai/public/images/ui/view-details.svg similarity index 100% rename from src/_h5ai/images/ui/view-details.svg rename to src/_h5ai/public/images/ui/view-details.svg diff --git a/src/_h5ai/images/ui/view-grid.svg b/src/_h5ai/public/images/ui/view-grid.svg similarity index 100% rename from src/_h5ai/images/ui/view-grid.svg rename to src/_h5ai/public/images/ui/view-grid.svg diff --git a/src/_h5ai/images/ui/view-icons.svg b/src/_h5ai/public/images/ui/view-icons.svg similarity index 100% rename from src/_h5ai/images/ui/view-icons.svg rename to src/_h5ai/public/images/ui/view-icons.svg diff --git a/src/_h5ai/index.php b/src/_h5ai/public/index.php similarity index 84% rename from src/_h5ai/index.php rename to src/_h5ai/public/index.php index 7a5fffa1..2d1eac27 100644 --- a/src/_h5ai/index.php +++ b/src/_h5ai/public/index.php @@ -8,5 +8,5 @@ if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_ exit; } -require_once __DIR__ . '/private/php/class-bootstrap.php'; +require_once __DIR__ . '/../private/php/class-bootstrap.php'; Bootstrap::run(); diff --git a/src/_h5ai/js/inc/boot.js b/src/_h5ai/public/js/inc/boot.js similarity index 100% rename from src/_h5ai/js/inc/boot.js rename to src/_h5ai/public/js/inc/boot.js diff --git a/src/_h5ai/js/inc/core/event.js b/src/_h5ai/public/js/inc/core/event.js similarity index 100% rename from src/_h5ai/js/inc/core/event.js rename to src/_h5ai/public/js/inc/core/event.js diff --git a/src/_h5ai/js/inc/core/format.js b/src/_h5ai/public/js/inc/core/format.js similarity index 100% rename from src/_h5ai/js/inc/core/format.js rename to src/_h5ai/public/js/inc/core/format.js diff --git a/src/_h5ai/js/inc/core/langs.js b/src/_h5ai/public/js/inc/core/langs.js similarity index 100% rename from src/_h5ai/js/inc/core/langs.js rename to src/_h5ai/public/js/inc/core/langs.js diff --git a/src/_h5ai/js/inc/core/location.js b/src/_h5ai/public/js/inc/core/location.js similarity index 100% rename from src/_h5ai/js/inc/core/location.js rename to src/_h5ai/public/js/inc/core/location.js diff --git a/src/_h5ai/js/inc/core/resource.js b/src/_h5ai/public/js/inc/core/resource.js similarity index 100% rename from src/_h5ai/js/inc/core/resource.js rename to src/_h5ai/public/js/inc/core/resource.js diff --git a/src/_h5ai/js/inc/core/server.js b/src/_h5ai/public/js/inc/core/server.js similarity index 100% rename from src/_h5ai/js/inc/core/server.js rename to src/_h5ai/public/js/inc/core/server.js diff --git a/src/_h5ai/js/inc/core/settings.js b/src/_h5ai/public/js/inc/core/settings.js similarity index 100% rename from src/_h5ai/js/inc/core/settings.js rename to src/_h5ai/public/js/inc/core/settings.js diff --git a/src/_h5ai/js/inc/core/store.js b/src/_h5ai/public/js/inc/core/store.js similarity index 100% rename from src/_h5ai/js/inc/core/store.js rename to src/_h5ai/public/js/inc/core/store.js diff --git a/src/_h5ai/js/inc/core/types.js b/src/_h5ai/public/js/inc/core/types.js similarity index 100% rename from src/_h5ai/js/inc/core/types.js rename to src/_h5ai/public/js/inc/core/types.js diff --git a/src/_h5ai/js/inc/core/util.js b/src/_h5ai/public/js/inc/core/util.js similarity index 100% rename from src/_h5ai/js/inc/core/util.js rename to src/_h5ai/public/js/inc/core/util.js diff --git a/src/_h5ai/js/inc/ext/autorefresh.js b/src/_h5ai/public/js/inc/ext/autorefresh.js similarity index 100% rename from src/_h5ai/js/inc/ext/autorefresh.js rename to src/_h5ai/public/js/inc/ext/autorefresh.js diff --git a/src/_h5ai/js/inc/ext/contextmenu.js b/src/_h5ai/public/js/inc/ext/contextmenu.js similarity index 100% rename from src/_h5ai/js/inc/ext/contextmenu.js rename to src/_h5ai/public/js/inc/ext/contextmenu.js diff --git a/src/_h5ai/js/inc/ext/crumb.js b/src/_h5ai/public/js/inc/ext/crumb.js similarity index 100% rename from src/_h5ai/js/inc/ext/crumb.js rename to src/_h5ai/public/js/inc/ext/crumb.js diff --git a/src/_h5ai/js/inc/ext/custom.js b/src/_h5ai/public/js/inc/ext/custom.js similarity index 100% rename from src/_h5ai/js/inc/ext/custom.js rename to src/_h5ai/public/js/inc/ext/custom.js diff --git a/src/_h5ai/js/inc/ext/download.js b/src/_h5ai/public/js/inc/ext/download.js similarity index 100% rename from src/_h5ai/js/inc/ext/download.js rename to src/_h5ai/public/js/inc/ext/download.js diff --git a/src/_h5ai/js/inc/ext/filter.js b/src/_h5ai/public/js/inc/ext/filter.js similarity index 100% rename from src/_h5ai/js/inc/ext/filter.js rename to src/_h5ai/public/js/inc/ext/filter.js diff --git a/src/_h5ai/js/inc/ext/google-analytics.js b/src/_h5ai/public/js/inc/ext/google-analytics.js similarity index 100% rename from src/_h5ai/js/inc/ext/google-analytics.js rename to src/_h5ai/public/js/inc/ext/google-analytics.js diff --git a/src/_h5ai/js/inc/ext/info.js b/src/_h5ai/public/js/inc/ext/info.js similarity index 100% rename from src/_h5ai/js/inc/ext/info.js rename to src/_h5ai/public/js/inc/ext/info.js diff --git a/src/_h5ai/js/inc/ext/l10n.js b/src/_h5ai/public/js/inc/ext/l10n.js similarity index 100% rename from src/_h5ai/js/inc/ext/l10n.js rename to src/_h5ai/public/js/inc/ext/l10n.js diff --git a/src/_h5ai/js/inc/ext/peer5.js b/src/_h5ai/public/js/inc/ext/peer5.js similarity index 100% rename from src/_h5ai/js/inc/ext/peer5.js rename to src/_h5ai/public/js/inc/ext/peer5.js diff --git a/src/_h5ai/js/inc/ext/piwik-analytics.js b/src/_h5ai/public/js/inc/ext/piwik-analytics.js similarity index 100% rename from src/_h5ai/js/inc/ext/piwik-analytics.js rename to src/_h5ai/public/js/inc/ext/piwik-analytics.js diff --git a/src/_h5ai/js/inc/ext/preview-aud.js b/src/_h5ai/public/js/inc/ext/preview-aud.js similarity index 100% rename from src/_h5ai/js/inc/ext/preview-aud.js rename to src/_h5ai/public/js/inc/ext/preview-aud.js diff --git a/src/_h5ai/js/inc/ext/preview-img.js b/src/_h5ai/public/js/inc/ext/preview-img.js similarity index 100% rename from src/_h5ai/js/inc/ext/preview-img.js rename to src/_h5ai/public/js/inc/ext/preview-img.js diff --git a/src/_h5ai/js/inc/ext/preview-txt.js b/src/_h5ai/public/js/inc/ext/preview-txt.js similarity index 100% rename from src/_h5ai/js/inc/ext/preview-txt.js rename to src/_h5ai/public/js/inc/ext/preview-txt.js diff --git a/src/_h5ai/js/inc/ext/preview-vid.js b/src/_h5ai/public/js/inc/ext/preview-vid.js similarity index 100% rename from src/_h5ai/js/inc/ext/preview-vid.js rename to src/_h5ai/public/js/inc/ext/preview-vid.js diff --git a/src/_h5ai/js/inc/ext/preview.js b/src/_h5ai/public/js/inc/ext/preview.js similarity index 100% rename from src/_h5ai/js/inc/ext/preview.js rename to src/_h5ai/public/js/inc/ext/preview.js diff --git a/src/_h5ai/js/inc/ext/search.js b/src/_h5ai/public/js/inc/ext/search.js similarity index 100% rename from src/_h5ai/js/inc/ext/search.js rename to src/_h5ai/public/js/inc/ext/search.js diff --git a/src/_h5ai/js/inc/ext/select.js b/src/_h5ai/public/js/inc/ext/select.js similarity index 100% rename from src/_h5ai/js/inc/ext/select.js rename to src/_h5ai/public/js/inc/ext/select.js diff --git a/src/_h5ai/js/inc/ext/sort.js b/src/_h5ai/public/js/inc/ext/sort.js similarity index 100% rename from src/_h5ai/js/inc/ext/sort.js rename to src/_h5ai/public/js/inc/ext/sort.js diff --git a/src/_h5ai/js/inc/ext/thumbnails.js b/src/_h5ai/public/js/inc/ext/thumbnails.js similarity index 100% rename from src/_h5ai/js/inc/ext/thumbnails.js rename to src/_h5ai/public/js/inc/ext/thumbnails.js diff --git a/src/_h5ai/js/inc/ext/title.js b/src/_h5ai/public/js/inc/ext/title.js similarity index 100% rename from src/_h5ai/js/inc/ext/title.js rename to src/_h5ai/public/js/inc/ext/title.js diff --git a/src/_h5ai/js/inc/ext/tree.js b/src/_h5ai/public/js/inc/ext/tree.js similarity index 100% rename from src/_h5ai/js/inc/ext/tree.js rename to src/_h5ai/public/js/inc/ext/tree.js diff --git a/src/_h5ai/js/inc/main/index.js b/src/_h5ai/public/js/inc/main/index.js similarity index 100% rename from src/_h5ai/js/inc/main/index.js rename to src/_h5ai/public/js/inc/main/index.js diff --git a/src/_h5ai/js/inc/main/info.js b/src/_h5ai/public/js/inc/main/info.js similarity index 100% rename from src/_h5ai/js/inc/main/info.js rename to src/_h5ai/public/js/inc/main/info.js diff --git a/src/_h5ai/js/inc/model/item.js b/src/_h5ai/public/js/inc/model/item.js similarity index 100% rename from src/_h5ai/js/inc/model/item.js rename to src/_h5ai/public/js/inc/model/item.js diff --git a/src/_h5ai/js/inc/view/content.js b/src/_h5ai/public/js/inc/view/content.js similarity index 100% rename from src/_h5ai/js/inc/view/content.js rename to src/_h5ai/public/js/inc/view/content.js diff --git a/src/_h5ai/js/inc/view/mainrow.js b/src/_h5ai/public/js/inc/view/mainrow.js similarity index 100% rename from src/_h5ai/js/inc/view/mainrow.js rename to src/_h5ai/public/js/inc/view/mainrow.js diff --git a/src/_h5ai/js/inc/view/notification.js b/src/_h5ai/public/js/inc/view/notification.js similarity index 100% rename from src/_h5ai/js/inc/view/notification.js rename to src/_h5ai/public/js/inc/view/notification.js diff --git a/src/_h5ai/js/inc/view/root.js b/src/_h5ai/public/js/inc/view/root.js similarity index 100% rename from src/_h5ai/js/inc/view/root.js rename to src/_h5ai/public/js/inc/view/root.js diff --git a/src/_h5ai/js/inc/view/sidebar.js b/src/_h5ai/public/js/inc/view/sidebar.js similarity index 100% rename from src/_h5ai/js/inc/view/sidebar.js rename to src/_h5ai/public/js/inc/view/sidebar.js diff --git a/src/_h5ai/js/inc/view/topbar.js b/src/_h5ai/public/js/inc/view/topbar.js similarity index 100% rename from src/_h5ai/js/inc/view/topbar.js rename to src/_h5ai/public/js/inc/view/topbar.js diff --git a/src/_h5ai/js/inc/view/view.js b/src/_h5ai/public/js/inc/view/view.js similarity index 100% rename from src/_h5ai/js/inc/view/view.js rename to src/_h5ai/public/js/inc/view/view.js diff --git a/src/_h5ai/js/inc/view/viewmode.js b/src/_h5ai/public/js/inc/view/viewmode.js similarity index 100% rename from src/_h5ai/js/inc/view/viewmode.js rename to src/_h5ai/public/js/inc/view/viewmode.js diff --git a/src/_h5ai/js/lib/jquery-2.1.3.min.js b/src/_h5ai/public/js/lib/jquery-2.1.3.min.js similarity index 100% rename from src/_h5ai/js/lib/jquery-2.1.3.min.js rename to src/_h5ai/public/js/lib/jquery-2.1.3.min.js diff --git a/src/_h5ai/js/lib/jquery.qrcode-0.11.0.min.js b/src/_h5ai/public/js/lib/jquery.qrcode-0.11.0.min.js similarity index 100% rename from src/_h5ai/js/lib/jquery.qrcode-0.11.0.min.js rename to src/_h5ai/public/js/lib/jquery.qrcode-0.11.0.min.js diff --git a/src/_h5ai/js/lib/lodash-3.8.0.min.js b/src/_h5ai/public/js/lib/lodash-3.8.0.min.js similarity index 100% rename from src/_h5ai/js/lib/lodash-3.8.0.min.js rename to src/_h5ai/public/js/lib/lodash-3.8.0.min.js diff --git a/src/_h5ai/js/lib/marked-0.3.2.min.js b/src/_h5ai/public/js/lib/marked-0.3.2.min.js similarity index 100% rename from src/_h5ai/js/lib/marked-0.3.2.min.js rename to src/_h5ai/public/js/lib/marked-0.3.2.min.js diff --git a/src/_h5ai/js/lib/modernizr-2.8.3.min.js b/src/_h5ai/public/js/lib/modernizr-2.8.3.min.js similarity index 100% rename from src/_h5ai/js/lib/modernizr-2.8.3.min.js rename to src/_h5ai/public/js/lib/modernizr-2.8.3.min.js diff --git a/src/_h5ai/js/lib/modulejs-1.5.0.min.js b/src/_h5ai/public/js/lib/modulejs-1.5.0.min.js similarity index 100% rename from src/_h5ai/js/lib/modulejs-1.5.0.min.js rename to src/_h5ai/public/js/lib/modulejs-1.5.0.min.js diff --git a/src/_h5ai/js/lib/prism-2015-04-05.min.js b/src/_h5ai/public/js/lib/prism-2015-04-05.min.js similarity index 100% rename from src/_h5ai/js/lib/prism-2015-04-05.min.js rename to src/_h5ai/public/js/lib/prism-2015-04-05.min.js diff --git a/src/_h5ai/js/scripts.js b/src/_h5ai/public/js/scripts.js similarity index 100% rename from src/_h5ai/js/scripts.js rename to src/_h5ai/public/js/scripts.js