From d78edefb0a1416c962e7d98dd677f4bce6328683 Mon Sep 17 00:00:00 2001 From: jackspirou Date: Mon, 11 Jan 2016 12:42:31 -0600 Subject: [PATCH] allowing for protocol-relative access to external js and css in UI templates --- template/amber/base.amber | 22 +++++++++++----------- template/amber/docs.amber | 4 ++-- template/amber/login.amber | 13 ++++++------- template/amber/login_form.amber | 8 ++++---- template/amber/swagger.amber | 6 +++--- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/template/amber/base.amber b/template/amber/base.amber index 6bb2e2958..491bf3cfc 100644 --- a/template/amber/base.amber +++ b/template/amber/base.amber @@ -7,11 +7,11 @@ html meta[http-equiv="x-ua-compatible"][content="ie=edge"] link[rel="icon"][type="image/x-icon"][href="/static/images/favicon.ico"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/icon?family=Material+Icons"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto+Mono"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto"] - link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] - link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.1.0/octicons.min.css"] + link[rel="stylesheet"][href="//fonts.googleapis.com/icon?family=Material+Icons"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto+Mono"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto"] + link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] + link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/octicons/3.1.0/octicons.min.css"] link[rel="stylesheet"][href="/static/styles_gen/style.css"] if Csrf @@ -48,10 +48,10 @@ html block content block scripts - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/jquery-searcher/0.2.0/jquery.searcher.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js"] - script[text="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/stickyfill/1.1.2/stickyfill.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/jquery-searcher/0.2.0/jquery.searcher.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js"] + script[text="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/stickyfill/1.1.2/stickyfill.js"] script[type="text/javascript"][src="/static/scripts_gen/drone.min.js"] diff --git a/template/amber/docs.amber b/template/amber/docs.amber index a981c904e..f0555e135 100644 --- a/template/amber/docs.amber +++ b/template/amber/docs.amber @@ -36,5 +36,5 @@ block content #{Page.HTML} block scripts - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"] diff --git a/template/amber/login.amber b/template/amber/login.amber index 716ac88fb..7686d2a24 100644 --- a/template/amber/login.amber +++ b/template/amber/login.amber @@ -7,10 +7,10 @@ html meta[http-equiv="x-ua-compatible"][content="ie=edge"] link[rel="icon"][type="image/x-icon"][href="/static/images/favicon.ico"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/icon?family=Material+Icons"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto+Mono"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto"] - link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] + link[rel="stylesheet"][href="//fonts.googleapis.com/icon?family=Material+Icons"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto+Mono"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto"] + link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] link[rel="stylesheet"][href="/static/styles_gen/style.css"] style html { height: 100%; overflow: hidden; } @@ -22,7 +22,7 @@ html if Error == "oauth_error" div.alert.alert-danger - | We failed to authorize your account. Please contact your + | We failed to authorize your account. Please contact your | system administrator to check the logs and see what went wrong. else if Error == "access_denied" @@ -31,6 +31,5 @@ html else if Error == "internal_error" div.alert.alert-danger - | We encountered an unexpected error. Please contact your + | We encountered an unexpected error. Please contact your | system administrator to check the logs and see what went wrong. - diff --git a/template/amber/login_form.amber b/template/amber/login_form.amber index c74eacf6f..62631dfdb 100644 --- a/template/amber/login_form.amber +++ b/template/amber/login_form.amber @@ -7,10 +7,10 @@ html meta[http-equiv="x-ua-compatible"][content="ie=edge"] link[rel="icon"][type="image/x-icon"][href="/static/images/favicon.ico"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/icon?family=Material+Icons"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto+Mono"] - link[rel="stylesheet"][href="https://fonts.googleapis.com/css?family=Roboto"] - link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] + link[rel="stylesheet"][href="//fonts.googleapis.com/icon?family=Material+Icons"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto+Mono"] + link[rel="stylesheet"][href="//fonts.googleapis.com/css?family=Roboto"] + link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css"] link[rel="stylesheet"][href="/static/styles_gen/style.css"] style html { height: 100%; overflow: hidden; } diff --git a/template/amber/swagger.amber b/template/amber/swagger.amber index fc7f1561b..0f7cedf56 100644 --- a/template/amber/swagger.amber +++ b/template/amber/swagger.amber @@ -24,7 +24,7 @@ block content div.row ul.toc each $tag in Swagger.Tags - li + li h2 #{$tag.Name} ul each $op in $tag.Ops @@ -72,5 +72,5 @@ block content pre #{$res.Example} block scripts - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] - script[type="text/javascript"][src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"] + script[type="text/javascript"][src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"]