diff --git a/src/_h5ai/backend/php/class-bootstrap.php b/src/_h5ai/backend/php/class-bootstrap.php index d534d22b..2bb458be 100644 --- a/src/_h5ai/backend/php/class-bootstrap.php +++ b/src/_h5ai/backend/php/class-bootstrap.php @@ -20,11 +20,11 @@ class Bootstrap { if ($context->is_api_request()) { (new Api($context))->apply(); } else if ($context->is_info_request()) { - define('PUBLIC_HREF', $setup->get('PUBLIC_HREF')); + $public_href = $setup->get('PUBLIC_HREF'); require __DIR__ . '/pages/info.php'; } else { - define('PUBLIC_HREF', $setup->get('PUBLIC_HREF')); - define('FALLBACK', (new Fallback($context))->get_html()); + $public_href = $setup->get('PUBLIC_HREF'); + $fallback_html = (new Fallback($context))->get_html(); require __DIR__ . '/pages/index.php'; } } diff --git a/src/_h5ai/backend/php/pages/index.php.jade b/src/_h5ai/backend/php/pages/index.php.jade index 377ca51a..6c89cc6b 100644 --- a/src/_h5ai/backend/php/pages/index.php.jade +++ b/src/_h5ai/backend/php/pages/index.php.jade @@ -2,9 +2,9 @@ extends ./page.tpl.jade block init - - var TITLE = 'index - powered by ' + pkg.name + ' v' + pkg.version + ' (' + pkg.homepage + ')' - - var MODULE = 'index' + - var title = 'index - powered by ' + pkg.name + ' v' + pkg.version + ' (' + pkg.homepage + ')' + - var module = 'index' block body - div#fallback + div#fallback diff --git a/src/_h5ai/backend/php/pages/info.php.jade b/src/_h5ai/backend/php/pages/info.php.jade index d4700c3b..0aa5723b 100644 --- a/src/_h5ai/backend/php/pages/info.php.jade +++ b/src/_h5ai/backend/php/pages/info.php.jade @@ -2,8 +2,8 @@ extends ./page.tpl.jade block init - - var TITLE = pkg.name + ' info page - v' + pkg.version - - var MODULE = 'info' + - var title = pkg.name + ' info page - v' + pkg.version + - var module = 'info' block body @@ -17,4 +17,4 @@ block body form( action="https://www.paypal.com/cgi-bin/webscr", method="post", target="_blank" ) input( type="hidden", name="cmd", value="_s-xclick" ) input( type="hidden", name="hosted_button_id", value="8WSPKWT7YBTSQ" ) - input( type="image", src!="#{PUBLIC_HREF}images/ui/paypal.svg", name="submit", alt="PayPal" ) + input( type="image", src!="#{public_href}images/ui/paypal.svg", name="submit", alt="PayPal" ) diff --git a/src/_h5ai/backend/php/pages/page.tpl.jade b/src/_h5ai/backend/php/pages/page.tpl.jade index 61048971..d11b1692 100644 --- a/src/_h5ai/backend/php/pages/page.tpl.jade +++ b/src/_h5ai/backend/php/pages/page.tpl.jade @@ -1,4 +1,4 @@ -- var PUBLIC_HREF = '' +- var public_href = '' block init @@ -10,16 +10,16 @@ doctype html head meta( charset="utf-8" ) meta( http-equiv="x-ua-compatible", content="ie=edge" ) - title #{TITLE} - meta( name="description", content="#{TITLE}" ) + title #{title} + meta( name="description", content="#{title}" ) meta( name="viewport", content="width=device-width, initial-scale=1" ) - link( rel="shortcut icon", href!="#{PUBLIC_HREF}images/favicon/favicon-16-32.ico" ) - link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{PUBLIC_HREF}images/favicon/favicon-152.png" ) + link( rel="shortcut icon", href!="#{public_href}images/favicon/favicon-16-32.ico" ) + link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{public_href}images/favicon/favicon-152.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Roboto:300,400,700" ) - link( rel="stylesheet", href!="#{PUBLIC_HREF}css/styles.css" ) - script( src!="#{PUBLIC_HREF}js/scripts.js", data-module="#{MODULE}" ) + link( rel="stylesheet", href!="#{public_href}css/styles.css" ) + script( src!="#{public_href}js/scripts.js", data-module="#{module}" ) -body#root( class="#{MODULE}" ) +body#root( class="#{module}" ) div#fallback-hints span.noJsMsg