diff --git a/makefile.js b/makefile.js index 56ff53a9..cdf8db55 100644 --- a/makefile.js +++ b/makefile.js @@ -36,7 +36,7 @@ var version = '0.22-dev-8', mapper = function (blob) { - return blob.source.replace(src, build).replace(/\.less$/, '.css'); + return blob.source.replace(src, build).replace(/\.less$/, '.css').replace(/\.jade$/, '.html'); }, mapperRoot = function (blob) { @@ -118,7 +118,13 @@ module.exports = function (make) { .cssmin() .write($.OVERWRITE, mapper); - $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**') + $(src + ': **/*.jade') + .modified(mapper) + .handlebars(replacements) + .jade() + .write($.OVERWRITE, mapper); + + $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade') .modified(mapper) .handlebars(replacements) .write($.OVERWRITE, mapper); @@ -144,7 +150,13 @@ module.exports = function (make) { // .cssmin() .write($.OVERWRITE, mapper); - $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**') + $(src + ': **/*.jade') + .modified(mapper) + .handlebars(replacements) + .jade() + .write($.OVERWRITE, mapper); + + $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade') .modified(mapper) .handlebars(replacements) .write($.OVERWRITE, mapper); diff --git a/src/_h5ai/apache/h5ai-header.html b/src/_h5ai/apache/h5ai-header.html index 6d37b825..10dc236c 100644 --- a/src/_h5ai/apache/h5ai-header.html +++ b/src/_h5ai/apache/h5ai-header.html @@ -1,7 +1,5 @@ - - - + diff --git a/src/_h5ai/config.js b/src/_h5ai/config.js index 9020bb90..ad119a29 100644 --- a/src/_h5ai/config.js +++ b/src/_h5ai/config.js @@ -282,7 +282,7 @@ var H5AI_CONFIG = { /* Requires PHP on the server. Show thumbnails for image files. Needs the "/_h5ai/cache" folder to be - writable for the Apache Server. + writable for the web Server. - img thumbnails depend on PHP-GD - mov thumbnails depend on ffmpeg - doc thumbnails depend on convert diff --git a/src/_h5ai/config.php b/src/_h5ai/config.php index 9670f96c..8292961d 100644 --- a/src/_h5ai/config.php +++ b/src/_h5ai/config.php @@ -12,7 +12,7 @@ $H5AI_CONFIG = array( /* * This configuration assumes that h5ai is installed - * in the webroot directory of the Apache server. + * in the webroot directory of the web server. */ "ROOT_ABS_PATH" => dirname(dirname(__FILE__)), diff --git a/src/_h5ai/css/inc/h5ai-info.less b/src/_h5ai/css/inc/h5ai-info.less index c1ad76ed..c8bac7cd 100644 --- a/src/_h5ai/css/inc/h5ai-info.less +++ b/src/_h5ai/css/inc/h5ai-info.less @@ -66,7 +66,7 @@ body#h5ai-info { margin: 4px 0 12px 12px; font-size: 0.7em; color: #aaa; - width: 300px; + width: 310px; line-height: 1.2em; } } diff --git a/src/_h5ai/index.html b/src/_h5ai/index.html deleted file mode 100644 index e39f567e..00000000 --- a/src/_h5ai/index.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - h5ai {{version}} server details - - - - - - - - - -

h5ai

- version {{version}} - {{stamp}} -

server supports

- -
- - h5ai {{version}} - ⚡ JavaScript is disabled! ⚡ - ⚡ Some features disabled! Works best in modern browsers. ⚡ - - - -
- - - - \ No newline at end of file diff --git a/src/_h5ai/index.jade b/src/_h5ai/index.jade new file mode 100644 index 00000000..07e6a1bb --- /dev/null +++ b/src/_h5ai/index.jade @@ -0,0 +1,81 @@ +doctype 5 +//if lt IE 9 + +//[if gt IE 8]>= 5.2.1 + li.test( data-id="cache" ) + span.test-label cache + span.test-result ? + div.test-info _h5ai/cache writable for the server + li.test( data-id="thumbs" ) + span.test-label image thumbs + span.test-result ? + div.test-info PHP GD extension with JPEG support available + li.test( data-id="ffmpeg" ) + span.test-label movie thumbs + span.test-result ? + div.test-info ffmpeg executable in a shell + li.test( data-id="convert" ) + span.test-label pdf thumbs + span.test-result ? + div.test-info convert executable in a shell + li.test( data-id="temp" ) + span.test-label temp directory + span.test-result ? + div.test-info temporary directory writable for the server + li.test( data-id="archive" ) + span.test-label php tar and zip + span.test-result ? + div.test-info PHP Phar extension available + li.test( data-id="tar" ) + span.test-label shell tar + span.test-result ? + div.test-info tar executable in a shell + li.test( data-id="zip" ) + span.test-label shell zip + span.test-result ? + div.test-info zip executable in a shell + li.test( data-id="du" ) + span.test-label folder size + span.test-result ? + div.test-info du executable in a shell + + div#bottombar.clearfix + span.left + a#h5ai-reference( href="http://larsjung.de/h5ai", title="h5ai project page" ) h5ai {{version}} + span.hideOnJs.noJsMsg ⚡ JavaScript is disabled! ⚡ + span.oldBrowser + | ⚡ Some features disabled! Works best in + a( href="http://browsehappy.com" ) modern browsers + | . ⚡ + span.right + span.center + + script( src="/_h5ai/config.js" ) + script( src="/_h5ai/js/scripts.js" ) diff --git a/src/_h5ai/php/h5ai-index.php b/src/_h5ai/php/h5ai-index.php index 75303370..856c0f98 100644 --- a/src/_h5ai/php/h5ai-index.php +++ b/src/_h5ai/php/h5ai-index.php @@ -1,8 +1,6 @@ - - - +