diff --git a/mkrfile.js b/mkrfile.js index 71c8e30b..f83e0cd2 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/client/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/client/js/*.js') - .newerThan(mapSrc, $(src + ': _h5ai/client/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/client/css/*.less') - .newerThan(mapSrc, $(src + ': _h5ai/client/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/client/js/**, ! _h5ai/client/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/client/css/styles.less') + $(src + '/_h5ai/public/css/styles.less') .includeit() .less() .autoprefixer() .write(build + '/test/h5ai-styles.css', true); - $(src + '/_h5ai/client/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 24782895..f65b82f9 100644 --- a/src/_h5ai/.htaccess +++ b/src/_h5ai/.htaccess @@ -1,46 +1,3 @@ - -DirectoryIndex index.html - - - - Options -Indexes - - - -AddDefaultCharset utf-8 - - - - AddCharset utf-8 .css .js .json .svg - - - - - ExpiresActive on - ExpiresDefault "access plus 1 month" - - # CSS - ExpiresByType text/css "access plus 1 week" - - # Data interchange - ExpiresByType application/json "access plus 0 seconds" - ExpiresByType application/xml "access plus 0 seconds" - ExpiresByType text/xml "access plus 0 seconds" - - # Favicon (cannot be renamed!) - ExpiresByType image/x-icon "access plus 1 week" - - # HTML - ExpiresByType text/html "access plus 0 seconds" - - # JavaScript - ExpiresByType application/javascript "access plus 1 week" - - # Media - ExpiresByType image/jpeg "access plus 1 month" - ExpiresByType image/png "access plus 1 month" - - # Web fonts - ExpiresByType application/font-woff "access plus 1 month" - ExpiresByType image/svg+xml "access plus 1 month" - +Satisfy all +Order deny,allow +Deny from all diff --git a/src/_h5ai/server/php/inc/class-bootstrap.php b/src/_h5ai/backend/php/class-bootstrap.php similarity index 95% rename from src/_h5ai/server/php/inc/class-bootstrap.php rename to src/_h5ai/backend/php/class-bootstrap.php index 9da98d3b..d362e631 100644 --- a/src/_h5ai/server/php/inc/class-bootstrap.php +++ b/src/_h5ai/backend/php/class-bootstrap.php @@ -17,7 +17,7 @@ class Bootstrap { date_default_timezone_set(@date_default_timezone_get()); session_start(); - require __DIR__ . '/../config.php'; + require __DIR__ . '/../../conf/passhash.php'; $session = new Session($_SESSION); $request = new Request($_REQUEST); diff --git a/src/_h5ai/server/php/inc/core/class-api.php b/src/_h5ai/backend/php/core/class-api.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-api.php rename to src/_h5ai/backend/php/core/class-api.php diff --git a/src/_h5ai/server/php/inc/core/class-context.php b/src/_h5ai/backend/php/core/class-context.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-context.php rename to src/_h5ai/backend/php/core/class-context.php diff --git a/src/_h5ai/server/php/inc/core/class-fallback.php b/src/_h5ai/backend/php/core/class-fallback.php similarity index 85% rename from src/_h5ai/server/php/inc/core/class-fallback.php rename to src/_h5ai/backend/php/core/class-fallback.php index 1c5fa1bc..4fc2edb5 100644 --- a/src/_h5ai/server/php/inc/core/class-fallback.php +++ b/src/_h5ai/backend/php/core/class-fallback.php @@ -29,7 +29,7 @@ class Fallback { $path = $this->get_current_path(); } - $app_href = $this->setup->get('APP_HREF'); + $fallback_images_href = $this->setup->get('APP_HREF') . 'public/images/fallback/'; $cache = []; $folder = Item::get($this->context, $path, $cache); @@ -47,7 +47,7 @@ class Fallback { if ($folder->get_parent($cache)) { $html .= ''; - $html .= 'folder-parent'; + $html .= 'folder-parent'; $html .= 'Parent Directory'; $html .= ''; $html .= ''; @@ -58,7 +58,7 @@ class Fallback { $type = $item->is_folder ? 'folder' : 'file'; $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/core/class-item.php b/src/_h5ai/backend/php/core/class-item.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-item.php rename to src/_h5ai/backend/php/core/class-item.php diff --git a/src/_h5ai/server/php/inc/core/class-logger.php b/src/_h5ai/backend/php/core/class-logger.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-logger.php rename to src/_h5ai/backend/php/core/class-logger.php diff --git a/src/_h5ai/server/php/inc/core/class-request.php b/src/_h5ai/backend/php/core/class-request.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-request.php rename to src/_h5ai/backend/php/core/class-request.php diff --git a/src/_h5ai/server/php/inc/core/class-session.php b/src/_h5ai/backend/php/core/class-session.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-session.php rename to src/_h5ai/backend/php/core/class-session.php diff --git a/src/_h5ai/server/php/inc/core/class-setup.php b/src/_h5ai/backend/php/core/class-setup.php similarity index 95% rename from src/_h5ai/server/php/inc/core/class-setup.php rename to src/_h5ai/backend/php/core/class-setup.php index 6133ab08..85b8a22a 100644 --- a/src/_h5ai/server/php/inc/core/class-setup.php +++ b/src/_h5ai/backend/php/core/class-setup.php @@ -86,7 +86,7 @@ class Setup { private function add_admin_check() { - $this->set('HAS_CUSTOM_PASSHASH', strtolower(PASSHASH) === Setup::$DEFAULT_PASSHASH); + $this->set('HAS_CUSTOM_PASSHASH', strtolower(PASSHASH) !== Setup::$DEFAULT_PASSHASH); } private function add_server_metadata_and_check() { @@ -112,23 +112,23 @@ class Setup { $script_name = preg_replace('#^.*?//#', '/', $script_name); } - $this->set('APP_HREF', Util::normalize_path(dirname(dirname(dirname($script_name))), true)); - $this->set('APP_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(dirname(__FILE__))))), false)); + $this->set('APP_HREF', Util::normalize_path(dirname(dirname($script_name)), true)); + $this->set('APP_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false)); $this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('APP_HREF')), true)); $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('APP_PATH')), false)); $index_href = null; - if (@is_readable(Util::normalize_path($this->get('APP_PATH') . '/server/php/index.php', false))) { - $index_href = Util::normalize_path($this->get('APP_HREF') . '/server/php/index.php', false); + if (@is_readable(Util::normalize_path($this->get('APP_PATH') . '/public/index.php', false))) { + $index_href = Util::normalize_path($this->get('APP_HREF') . '/public/index.php', false); } $this->set('INDEX_HREF', $index_href); } private function add_cache_paths_and_check() { - $this->set('CACHE_HREF', Util::normalize_path($this->get('APP_HREF') . '/cache', true)); - $this->set('CACHE_PATH', Util::normalize_path($this->get('APP_PATH') . '/cache', false)); + $this->set('CACHE_HREF', Util::normalize_path($this->get('APP_HREF') . '/public/cache', true)); + $this->set('CACHE_PATH', Util::normalize_path($this->get('APP_PATH') . '/public/cache', false)); $this->set('HAS_WRITABLE_CACHE', @is_writable($this->get('CACHE_PATH'))); } diff --git a/src/_h5ai/server/php/inc/core/class-theme.php b/src/_h5ai/backend/php/core/class-theme.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-theme.php rename to src/_h5ai/backend/php/core/class-theme.php diff --git a/src/_h5ai/server/php/inc/core/class-util.php b/src/_h5ai/backend/php/core/class-util.php similarity index 100% rename from src/_h5ai/server/php/inc/core/class-util.php rename to src/_h5ai/backend/php/core/class-util.php diff --git a/src/_h5ai/server/php/inc/ext/class-archive.php b/src/_h5ai/backend/php/ext/class-archive.php similarity index 100% rename from src/_h5ai/server/php/inc/ext/class-archive.php rename to src/_h5ai/backend/php/ext/class-archive.php diff --git a/src/_h5ai/server/php/inc/ext/class-custom.php b/src/_h5ai/backend/php/ext/class-custom.php similarity index 100% rename from src/_h5ai/server/php/inc/ext/class-custom.php rename to src/_h5ai/backend/php/ext/class-custom.php diff --git a/src/_h5ai/server/php/inc/ext/class-search.php b/src/_h5ai/backend/php/ext/class-search.php similarity index 100% rename from src/_h5ai/server/php/inc/ext/class-search.php rename to src/_h5ai/backend/php/ext/class-search.php diff --git a/src/_h5ai/server/php/inc/ext/class-thumb.php b/src/_h5ai/backend/php/ext/class-thumb.php similarity index 100% rename from src/_h5ai/server/php/inc/ext/class-thumb.php rename to src/_h5ai/backend/php/ext/class-thumb.php diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/backend/php/page.php.jade similarity index 83% rename from src/_h5ai/server/php/inc/page.php.jade rename to src/_h5ai/backend/php/page.php.jade index c26eaaa8..f943d6ae 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/backend/php/page.php.jade @@ -12,11 +12,11 @@ head title index ยท powered by #{pkg.name} #{pkg.version} (#{pkg.homepage}) meta( name="description", content="index - powered by #{pkg.name} #{pkg.version} (#{pkg.homepage})" ) meta( name="viewport", content="width=device-width, initial-scale=1" ) - link( rel="shortcut icon", href!="#{APP_HREF}client/images/favicon/favicon-16-32.ico" ) - link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{APP_HREF}client/images/favicon/favicon-152.png" ) + link( rel="shortcut icon", href!="#{APP_HREF}public/images/favicon/favicon-16-32.ico" ) + link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{APP_HREF}public/images/favicon/favicon-152.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Roboto:300,400,700" ) - link( rel="stylesheet", href!="#{APP_HREF}client/css/styles.css" ) - script( src!="#{APP_HREF}client/js/scripts.js", data-module="index" ) + link( rel="stylesheet", href!="#{APP_HREF}public/css/styles.css" ) + script( src!="#{APP_HREF}public/js/scripts.js", data-module="index" ) body#root diff --git a/src/_h5ai/server/php/config.php b/src/_h5ai/conf/passhash.php similarity index 100% rename from src/_h5ai/server/php/config.php rename to src/_h5ai/conf/passhash.php diff --git a/src/_h5ai/public/.htaccess b/src/_h5ai/public/.htaccess new file mode 100644 index 00000000..3a4e2b14 --- /dev/null +++ b/src/_h5ai/public/.htaccess @@ -0,0 +1,45 @@ +Satisfy all +Order allow,deny +Allow from all + +DirectoryIndex info.html + + + Options -Indexes + + +AddDefaultCharset utf-8 + + + AddCharset utf-8 .css .html .js .json .php .svg + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + # CSS + ExpiresByType text/css "access plus 1 week" + + # Data interchange + ExpiresByType application/json "access plus 0 seconds" + ExpiresByType application/xml "access plus 0 seconds" + ExpiresByType text/xml "access plus 0 seconds" + + # Favicon (cannot be renamed!) + ExpiresByType image/x-icon "access plus 1 week" + + # HTML + ExpiresByType text/html "access plus 0 seconds" + + # JavaScript + ExpiresByType application/javascript "access plus 1 week" + + # Media + ExpiresByType image/jpeg "access plus 1 month" + ExpiresByType image/png "access plus 1 month" + + # Web fonts + ExpiresByType application/font-woff "access plus 1 month" + ExpiresByType image/svg+xml "access plus 1 month" + 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/client/css/inc/colors.less b/src/_h5ai/public/css/inc/colors.less similarity index 100% rename from src/_h5ai/client/css/inc/colors.less rename to src/_h5ai/public/css/inc/colors.less diff --git a/src/_h5ai/client/css/inc/ext/contextmenu.less b/src/_h5ai/public/css/inc/ext/contextmenu.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/contextmenu.less rename to src/_h5ai/public/css/inc/ext/contextmenu.less diff --git a/src/_h5ai/client/css/inc/ext/crumb.less b/src/_h5ai/public/css/inc/ext/crumb.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/crumb.less rename to src/_h5ai/public/css/inc/ext/crumb.less diff --git a/src/_h5ai/client/css/inc/ext/custom.less b/src/_h5ai/public/css/inc/ext/custom.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/custom.less rename to src/_h5ai/public/css/inc/ext/custom.less diff --git a/src/_h5ai/client/css/inc/ext/filter.less b/src/_h5ai/public/css/inc/ext/filter.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/filter.less rename to src/_h5ai/public/css/inc/ext/filter.less diff --git a/src/_h5ai/client/css/inc/ext/info.less b/src/_h5ai/public/css/inc/ext/info.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/info.less rename to src/_h5ai/public/css/inc/ext/info.less diff --git a/src/_h5ai/client/css/inc/ext/preview-aud.less b/src/_h5ai/public/css/inc/ext/preview-aud.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/preview-aud.less rename to src/_h5ai/public/css/inc/ext/preview-aud.less diff --git a/src/_h5ai/client/css/inc/ext/preview-img.less b/src/_h5ai/public/css/inc/ext/preview-img.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/preview-img.less rename to src/_h5ai/public/css/inc/ext/preview-img.less diff --git a/src/_h5ai/client/css/inc/ext/preview-txt.less b/src/_h5ai/public/css/inc/ext/preview-txt.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/preview-txt.less rename to src/_h5ai/public/css/inc/ext/preview-txt.less diff --git a/src/_h5ai/client/css/inc/ext/preview-vid.less b/src/_h5ai/public/css/inc/ext/preview-vid.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/preview-vid.less rename to src/_h5ai/public/css/inc/ext/preview-vid.less diff --git a/src/_h5ai/client/css/inc/ext/preview.less b/src/_h5ai/public/css/inc/ext/preview.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/preview.less rename to src/_h5ai/public/css/inc/ext/preview.less diff --git a/src/_h5ai/client/css/inc/ext/search.less b/src/_h5ai/public/css/inc/ext/search.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/search.less rename to src/_h5ai/public/css/inc/ext/search.less diff --git a/src/_h5ai/client/css/inc/ext/select.less b/src/_h5ai/public/css/inc/ext/select.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/select.less rename to src/_h5ai/public/css/inc/ext/select.less diff --git a/src/_h5ai/client/css/inc/ext/tree.less b/src/_h5ai/public/css/inc/ext/tree.less similarity index 100% rename from src/_h5ai/client/css/inc/ext/tree.less rename to src/_h5ai/public/css/inc/ext/tree.less diff --git a/src/_h5ai/client/css/inc/fonts.less b/src/_h5ai/public/css/inc/fonts.less similarity index 100% rename from src/_h5ai/client/css/inc/fonts.less rename to src/_h5ai/public/css/inc/fonts.less diff --git a/src/_h5ai/client/css/inc/main/info.less b/src/_h5ai/public/css/inc/main/info.less similarity index 99% rename from src/_h5ai/client/css/inc/main/info.less rename to src/_h5ai/public/css/inc/main/info.less index 0a5abc82..9ee9a74e 100644 --- a/src/_h5ai/client/css/inc/main/info.less +++ b/src/_h5ai/public/css/inc/main/info.less @@ -65,7 +65,7 @@ #hint { margin: 12px auto; - width: 400px; + width: 300px; font-weight: lighter; } diff --git a/src/_h5ai/client/css/inc/misc.less b/src/_h5ai/public/css/inc/misc.less similarity index 100% rename from src/_h5ai/client/css/inc/misc.less rename to src/_h5ai/public/css/inc/misc.less diff --git a/src/_h5ai/client/css/inc/mixins.less b/src/_h5ai/public/css/inc/mixins.less similarity index 100% rename from src/_h5ai/client/css/inc/mixins.less rename to src/_h5ai/public/css/inc/mixins.less diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/public/css/inc/responsive.less similarity index 100% rename from src/_h5ai/client/css/inc/responsive.less rename to src/_h5ai/public/css/inc/responsive.less diff --git a/src/_h5ai/client/css/inc/view/content.less b/src/_h5ai/public/css/inc/view/content.less similarity index 100% rename from src/_h5ai/client/css/inc/view/content.less rename to src/_h5ai/public/css/inc/view/content.less diff --git a/src/_h5ai/client/css/inc/view/fallback.less b/src/_h5ai/public/css/inc/view/fallback.less similarity index 100% rename from src/_h5ai/client/css/inc/view/fallback.less rename to src/_h5ai/public/css/inc/view/fallback.less diff --git a/src/_h5ai/client/css/inc/view/mainrow.less b/src/_h5ai/public/css/inc/view/mainrow.less similarity index 100% rename from src/_h5ai/client/css/inc/view/mainrow.less rename to src/_h5ai/public/css/inc/view/mainrow.less diff --git a/src/_h5ai/client/css/inc/view/notification.less b/src/_h5ai/public/css/inc/view/notification.less similarity index 100% rename from src/_h5ai/client/css/inc/view/notification.less rename to src/_h5ai/public/css/inc/view/notification.less diff --git a/src/_h5ai/client/css/inc/view/root.less b/src/_h5ai/public/css/inc/view/root.less similarity index 100% rename from src/_h5ai/client/css/inc/view/root.less rename to src/_h5ai/public/css/inc/view/root.less diff --git a/src/_h5ai/client/css/inc/view/sidebar.less b/src/_h5ai/public/css/inc/view/sidebar.less similarity index 100% rename from src/_h5ai/client/css/inc/view/sidebar.less rename to src/_h5ai/public/css/inc/view/sidebar.less diff --git a/src/_h5ai/client/css/inc/view/topbar.less b/src/_h5ai/public/css/inc/view/topbar.less similarity index 100% rename from src/_h5ai/client/css/inc/view/topbar.less rename to src/_h5ai/public/css/inc/view/topbar.less diff --git a/src/_h5ai/client/css/inc/view/view-details.less b/src/_h5ai/public/css/inc/view/view-details.less similarity index 100% rename from src/_h5ai/client/css/inc/view/view-details.less rename to src/_h5ai/public/css/inc/view/view-details.less diff --git a/src/_h5ai/client/css/inc/view/view-grid.less b/src/_h5ai/public/css/inc/view/view-grid.less similarity index 100% rename from src/_h5ai/client/css/inc/view/view-grid.less rename to src/_h5ai/public/css/inc/view/view-grid.less diff --git a/src/_h5ai/client/css/inc/view/view-icons.less b/src/_h5ai/public/css/inc/view/view-icons.less similarity index 100% rename from src/_h5ai/client/css/inc/view/view-icons.less rename to src/_h5ai/public/css/inc/view/view-icons.less diff --git a/src/_h5ai/client/css/inc/view/view.less b/src/_h5ai/public/css/inc/view/view.less similarity index 100% rename from src/_h5ai/client/css/inc/view/view.less rename to src/_h5ai/public/css/inc/view/view.less diff --git a/src/_h5ai/client/css/lib/h5bp-main-footer.less b/src/_h5ai/public/css/lib/h5bp-main-footer.less similarity index 100% rename from src/_h5ai/client/css/lib/h5bp-main-footer.less rename to src/_h5ai/public/css/lib/h5bp-main-footer.less diff --git a/src/_h5ai/client/css/lib/h5bp-main-header.less b/src/_h5ai/public/css/lib/h5bp-main-header.less similarity index 100% rename from src/_h5ai/client/css/lib/h5bp-main-header.less rename to src/_h5ai/public/css/lib/h5bp-main-header.less diff --git a/src/_h5ai/client/css/lib/h5bp-normalize.less b/src/_h5ai/public/css/lib/h5bp-normalize.less similarity index 100% rename from src/_h5ai/client/css/lib/h5bp-normalize.less rename to src/_h5ai/public/css/lib/h5bp-normalize.less diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/public/css/styles.less similarity index 100% rename from src/_h5ai/client/css/styles.less rename to src/_h5ai/public/css/styles.less diff --git a/src/_h5ai/client/images/fallback/file.png b/src/_h5ai/public/images/fallback/file.png similarity index 100% rename from src/_h5ai/client/images/fallback/file.png rename to src/_h5ai/public/images/fallback/file.png diff --git a/src/_h5ai/client/images/fallback/folder-parent.png b/src/_h5ai/public/images/fallback/folder-parent.png similarity index 100% rename from src/_h5ai/client/images/fallback/folder-parent.png rename to src/_h5ai/public/images/fallback/folder-parent.png diff --git a/src/_h5ai/client/images/fallback/folder.png b/src/_h5ai/public/images/fallback/folder.png similarity index 100% rename from src/_h5ai/client/images/fallback/folder.png rename to src/_h5ai/public/images/fallback/folder.png diff --git a/src/_h5ai/client/images/favicon/favicon-152.png b/src/_h5ai/public/images/favicon/favicon-152.png similarity index 100% rename from src/_h5ai/client/images/favicon/favicon-152.png rename to src/_h5ai/public/images/favicon/favicon-152.png diff --git a/src/_h5ai/client/images/favicon/favicon-16-32.ico b/src/_h5ai/public/images/favicon/favicon-16-32.ico similarity index 100% rename from src/_h5ai/client/images/favicon/favicon-16-32.ico rename to src/_h5ai/public/images/favicon/favicon-16-32.ico diff --git a/src/_h5ai/client/images/themes/README.md b/src/_h5ai/public/images/themes/README.md similarity index 100% rename from src/_h5ai/client/images/themes/README.md rename to src/_h5ai/public/images/themes/README.md diff --git a/src/_h5ai/client/images/themes/default/ar.svg b/src/_h5ai/public/images/themes/default/ar.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/ar.svg rename to src/_h5ai/public/images/themes/default/ar.svg diff --git a/src/_h5ai/client/images/themes/default/aud.svg b/src/_h5ai/public/images/themes/default/aud.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/aud.svg rename to src/_h5ai/public/images/themes/default/aud.svg diff --git a/src/_h5ai/client/images/themes/default/bin.svg b/src/_h5ai/public/images/themes/default/bin.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/bin.svg rename to src/_h5ai/public/images/themes/default/bin.svg diff --git a/src/_h5ai/client/images/themes/default/file.svg b/src/_h5ai/public/images/themes/default/file.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/file.svg rename to src/_h5ai/public/images/themes/default/file.svg diff --git a/src/_h5ai/client/images/themes/default/folder-page.svg b/src/_h5ai/public/images/themes/default/folder-page.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/folder-page.svg rename to src/_h5ai/public/images/themes/default/folder-page.svg diff --git a/src/_h5ai/client/images/themes/default/folder-parent.svg b/src/_h5ai/public/images/themes/default/folder-parent.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/folder-parent.svg rename to src/_h5ai/public/images/themes/default/folder-parent.svg diff --git a/src/_h5ai/client/images/themes/default/folder.svg b/src/_h5ai/public/images/themes/default/folder.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/folder.svg rename to src/_h5ai/public/images/themes/default/folder.svg diff --git a/src/_h5ai/client/images/themes/default/img.svg b/src/_h5ai/public/images/themes/default/img.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/img.svg rename to src/_h5ai/public/images/themes/default/img.svg diff --git a/src/_h5ai/client/images/themes/default/txt.svg b/src/_h5ai/public/images/themes/default/txt.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/txt.svg rename to src/_h5ai/public/images/themes/default/txt.svg diff --git a/src/_h5ai/client/images/themes/default/vid.svg b/src/_h5ai/public/images/themes/default/vid.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/vid.svg rename to src/_h5ai/public/images/themes/default/vid.svg diff --git a/src/_h5ai/client/images/themes/default/x.svg b/src/_h5ai/public/images/themes/default/x.svg similarity index 100% rename from src/_h5ai/client/images/themes/default/x.svg rename to src/_h5ai/public/images/themes/default/x.svg diff --git a/src/_h5ai/client/images/ui/back.svg b/src/_h5ai/public/images/ui/back.svg similarity index 100% rename from src/_h5ai/client/images/ui/back.svg rename to src/_h5ai/public/images/ui/back.svg diff --git a/src/_h5ai/client/images/ui/crumb.svg b/src/_h5ai/public/images/ui/crumb.svg similarity index 100% rename from src/_h5ai/client/images/ui/crumb.svg rename to src/_h5ai/public/images/ui/crumb.svg diff --git a/src/_h5ai/client/images/ui/download.svg b/src/_h5ai/public/images/ui/download.svg similarity index 100% rename from src/_h5ai/client/images/ui/download.svg rename to src/_h5ai/public/images/ui/download.svg diff --git a/src/_h5ai/client/images/ui/filter.svg b/src/_h5ai/public/images/ui/filter.svg similarity index 100% rename from src/_h5ai/client/images/ui/filter.svg rename to src/_h5ai/public/images/ui/filter.svg diff --git a/src/_h5ai/client/images/ui/info-toggle.svg b/src/_h5ai/public/images/ui/info-toggle.svg similarity index 100% rename from src/_h5ai/client/images/ui/info-toggle.svg rename to src/_h5ai/public/images/ui/info-toggle.svg diff --git a/src/_h5ai/client/images/ui/paypal.svg b/src/_h5ai/public/images/ui/paypal.svg similarity index 100% rename from src/_h5ai/client/images/ui/paypal.svg rename to src/_h5ai/public/images/ui/paypal.svg diff --git a/src/_h5ai/client/images/ui/preview-close.svg b/src/_h5ai/public/images/ui/preview-close.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-close.svg rename to src/_h5ai/public/images/ui/preview-close.svg diff --git a/src/_h5ai/client/images/ui/preview-fullscreen.svg b/src/_h5ai/public/images/ui/preview-fullscreen.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-fullscreen.svg rename to src/_h5ai/public/images/ui/preview-fullscreen.svg diff --git a/src/_h5ai/client/images/ui/preview-next.svg b/src/_h5ai/public/images/ui/preview-next.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-next.svg rename to src/_h5ai/public/images/ui/preview-next.svg diff --git a/src/_h5ai/client/images/ui/preview-no-fullscreen.svg b/src/_h5ai/public/images/ui/preview-no-fullscreen.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-no-fullscreen.svg rename to src/_h5ai/public/images/ui/preview-no-fullscreen.svg diff --git a/src/_h5ai/client/images/ui/preview-prev.svg b/src/_h5ai/public/images/ui/preview-prev.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-prev.svg rename to src/_h5ai/public/images/ui/preview-prev.svg diff --git a/src/_h5ai/client/images/ui/preview-raw.svg b/src/_h5ai/public/images/ui/preview-raw.svg similarity index 100% rename from src/_h5ai/client/images/ui/preview-raw.svg rename to src/_h5ai/public/images/ui/preview-raw.svg diff --git a/src/_h5ai/client/images/ui/search.svg b/src/_h5ai/public/images/ui/search.svg similarity index 100% rename from src/_h5ai/client/images/ui/search.svg rename to src/_h5ai/public/images/ui/search.svg diff --git a/src/_h5ai/client/images/ui/selected.svg b/src/_h5ai/public/images/ui/selected.svg similarity index 100% rename from src/_h5ai/client/images/ui/selected.svg rename to src/_h5ai/public/images/ui/selected.svg diff --git a/src/_h5ai/client/images/ui/sidebar.svg b/src/_h5ai/public/images/ui/sidebar.svg similarity index 100% rename from src/_h5ai/client/images/ui/sidebar.svg rename to src/_h5ai/public/images/ui/sidebar.svg diff --git a/src/_h5ai/client/images/ui/sort.svg b/src/_h5ai/public/images/ui/sort.svg similarity index 100% rename from src/_h5ai/client/images/ui/sort.svg rename to src/_h5ai/public/images/ui/sort.svg diff --git a/src/_h5ai/client/images/ui/spinner.svg b/src/_h5ai/public/images/ui/spinner.svg similarity index 100% rename from src/_h5ai/client/images/ui/spinner.svg rename to src/_h5ai/public/images/ui/spinner.svg diff --git a/src/_h5ai/client/images/ui/tree-indicator.svg b/src/_h5ai/public/images/ui/tree-indicator.svg similarity index 100% rename from src/_h5ai/client/images/ui/tree-indicator.svg rename to src/_h5ai/public/images/ui/tree-indicator.svg diff --git a/src/_h5ai/client/images/ui/tree-toggle.svg b/src/_h5ai/public/images/ui/tree-toggle.svg similarity index 100% rename from src/_h5ai/client/images/ui/tree-toggle.svg rename to src/_h5ai/public/images/ui/tree-toggle.svg diff --git a/src/_h5ai/client/images/ui/view-details.svg b/src/_h5ai/public/images/ui/view-details.svg similarity index 100% rename from src/_h5ai/client/images/ui/view-details.svg rename to src/_h5ai/public/images/ui/view-details.svg diff --git a/src/_h5ai/client/images/ui/view-grid.svg b/src/_h5ai/public/images/ui/view-grid.svg similarity index 100% rename from src/_h5ai/client/images/ui/view-grid.svg rename to src/_h5ai/public/images/ui/view-grid.svg diff --git a/src/_h5ai/client/images/ui/view-icons.svg b/src/_h5ai/public/images/ui/view-icons.svg similarity index 100% rename from src/_h5ai/client/images/ui/view-icons.svg rename to src/_h5ai/public/images/ui/view-icons.svg diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/public/index.php similarity index 82% rename from src/_h5ai/server/php/index.php rename to src/_h5ai/public/index.php index 31c2257f..5907f1ad 100644 --- a/src/_h5ai/server/php/index.php +++ b/src/_h5ai/public/index.php @@ -8,5 +8,5 @@ if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) { exit; } -require_once __DIR__ . '/inc/class-bootstrap.php'; +require_once __DIR__ . '/../backend/php/class-bootstrap.php'; Bootstrap::main(); diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/public/info.html.jade similarity index 77% rename from src/_h5ai/index.html.jade rename to src/_h5ai/public/info.html.jade index 5d623eba..5076fe48 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/public/info.html.jade @@ -8,11 +8,11 @@ head title #{pkg.name} #{pkg.version} Server Setup meta( name="description", content="#{pkg.name} #{pkg.version} Server Setup" ) meta( name="viewport", content="width=device-width, initial-scale=1" ) - link( rel="shortcut icon", href="client/images/favicon/favicon-16-32.ico" ) - link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/favicon/favicon-152.png" ) + link( rel="shortcut icon", href="images/favicon/favicon-16-32.ico" ) + link( rel="apple-touch-icon-precomposed", type="image/png", href="images/favicon/favicon-152.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Roboto:300,400,700" ) - link( rel="stylesheet", href="client/css/styles.css" ) - script( src="client/js/scripts.js", data-module="info" ) + link( rel="stylesheet", href="css/styles.css" ) + script( src="js/scripts.js", data-module="info" ) body#root.info @@ -36,6 +36,6 @@ body#root.info form( action="https://www.paypal.com/cgi-bin/webscr", method="post", target="_top" ) input( type="hidden", name="cmd", value="_s-xclick" ) input( type="hidden", name="hosted_button_id", value="8WSPKWT7YBTSQ" ) - input( type="image", src="client/images/ui/paypal.svg", width="100px", border="0", name="submit", alt="PayPal - The safer, easier way to pay online!" ) + input( type="image", src="images/ui/paypal.svg", width="100px", border="0", name="submit", alt="PayPal - The safer, easier way to pay online!" ) diff --git a/src/_h5ai/client/js/inc/boot.js b/src/_h5ai/public/js/inc/boot.js similarity index 94% rename from src/_h5ai/client/js/inc/boot.js rename to src/_h5ai/public/js/inc/boot.js index 9b3cbfc5..82b86200 100644 --- a/src/_h5ai/client/js/inc/boot.js +++ b/src/_h5ai/public/js/inc/boot.js @@ -12,7 +12,7 @@ modulejs.define('boot', ['$'], function ($) { href = '.'; } else if (module === 'info') { data.refresh = true; - href = 'server/php/index.php'; + href = 'index.php'; } else { return; } diff --git a/src/_h5ai/client/js/inc/core/event.js b/src/_h5ai/public/js/inc/core/event.js similarity index 100% rename from src/_h5ai/client/js/inc/core/event.js rename to src/_h5ai/public/js/inc/core/event.js diff --git a/src/_h5ai/client/js/inc/core/format.js b/src/_h5ai/public/js/inc/core/format.js similarity index 100% rename from src/_h5ai/client/js/inc/core/format.js rename to src/_h5ai/public/js/inc/core/format.js diff --git a/src/_h5ai/client/js/inc/core/langs.js b/src/_h5ai/public/js/inc/core/langs.js similarity index 100% rename from src/_h5ai/client/js/inc/core/langs.js rename to src/_h5ai/public/js/inc/core/langs.js diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/public/js/inc/core/location.js similarity index 100% rename from src/_h5ai/client/js/inc/core/location.js rename to src/_h5ai/public/js/inc/core/location.js diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/public/js/inc/core/resource.js similarity index 94% rename from src/_h5ai/client/js/inc/core/resource.js rename to src/_h5ai/public/js/inc/core/resource.js index 25d53d60..3e9ed408 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/public/js/inc/core/resource.js @@ -1,6 +1,6 @@ modulejs.define('core/resource', ['_', 'config', 'core/settings'], function (_, config, settings) { - var imagesHref = settings.appHref + 'client/images/'; + var imagesHref = settings.appHref + 'public/images/'; var uiHref = imagesHref + 'ui/'; var themesHref = imagesHref + 'themes/'; var defaultThemeHref = themesHref + 'default/'; diff --git a/src/_h5ai/client/js/inc/core/server.js b/src/_h5ai/public/js/inc/core/server.js similarity index 100% rename from src/_h5ai/client/js/inc/core/server.js rename to src/_h5ai/public/js/inc/core/server.js diff --git a/src/_h5ai/client/js/inc/core/settings.js b/src/_h5ai/public/js/inc/core/settings.js similarity index 100% rename from src/_h5ai/client/js/inc/core/settings.js rename to src/_h5ai/public/js/inc/core/settings.js diff --git a/src/_h5ai/client/js/inc/core/store.js b/src/_h5ai/public/js/inc/core/store.js similarity index 100% rename from src/_h5ai/client/js/inc/core/store.js rename to src/_h5ai/public/js/inc/core/store.js diff --git a/src/_h5ai/client/js/inc/core/types.js b/src/_h5ai/public/js/inc/core/types.js similarity index 100% rename from src/_h5ai/client/js/inc/core/types.js rename to src/_h5ai/public/js/inc/core/types.js diff --git a/src/_h5ai/client/js/inc/core/util.js b/src/_h5ai/public/js/inc/core/util.js similarity index 100% rename from src/_h5ai/client/js/inc/core/util.js rename to src/_h5ai/public/js/inc/core/util.js diff --git a/src/_h5ai/client/js/inc/ext/autorefresh.js b/src/_h5ai/public/js/inc/ext/autorefresh.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/autorefresh.js rename to src/_h5ai/public/js/inc/ext/autorefresh.js diff --git a/src/_h5ai/client/js/inc/ext/contextmenu.js b/src/_h5ai/public/js/inc/ext/contextmenu.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/contextmenu.js rename to src/_h5ai/public/js/inc/ext/contextmenu.js diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/public/js/inc/ext/crumb.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/crumb.js rename to src/_h5ai/public/js/inc/ext/crumb.js diff --git a/src/_h5ai/client/js/inc/ext/custom.js b/src/_h5ai/public/js/inc/ext/custom.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/custom.js rename to src/_h5ai/public/js/inc/ext/custom.js diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/public/js/inc/ext/download.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/download.js rename to src/_h5ai/public/js/inc/ext/download.js diff --git a/src/_h5ai/client/js/inc/ext/filter.js b/src/_h5ai/public/js/inc/ext/filter.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/filter.js rename to src/_h5ai/public/js/inc/ext/filter.js diff --git a/src/_h5ai/client/js/inc/ext/google-analytics.js b/src/_h5ai/public/js/inc/ext/google-analytics.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/google-analytics.js rename to src/_h5ai/public/js/inc/ext/google-analytics.js diff --git a/src/_h5ai/client/js/inc/ext/info.js b/src/_h5ai/public/js/inc/ext/info.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/info.js rename to src/_h5ai/public/js/inc/ext/info.js diff --git a/src/_h5ai/client/js/inc/ext/l10n.js b/src/_h5ai/public/js/inc/ext/l10n.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/l10n.js rename to src/_h5ai/public/js/inc/ext/l10n.js diff --git a/src/_h5ai/client/js/inc/ext/peer5.js b/src/_h5ai/public/js/inc/ext/peer5.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/peer5.js rename to src/_h5ai/public/js/inc/ext/peer5.js diff --git a/src/_h5ai/client/js/inc/ext/piwik-analytics.js b/src/_h5ai/public/js/inc/ext/piwik-analytics.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/piwik-analytics.js rename to src/_h5ai/public/js/inc/ext/piwik-analytics.js diff --git a/src/_h5ai/client/js/inc/ext/preview-aud.js b/src/_h5ai/public/js/inc/ext/preview-aud.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/preview-aud.js rename to src/_h5ai/public/js/inc/ext/preview-aud.js diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/public/js/inc/ext/preview-img.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/preview-img.js rename to src/_h5ai/public/js/inc/ext/preview-img.js diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/public/js/inc/ext/preview-txt.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/preview-txt.js rename to src/_h5ai/public/js/inc/ext/preview-txt.js diff --git a/src/_h5ai/client/js/inc/ext/preview-vid.js b/src/_h5ai/public/js/inc/ext/preview-vid.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/preview-vid.js rename to src/_h5ai/public/js/inc/ext/preview-vid.js diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/public/js/inc/ext/preview.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/preview.js rename to src/_h5ai/public/js/inc/ext/preview.js diff --git a/src/_h5ai/client/js/inc/ext/search.js b/src/_h5ai/public/js/inc/ext/search.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/search.js rename to src/_h5ai/public/js/inc/ext/search.js diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/public/js/inc/ext/select.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/select.js rename to src/_h5ai/public/js/inc/ext/select.js diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/public/js/inc/ext/sort.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/sort.js rename to src/_h5ai/public/js/inc/ext/sort.js diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/public/js/inc/ext/thumbnails.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/thumbnails.js rename to src/_h5ai/public/js/inc/ext/thumbnails.js diff --git a/src/_h5ai/client/js/inc/ext/title.js b/src/_h5ai/public/js/inc/ext/title.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/title.js rename to src/_h5ai/public/js/inc/ext/title.js diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/public/js/inc/ext/tree.js similarity index 100% rename from src/_h5ai/client/js/inc/ext/tree.js rename to src/_h5ai/public/js/inc/ext/tree.js diff --git a/src/_h5ai/client/js/inc/main/index.js b/src/_h5ai/public/js/inc/main/index.js similarity index 100% rename from src/_h5ai/client/js/inc/main/index.js rename to src/_h5ai/public/js/inc/main/index.js diff --git a/src/_h5ai/client/js/inc/main/info.js b/src/_h5ai/public/js/inc/main/info.js similarity index 95% rename from src/_h5ai/client/js/inc/main/info.js rename to src/_h5ai/public/js/inc/main/info.js index 77257722..8deeffc5 100644 --- a/src/_h5ai/client/js/inc/main/info.js +++ b/src/_h5ai/public/js/inc/main/info.js @@ -14,8 +14,8 @@ modulejs.define('main/info', ['$', 'config'], function ($, config) { 'login' + 'logout' + '
' + - 'The preset password is the empty string, so just hit login. ' + - 'You might change it in server/php/config.php to keep this information private.' + + 'The preset password is the empty string, just hit login. ' + + 'Change it in \'_h5ai/conf/passhash.php\'.' + '
' + ''; var setup = config.setup; @@ -109,7 +109,7 @@ modulejs.define('main/info', ['$', 'config'], function ($, config) { function request(data) { $.ajax({ - url: 'server/php/index.php', + url: 'index.php', type: 'post', dataType: 'json', data: data diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/public/js/inc/model/item.js similarity index 100% rename from src/_h5ai/client/js/inc/model/item.js rename to src/_h5ai/public/js/inc/model/item.js diff --git a/src/_h5ai/client/js/inc/view/content.js b/src/_h5ai/public/js/inc/view/content.js similarity index 100% rename from src/_h5ai/client/js/inc/view/content.js rename to src/_h5ai/public/js/inc/view/content.js diff --git a/src/_h5ai/client/js/inc/view/mainrow.js b/src/_h5ai/public/js/inc/view/mainrow.js similarity index 100% rename from src/_h5ai/client/js/inc/view/mainrow.js rename to src/_h5ai/public/js/inc/view/mainrow.js diff --git a/src/_h5ai/client/js/inc/view/notification.js b/src/_h5ai/public/js/inc/view/notification.js similarity index 100% rename from src/_h5ai/client/js/inc/view/notification.js rename to src/_h5ai/public/js/inc/view/notification.js diff --git a/src/_h5ai/client/js/inc/view/root.js b/src/_h5ai/public/js/inc/view/root.js similarity index 100% rename from src/_h5ai/client/js/inc/view/root.js rename to src/_h5ai/public/js/inc/view/root.js diff --git a/src/_h5ai/client/js/inc/view/sidebar.js b/src/_h5ai/public/js/inc/view/sidebar.js similarity index 100% rename from src/_h5ai/client/js/inc/view/sidebar.js rename to src/_h5ai/public/js/inc/view/sidebar.js diff --git a/src/_h5ai/client/js/inc/view/topbar.js b/src/_h5ai/public/js/inc/view/topbar.js similarity index 100% rename from src/_h5ai/client/js/inc/view/topbar.js rename to src/_h5ai/public/js/inc/view/topbar.js diff --git a/src/_h5ai/client/js/inc/view/view.js b/src/_h5ai/public/js/inc/view/view.js similarity index 100% rename from src/_h5ai/client/js/inc/view/view.js rename to src/_h5ai/public/js/inc/view/view.js diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/public/js/inc/view/viewmode.js similarity index 100% rename from src/_h5ai/client/js/inc/view/viewmode.js rename to src/_h5ai/public/js/inc/view/viewmode.js diff --git a/src/_h5ai/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/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/client/js/scripts.js b/src/_h5ai/public/js/scripts.js similarity index 100% rename from src/_h5ai/client/js/scripts.js rename to src/_h5ai/public/js/scripts.js diff --git a/test/tests/unit/boot.js b/test/tests/unit/boot.js index dbf68e48..f6fc8d00 100644 --- a/test/tests/unit/boot.js +++ b/test/tests/unit/boot.js @@ -111,7 +111,7 @@ describe('module \'' + ID + '\'', function () { this.applyFn(); assert.isTrue(this.xAjax.calledOnce); - assert.strictEqual(this.xAjax.lastCall.args[0].url, 'server/php/index.php'); + assert.strictEqual(this.xAjax.lastCall.args[0].url, 'index.php'); assert.strictEqual(this.xAjax.lastCall.args[0].type, 'post'); assert.strictEqual(this.xAjax.lastCall.args[0].dataType, 'json'); diff --git a/test/tests/unit/core/resource.js b/test/tests/unit/core/resource.js index 97f40308..4942245c 100644 --- a/test/tests/unit/core/resource.js +++ b/test/tests/unit/core/resource.js @@ -77,7 +77,7 @@ describe('module \'' + ID + '\'', function () { it('works', function () { var instance = this.applyFn(); - var ui = this.xSettings.appHref + 'client/images/ui/'; + var ui = this.xSettings.appHref + 'public/images/ui/'; assert.strictEqual(instance.image(), ui + 'undefined.svg'); assert.strictEqual(instance.image(1), ui + '1.svg'); @@ -97,7 +97,7 @@ describe('module \'' + ID + '\'', function () { it('works', function () { var instance = this.applyFn(); - var themes = this.xSettings.appHref + 'client/images/themes/'; + var themes = this.xSettings.appHref + 'public/images/themes/'; assert.strictEqual(instance.icon(''), themes + 'default/file.svg'); assert.strictEqual(instance.icon('a'), themes + 'myTheme/a.svg'); diff --git a/test/tests/unit/main/info.js b/test/tests/unit/main/info.js index c21d2dcf..bedcbfab 100644 --- a/test/tests/unit/main/info.js +++ b/test/tests/unit/main/info.js @@ -138,7 +138,7 @@ describe('module \'' + ID + '\'', function () { $('#login').trigger('click'); assert.isTrue(this.xAjax.calledOnce); assert.deepEqual(this.xAjax.lastCall.args, [{ - url: 'server/php/index.php', + url: 'index.php', type: 'post', dataType: 'json', data: { @@ -193,7 +193,7 @@ describe('module \'' + ID + '\'', function () { $('#logout').trigger('click'); assert.isTrue(this.xAjax.calledOnce); assert.deepEqual(this.xAjax.lastCall.args, [{ - url: 'server/php/index.php', + url: 'index.php', type: 'post', dataType: 'json', data: {