diff --git a/package.json b/package.json index b8b27151..378f8ec0 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "description": "a modern HTTP web server index", "url": "http://larsjung.de/h5ai/", "author": "Lars Jung", - "twitter": "lrsjng", "license": "MIT", "repository": { "type": "git", diff --git a/src/_h5ai/client/images/ascending.svg b/src/_h5ai/client/images/ascending.svg index 472e31b6..eaae6376 100644 --- a/src/_h5ai/client/images/ascending.svg +++ b/src/_h5ai/client/images/ascending.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/crumb.svg b/src/_h5ai/client/images/crumb.svg index 662db546..a6cdabde 100644 --- a/src/_h5ai/client/images/crumb.svg +++ b/src/_h5ai/client/images/crumb.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/descending.svg b/src/_h5ai/client/images/descending.svg index c99a358f..d4dbbda2 100644 --- a/src/_h5ai/client/images/descending.svg +++ b/src/_h5ai/client/images/descending.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/download.svg b/src/_h5ai/client/images/download.svg index 0db1eaac..ce60b12d 100644 --- a/src/_h5ai/client/images/download.svg +++ b/src/_h5ai/client/images/download.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/fallback/ar.svg b/src/_h5ai/client/images/fallback/ar.svg index 58fc6b2c..1e1d262b 100644 --- a/src/_h5ai/client/images/fallback/ar.svg +++ b/src/_h5ai/client/images/fallback/ar.svg @@ -8,6 +8,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="96" width="96" + viewBox="0 0 96 96" version="1.1"> - + diff --git a/src/_h5ai/client/images/folder-open.svg b/src/_h5ai/client/images/folder-open.svg index 482e6d6b..136c3ebd 100644 --- a/src/_h5ai/client/images/folder-open.svg +++ b/src/_h5ai/client/images/folder-open.svg @@ -10,8 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg7384" - height="16" - width="16" + height="16" width="16" viewBox="0 0 16 16" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="folder-open.svg"> diff --git a/src/_h5ai/client/images/folder-page.svg b/src/_h5ai/client/images/folder-page.svg index c5c41777..76fc109b 100644 --- a/src/_h5ai/client/images/folder-page.svg +++ b/src/_h5ai/client/images/folder-page.svg @@ -10,8 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg7384" - height="16" - width="16" + height="16" width="16" viewBox="0 0 16 16" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="folder-page.svg"> diff --git a/src/_h5ai/client/images/folder.svg b/src/_h5ai/client/images/folder.svg index f9f62db9..bb2d14fa 100644 --- a/src/_h5ai/client/images/folder.svg +++ b/src/_h5ai/client/images/folder.svg @@ -10,8 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg7384" - height="16" - width="16" + height="16" width="16" viewBox="0 0 16 16" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="folder.svg"> diff --git a/src/_h5ai/client/images/home.svg b/src/_h5ai/client/images/home.svg index 0ef4276a..55963b7f 100644 --- a/src/_h5ai/client/images/home.svg +++ b/src/_h5ai/client/images/home.svg @@ -10,8 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg7384" - height="16" - width="16" + height="16" width="16" viewBox="0 0 16 16" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="home.svg"> diff --git a/src/_h5ai/client/images/loading.svg b/src/_h5ai/client/images/loading.svg index 50f18365..c8b53b38 100644 --- a/src/_h5ai/client/images/loading.svg +++ b/src/_h5ai/client/images/loading.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/page.svg b/src/_h5ai/client/images/page.svg index 202a9dd7..bfabda4d 100644 --- a/src/_h5ai/client/images/page.svg +++ b/src/_h5ai/client/images/page.svg @@ -4,8 +4,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="12" - width="12" + height="12" width="12" viewBox="0 0 12 12" version="1.1"> - + Gnome Symbolic Icon Theme diff --git a/src/_h5ai/client/images/preview/fullscreen.svg b/src/_h5ai/client/images/preview/fullscreen.svg index 539c3f5e..1b03868c 100644 --- a/src/_h5ai/client/images/preview/fullscreen.svg +++ b/src/_h5ai/client/images/preview/fullscreen.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/preview/next.svg b/src/_h5ai/client/images/preview/next.svg index cb16e28f..1ad024fb 100644 --- a/src/_h5ai/client/images/preview/next.svg +++ b/src/_h5ai/client/images/preview/next.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/preview/no-fullscreen.svg b/src/_h5ai/client/images/preview/no-fullscreen.svg index 03b7e73d..d45e5e17 100644 --- a/src/_h5ai/client/images/preview/no-fullscreen.svg +++ b/src/_h5ai/client/images/preview/no-fullscreen.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/preview/prev.svg b/src/_h5ai/client/images/preview/prev.svg index 9d982b94..684268a8 100644 --- a/src/_h5ai/client/images/preview/prev.svg +++ b/src/_h5ai/client/images/preview/prev.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/preview/raw.svg b/src/_h5ai/client/images/preview/raw.svg index 22d5be55..ebaf9431 100644 --- a/src/_h5ai/client/images/preview/raw.svg +++ b/src/_h5ai/client/images/preview/raw.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/selected.svg b/src/_h5ai/client/images/selected.svg index 84a8c603..34a4c9b5 100644 --- a/src/_h5ai/client/images/selected.svg +++ b/src/_h5ai/client/images/selected.svg @@ -8,8 +8,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - height="16" - width="16" + height="16" width="16" viewBox="0 0 16 16" id="svg2" inkscape:version="0.48.4 r9939" sodipodi:docname="select.svg"> diff --git a/src/_h5ai/client/images/settings.svg b/src/_h5ai/client/images/settings.svg index f606f30c..cbdeb2a9 100644 --- a/src/_h5ai/client/images/settings.svg +++ b/src/_h5ai/client/images/settings.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/size.svg b/src/_h5ai/client/images/size.svg index 4d2b849b..650588b6 100644 --- a/src/_h5ai/client/images/size.svg +++ b/src/_h5ai/client/images/size.svg @@ -10,11 +10,10 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="size.svg" - height="16" + height="16" width="16" viewBox="0 0 16 16" id="svg7384" inkscape:version="0.48.4 r9939" - version="1.1" - width="16"> + version="1.1"> diff --git a/src/_h5ai/client/images/tree.svg b/src/_h5ai/client/images/tree.svg index 662db546..a6cdabde 100644 --- a/src/_h5ai/client/images/tree.svg +++ b/src/_h5ai/client/images/tree.svg @@ -1,6 +1,6 @@ - + diff --git a/src/_h5ai/client/images/view-details.svg b/src/_h5ai/client/images/view-details.svg index bd48a609..902c08eb 100644 --- a/src/_h5ai/client/images/view-details.svg +++ b/src/_h5ai/client/images/view-details.svg @@ -5,6 +5,7 @@ version="1.1" width="16" height="16" + viewBox="0 0 16 16" > diff --git a/src/_h5ai/client/images/view-grid.svg b/src/_h5ai/client/images/view-grid.svg index 0e5c11be..f3594479 100644 --- a/src/_h5ai/client/images/view-grid.svg +++ b/src/_h5ai/client/images/view-grid.svg @@ -5,6 +5,7 @@ version="1.1" width="16" height="16" + viewBox="0 0 16 16" > diff --git a/src/_h5ai/client/images/view-icons.svg b/src/_h5ai/client/images/view-icons.svg index dbea6106..ec0a71f9 100644 --- a/src/_h5ai/client/images/view-icons.svg +++ b/src/_h5ai/client/images/view-icons.svg @@ -5,6 +5,7 @@ version="1.1" width="16" height="16" + viewBox="0 0 16 16" > diff --git a/src/_h5ai/client/js/inc/main.js b/src/_h5ai/client/js/inc/main.js index f9513298..c8521a76 100644 --- a/src/_h5ai/client/js/inc/main.js +++ b/src/_h5ai/client/js/inc/main.js @@ -1,6 +1,7 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { + modulejs.require('view/ensure'); modulejs.require('view/items'); modulejs.require('view/spacing'); modulejs.require('view/viewmode'); diff --git a/src/_h5ai/client/js/inc/view/ensure.js b/src/_h5ai/client/js/inc/view/ensure.js new file mode 100644 index 00000000..7b83416a --- /dev/null +++ b/src/_h5ai/client/js/inc/view/ensure.js @@ -0,0 +1,44 @@ + +modulejs.define('view/ensure', ['$', 'core/event'], function ($, event) { + + var selb = '#bottombar', + selr = selb + ' .right', + sela = selr + ' a', + sequence = 'powered by h5ai', + url = 'http://larsjung.de/h5ai/', + isVisible = ':visible', + styleKey = 'style', + styleVal = 'display: inline !important', + + ensure = function () { + + if ( + $(selr).filter(isVisible).length != 1 || + $(sela).filter(isVisible).length != 1 || + $(selr).text() != sequence + ) { + $(selr).remove(); + $('') + .addClass('right') + .attr(styleKey, styleVal) + .find('a') + .attr('href', url) + .attr('title', sequence) + .text(sequence) + .attr(styleKey, styleVal) + .end() + .prependTo(selb); + } + }, + + init = function () { + + event.sub('ready', function () { + + ensure(); + setInterval(ensure, 60000); + }); + }; + + init(); +}); diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index aeca11cb..b8ea3863 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -38,9 +38,5 @@ html.no-js.browser( lang="en" ) | ! ⚡ span.right a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" ) - | {{pkg.name}} - span - | by - a( href="https://twitter.com/{{pkg.twitter}}", title="{{pkg.author}}" ) - | @{{pkg.twitter}} + | powered by h5ai span.center diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index 9128fff2..77330679 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -35,11 +35,7 @@ html.no-js.browser( lang="en" ) | ! ⚡ span.right a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" ) - | {{pkg.name}} - span - | by - a( href="https://twitter.com/{{pkg.twitter}}", title="{{pkg.author}}" ) - | @{{pkg.twitter}} + | powered by h5ai span.center div#sidebar