darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1407 from jackspirou/master

Browse source 
Allowing for protocol-relative access to external js and css in UI templates.
This commit is contained in:
Brad Rydzewski 2016-01-11 10:57:17 -08:00
commit a84db63f11
5 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
template/amber/base.amber
View file

@ -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"]

4
template/amber/docs.amber
View file

@ -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"]

13
template/amber/login.amber
View file

@ -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.

8
template/amber/login_form.amber
View file

@ -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; }

6
template/amber/swagger.amber
View file

@ -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"]