diff --git a/src/_h5ai/client/images/favicon/app.svg b/src/_h5ai/client/images/favicon/app.svg
deleted file mode 100644
index a2faca00..00000000
--- a/src/_h5ai/client/images/favicon/app.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
diff --git a/src/_h5ai/client/images/favicon/app-152.png b/src/_h5ai/client/images/favicon/favicon-152.png
similarity index 100%
rename from src/_h5ai/client/images/favicon/app-152.png
rename to src/_h5ai/client/images/favicon/favicon-152.png
diff --git a/src/_h5ai/client/images/favicon/app-16-32.ico b/src/_h5ai/client/images/favicon/favicon-16-32.ico
similarity index 100%
rename from src/_h5ai/client/images/favicon/app-16-32.ico
rename to src/_h5ai/client/images/favicon/favicon-16-32.ico
diff --git a/src/_h5ai/client/js/inc/info.js b/src/_h5ai/client/js/inc/info.js
index 5d033b32..e1c4d0fb 100644
--- a/src/_h5ai/client/js/inc/info.js
+++ b/src/_h5ai/client/js/inc/info.js
@@ -1,44 +1,90 @@
modulejs.define('info', ['$', 'config'], function ($, config) {
- var map = function (setup) {
+ var template = '' +
+ '' +
+ '' +
+ '' +
+ '',
- return {
- 'php_version': setup.HAS_PHP_VERSION,
- 'cache_dir': setup.HAS_WRITABLE_CACHE,
- 'image_thumbs': setup.HAS_PHP_JPG,
- 'exif_thumbs': setup.HAS_PHP_EXIF,
- 'movie_thumbs': setup.HAS_CMD_FFMPEG || setup.HAS_CMD_AVCONV,
- 'pdf_thumbs': setup.HAS_CMD_CONVERT,
- 'shell_tar': setup.HAS_CMD_TAR,
- 'shell_zip': setup.HAS_CMD_ZIP,
- 'folder_sizes': setup.HAS_CMD_DU
- };
- },
+ $tests = $('#tests'),
- setValue = function (el, result) {
+ addTestResult = function (label, info, passed, result) {
- var $result = $(el).find('.result');
-
- if (result) {
- $result.addClass('passed').text('yes');
- } else {
- $result.addClass('failed').text('no');
- }
+ $(template)
+ .find('.label')
+ .text(label)
+ .end()
+ .find('.result')
+ .addClass(passed ? 'passed' : 'failed')
+ .text(result ? result : (passed ? 'yes' : 'no'))
+ .end()
+ .find('.info')
+ .html(info)
+ .end()
+ .appendTo($tests);
},
init = function () {
- var setup = config.setup,
- values = map(setup);
-
- $('.test').each(function () {
-
- setValue(this, values[$(this).data('id')]);
- });
+ var setup = config.setup;
$('.idx-file .value').text(setup.INDEX_HREF);
- $('.test.php .result').text(setup.PHP_VERSION);
+
+ addTestResult(
+ 'PHP version',
+ 'PHP version >= 5.3.0',
+ setup.HAS_PHP_VERSION,
+ setup.PHP_VERSION
+ );
+
+ addTestResult(
+ 'Cache directory',
+ 'Web server has write access',
+ setup.HAS_WRITABLE_CACHE
+ );
+
+ addTestResult(
+ 'Image thumbs',
+ 'PHP GD extension with JPEG support available',
+ setup.HAS_PHP_JPG
+ );
+
+ addTestResult(
+ 'Use EXIF thumbs',
+ 'PHP EXIF extension available',
+ setup.HAS_PHP_EXIF
+ );
+
+ addTestResult(
+ 'Movie thumbs',
+ 'Command line program ffmpeg or avconv available',
+ setup.HAS_CMD_FFMPEG || setup.HAS_CMD_AVCONV
+ );
+
+ addTestResult(
+ 'PDF thumbs',
+ 'Command line program convert available',
+ setup.HAS_CMD_CONVERT
+ );
+
+ addTestResult(
+ 'Shell tar',
+ 'Command line program tar available',
+ setup.HAS_CMD_TAR
+ );
+
+ addTestResult(
+ 'Shell zip',
+ 'Command line program zip available',
+ setup.HAS_CMD_ZIP
+ );
+
+ addTestResult(
+ 'Folder sizes',
+ 'Command line program du available',
+ setup.HAS_CMD_DU
+ );
};
init();
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index e9cdc8f4..235d3c30 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -9,10 +9,10 @@ html.no-js.browser( lang="en" )
meta( charset="utf-8" )
meta( http-equiv="X-UA-Compatible", content="IE=edge" )
title {{pkg.name}} {{pkg.version}} Server Setup
- meta( name="description", content="{{pkg.name}} server details" )
+ meta( name="description", content="{{pkg.name}} Server Setup" )
meta( name="viewport", content="width=device-width, initial-scale=1" )
- link( rel="shortcut icon", href="client/images/favicon/app-16-32.ico" )
- link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/favicon/app-152.png" )
+ 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="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" )
link( rel="stylesheet", href="client/css/styles.css" )
script( src="client/js/scripts.js", data-mode="info" )
@@ -28,59 +28,6 @@ html.no-js.browser( lang="en" )
h2 Server Setup
ul#tests
- li.test.php( data-id="php_version" )
- span.label PHP version
- span.result ?
- div.info PHP version >= 5.3.0
- li.test( data-id="cache_dir" )
- span.label Cache directory
- span.result ?
- div.info Web server has write access
- li.test( data-id="image_thumbs" )
- span.label Image thumbs
- span.result ?
- div.info PHP GD extension with JPEG support available
- li.test( data-id="exif_thumbs" )
- span.label Use EXIF thumbs
- span.result ?
- div.info PHP EXIF extension available
- li.test( data-id="movie_thumbs" )
- span.label Movie thumbs
- span.result ?
- div.info
- | Command line program
- code ffmpeg
- | or
- code avconv
- | available
- li.test( data-id="pdf_thumbs" )
- span.label PDF thumbs
- span.result ?
- div.info
- | Command line program
- code convert
- | available
- li.test( data-id="shell_tar" )
- span.label Shell tar
- span.result ?
- div.info
- | Command line program
- code tar
- | available
- li.test( data-id="shell_zip" )
- span.label Shell zip
- span.result ?
- div.info
- | Command line program
- code zip
- | available
- li.test( data-id="folder_sizes" )
- span.label Folder sizes
- span.result ?
- div.info
- | Command line program
- code du
- | available
div#bottombar.clearfix
span.left
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index 2c794956..edaf03c6 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -15,8 +15,8 @@ html.no-js.browser( lang="en" )
title index ยท styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})
meta( name="description", content="index styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
meta( name="viewport", content="width=device-width, initial-scale=1" )
- link( rel="shortcut icon", href!="#{app_href}client/images/favicon/app-16-32.ico" )
- link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/app-152.png" )
+ 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="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" )
link( rel="stylesheet", href!="#{app_href}client/css/styles.css" )
script( src!="#{app_href}client/js/scripts.js" )