Reorganize file structure.

README.md

@@ -15,7 +15,7 @@ install instructions on the [project page][web].
 In short you have to take the following two steps:
 
 * place folder `_h5ai` in the document root folder of the web server
-* append `/_h5ai/public/index.php` to the end of the default index-file list
+* append `/_h5ai/index.php` to the end of the default index-file list
 
 
 ## Build

mkrfile.js

@@ -60,7 +60,7 @@ module.exports = function (suite) {
         var fs = require('fs');
         var jshint = JSON.parse(fs.readFileSync('.jshintrc', 'utf8'));
 
-        $(src + '/_h5ai/public/js: **/*.js, ! lib/**')
+        $(src + '/_h5ai/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/public/js/*.js')
+        $(src + ': _h5ai/js/*.js')
-            .newerThan(mapSrc, $(src + ': _h5ai/public/js/**'))
+            .newerThan(mapSrc, $(src + ': _h5ai/js/**'))
             .includeit()
             .if(!suite.args.uncompressed, function () { this.uglifyjs(); })
             .wrap(header)
             .write(mapSrc, true);
 
-        $(src + ': _h5ai/public/css/*.less')
+        $(src + ': _h5ai/css/*.less')
-            .newerThan(mapSrc, $(src + ': _h5ai/public/css/**'))
+            .newerThan(mapSrc, $(src + ': _h5ai/css/**'))
             .includeit()
             .less()
             .autoprefixer()
@@ -93,7 +93,7 @@ module.exports = function (suite) {
             .jade(env)
             .write(mapSrc, true);
 
-        $(src + ': **, ! _h5ai/public/js/**, ! _h5ai/public/css/**, ! **/*.jade')
+        $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade')
             .newerThan(mapSrc)
             .handlebars(env)
             .write(mapSrc, true);
@@ -135,13 +135,13 @@ module.exports = function (suite) {
 
         var env = {pkg: pkg};
 
-        $(src + '/_h5ai/public/css/styles.less')
+        $(src + '/_h5ai/css/styles.less')
             .includeit()
             .less()
             .autoprefixer()
             .write(build + '/test/h5ai-styles.css', true);
 
-        $(src + '/_h5ai/public/js/scripts.js')
+        $(src + '/_h5ai/js/scripts.js')
             .includeit()
             .write(build + '/test/h5ai-scripts.js', true);
 

src/_h5ai/.htaccess

@@ -1,3 +1,27 @@
 Satisfy all
-Order deny,allow
+Order allow,deny
-Deny from all
+Allow from all
+
+DirectoryIndex disabled
+
+<IfModule mod_autoindex.c>
+    Options -Indexes
+</IfModule>
+
+AddDefaultCharset utf-8
+
+<IfModule mod_mime.c>
+    AddCharset utf-8 .css .html .js .json .php .svg
+</IfModule>
+
+<IfModule mod_expires.c>
+    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"
+</IfModule>

src/_h5ai/index.php

@@ -4,9 +4,9 @@ define('MIN_PHP_VERSION', '5.4.0');
 
 if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) {
     header('Content-type: text/plain;charset=utf-8');
-    echo '[err]  {{pkg.name}} requires PHP ' . MIN_PHP_VERSION . ' or later, but found PHP ' . PHP_VERSION;
+    echo '[err]  h5ai requires PHP ' . MIN_PHP_VERSION . ' or later, but found PHP ' . PHP_VERSION;
     exit;
 }
 
-require_once __DIR__ . '/../backend/php/class-bootstrap.php';
+require_once __DIR__ . '/private/php/class-bootstrap.php';
 Bootstrap::run();