From 0a280e177b976dd3dcb9ee1f69bf7d6a2c884b26 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 22 Sep 2012 13:40:04 +0200 Subject: [PATCH] Combines scripts in head section. Shouldn't matter that much. --- src/_h5ai/apache/h5ai-header.html.jade | 4 +--- src/_h5ai/index.html.jade | 4 +--- src/_h5ai/js/modernizr.js | 2 -- src/_h5ai/js/scripts.js | 1 + src/_h5ai/php/h5ai-index.php.jade | 4 +--- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 src/_h5ai/js/modernizr.js diff --git a/src/_h5ai/apache/h5ai-header.html.jade b/src/_h5ai/apache/h5ai-header.html.jade index 9649e812..dc38780e 100644 --- a/src/_h5ai/apache/h5ai-header.html.jade +++ b/src/_h5ai/apache/h5ai-header.html.jade @@ -18,7 +18,7 @@ head link( rel="apple-touch-icon", type="image/png", href!="#{h5ai}images/h5ai-48x48.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href!="#{h5ai}css/styles.css" ) - script( src!="#{h5ai}js/modernizr.js" ) + script( src!="#{h5ai}js/scripts.js" ) | @@ -39,7 +39,5 @@ div#bottombar.clearfix span.right span.center - script( src!="#{h5ai}js/scripts.js" ) - |
// The following code was generated by Apache's autoindex module. It is not valid HTML5, but gets removed from the DOM tree as soon as possible. The actual page should render as valid HTML5. diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index b283c2e0..c7ce56d0 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -15,7 +15,7 @@ html.no-js( lang="en" ) link( rel="apple-touch-icon", type="image/png", href="images/h5ai-48x48.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href="css/styles.css" ) - script( src="js/modernizr.js" ) + script( src="js/scripts.js" ) body#h5ai-info @@ -76,5 +76,3 @@ html.no-js( lang="en" ) | . ⚡ span.right span.center - - script( src="js/scripts.js" ) diff --git a/src/_h5ai/js/modernizr.js b/src/_h5ai/js/modernizr.js deleted file mode 100644 index 4db8d9a1..00000000 --- a/src/_h5ai/js/modernizr.js +++ /dev/null @@ -1,2 +0,0 @@ - -// @include "lib/modernizr-*.js" diff --git a/src/_h5ai/js/scripts.js b/src/_h5ai/js/scripts.js index ce8afac7..c5597a88 100644 --- a/src/_h5ai/js/scripts.js +++ b/src/_h5ai/js/scripts.js @@ -6,6 +6,7 @@ // other libs // ---------- +// @include "lib/modernizr-*.js" // @include "lib/underscore-*.js" // @include "lib/amplify-*.min.js" // @include "lib/modulejs-*.js" diff --git a/src/_h5ai/php/h5ai-index.php.jade b/src/_h5ai/php/h5ai-index.php.jade index 5f4f89a8..2e3fc55d 100644 --- a/src/_h5ai/php/h5ai-index.php.jade +++ b/src/_h5ai/php/h5ai-index.php.jade @@ -38,7 +38,7 @@ html.no-js( lang="en" ) link( rel="apple-touch-icon", type="image/png", href!="#{h5ai}images/h5ai-48x48.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href!="#{h5ai}css/styles.css" ) - script( src!="#{h5ai}js/modernizr.js" ) + script( src!="#{h5ai}js/scripts.js", data-config!="#{config}" ) body#h5ai-main @@ -62,5 +62,3 @@ html.no-js( lang="en" ) div#data-generic-json.hidden !{json} div#data-php-no-js-fallback.hideOnJs !{fallback} - - script( src!="#{h5ai}js/scripts.js", data-config!="#{config}" )