From f7dbdf8f8ef8ef791e445549052df5aa498f0ad9 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Thu, 4 Sep 2014 17:19:36 +0900 Subject: [PATCH] Make html compatible with Angular new base href requirements. --- res/app/views/index.jade | 9 +++++---- res/auth/ldap/views/index.jade | 5 +++-- res/auth/mock/views/index.jade | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/res/app/views/index.jade b/res/app/views/index.jade index cd338e32..97f2ffaa 100644 --- a/res/app/views/index.jade +++ b/res/app/views/index.jade @@ -2,13 +2,14 @@ doctype html html head meta(charset='utf-8') + base(href='/') meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui') meta(name='mobile-web-app-capable', content='yes') meta(name='apple-mobile-web-app-capable', content='yes') meta(name='apple-mobile-web-app-title', content='STF') meta(name='format-detection', content='telephone=no') meta(name='apple-mobile-web-app-status-bar-style', content='black-translucent') - link(href='/static/bower_components/stf-graphics/logo/exports/STF-128.png', rel='apple-touch-icon') + link(href='static/bower_components/stf-graphics/logo/exports/STF-128.png', rel='apple-touch-icon') title STF body(ng-app='app', ng-cloak).bg-1.fill-height @@ -24,6 +25,6 @@ html div(ng-view).fill-height script(src='/api/v1/appstate.js') - script(src='/static/app/build/entry/commons.entry.js') - script(src='/static/app/build/entry/app.entry.js') - script(src='/static/bower_components/stf-analytics/analytics.js') + script(src='static/app/build/entry/commons.entry.js') + script(src='static/app/build/entry/app.entry.js') + script(src='static/bower_components/stf-analytics/analytics.js') diff --git a/res/auth/ldap/views/index.jade b/res/auth/ldap/views/index.jade index d81e2601..31b76ae8 100644 --- a/res/auth/ldap/views/index.jade +++ b/res/auth/ldap/views/index.jade @@ -2,10 +2,11 @@ doctype html html head title STF + base(href='/') meta(charset='utf-8') meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui') include partials/styles body(ng-cloak) div(ng-view) - script(src='/static/bower_components/requirejs/require.js', data-main='/static/auth/ldap/scripts/main.js') - script(src='/static/bower_components/stf-analytics/analytics.js') + script(src='static/bower_components/requirejs/require.js', data-main='static/auth/ldap/scripts/main.js') + script(src='static/bower_components/stf-analytics/analytics.js') diff --git a/res/auth/mock/views/index.jade b/res/auth/mock/views/index.jade index fc1eb1ca..96b7f25a 100644 --- a/res/auth/mock/views/index.jade +++ b/res/auth/mock/views/index.jade @@ -2,10 +2,11 @@ doctype html html head title STF + base(href='/') meta(charset='utf-8') meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui') include partials/styles body(ng-cloak) div(ng-view) - script(src='/static/bower_components/requirejs/require.js', data-main='/static/auth/mock/scripts/main.js') - script(src='/static/bower_components/stf-analytics/analytics.js') + script(src='static/bower_components/requirejs/require.js', data-main='static/auth/mock/scripts/main.js') + script(src='static/bower_components/stf-analytics/analytics.js')