From e253839173243a2da5c9fcfd61938e78c32c673f Mon Sep 17 00:00:00 2001 From: Mark McKenna Date: Fri, 12 Aug 2016 15:49:13 +0100 Subject: [PATCH] Make absolute paths relative --- src/main/webapp/assets/html/swagger-ui.html | 2 +- src/main/webapp/assets/js/view/entity-config.js | 2 +- src/main/webapp/assets/js/view/entity-sensors.js | 2 +- src/main/webapp/assets/js/view/viewutils.js | 2 +- .../webapp/assets/tpl/app-add-wizard/create.html | 2 +- src/main/webapp/assets/tpl/help/page.html | 2 +- .../webapp/assets/tpl/home/applications.html | 4 ++-- .../webapp/assets/tpl/home/server-caution.html | 2 +- src/main/webapp/assets/tpl/labs/page.html | 2 +- src/main/webapp/assets/tpl/script/groovy.html | 2 +- src/main/webapp/assets/tpl/script/swagger.html | 4 ++-- src/main/webapp/index.html | 16 ++++++++-------- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/assets/html/swagger-ui.html b/src/main/webapp/assets/html/swagger-ui.html index fdba6d845..e66393b1f 100644 --- a/src/main/webapp/assets/html/swagger-ui.html +++ b/src/main/webapp/assets/html/swagger-ui.html @@ -88,7 +88,7 @@
  • Script
    • diff --git a/src/main/webapp/assets/js/view/entity-config.js b/src/main/webapp/assets/js/view/entity-config.js index a115bb31d..e37795611 100644 --- a/src/main/webapp/assets/js/view/entity-config.js +++ b/src/main/webapp/assets/js/view/entity-config.js @@ -28,7 +28,7 @@ define([ ], function (_, $, Backbone, Util, ZeroClipboard, ViewUtils, ConfigSummary, ConfigHtml, ConfigNameHtml) { // TODO consider extracting all such usages to a shared ZeroClipboard wrapper? - ZeroClipboard.config({ moviePath: '/assets/img/zeroclipboard/ZeroClipboard.swf' }); + ZeroClipboard.config({ moviePath: './assets/img/zeroclipboard/ZeroClipboard.swf' }); var configHtml = _.template(ConfigHtml), configNameHtml = _.template(ConfigNameHtml); diff --git a/src/main/webapp/assets/js/view/entity-sensors.js b/src/main/webapp/assets/js/view/entity-sensors.js index 9e913316a..0b5b7a0c8 100644 --- a/src/main/webapp/assets/js/view/entity-sensors.js +++ b/src/main/webapp/assets/js/view/entity-sensors.js @@ -28,7 +28,7 @@ define([ ], function (_, $, Backbone, Util, ZeroClipboard, ViewUtils, SensorSummary, SensorsHtml, SensorNameHtml) { // TODO consider extracting all such usages to a shared ZeroClipboard wrapper? - ZeroClipboard.config({ moviePath: '/assets/img/zeroclipboard/ZeroClipboard.swf' }); + ZeroClipboard.config({ moviePath: './assets/img/zeroclipboard/ZeroClipboard.swf' }); var sensorHtml = _.template(SensorsHtml), sensorNameHtml = _.template(SensorNameHtml); diff --git a/src/main/webapp/assets/js/view/viewutils.js b/src/main/webapp/assets/js/view/viewutils.js index 95fcd5d20..04791acb9 100644 --- a/src/main/webapp/assets/js/view/viewutils.js +++ b/src/main/webapp/assets/js/view/viewutils.js @@ -550,7 +550,7 @@ define([ // no status info at all result.url = null; } else { - result.url = "/assets/img/"+"icon-status-"+mode+"."+imgext; + result.url = "./assets/img/"+"icon-status-"+mode+"."+imgext; } return result; diff --git a/src/main/webapp/assets/tpl/app-add-wizard/create.html b/src/main/webapp/assets/tpl/app-add-wizard/create.html index e5e4406d7..6c3fac08e 100644 --- a/src/main/webapp/assets/tpl/app-add-wizard/create.html +++ b/src/main/webapp/assets/tpl/app-add-wizard/create.html @@ -36,7 +36,7 @@
    -
    +
    The applications catalog is empty. diff --git a/src/main/webapp/assets/tpl/help/page.html b/src/main/webapp/assets/tpl/help/page.html index 6d44c2724..1a5763a68 100644 --- a/src/main/webapp/assets/tpl/help/page.html +++ b/src/main/webapp/assets/tpl/help/page.html @@ -21,7 +21,7 @@
    -
    +

    Brooklyn Help

    This is the Brooklyn JavaScript web client for the REST API.
    diff --git a/src/main/webapp/assets/tpl/home/applications.html b/src/main/webapp/assets/tpl/home/applications.html index 3c3898904..8f876c0fc 100644 --- a/src/main/webapp/assets/tpl/home/applications.html +++ b/src/main/webapp/assets/tpl/home/applications.html @@ -62,7 +62,7 @@ Reload Properties

    - +
    @@ -71,7 +71,7 @@ Clear HA Node Records
    - +
    diff --git a/src/main/webapp/assets/tpl/home/server-caution.html b/src/main/webapp/assets/tpl/home/server-caution.html index 94bd622f9..8692a2e16 100644 --- a/src/main/webapp/assets/tpl/home/server-caution.html +++ b/src/main/webapp/assets/tpl/home/server-caution.html @@ -51,7 +51,7 @@

    Warning!

    <% } else if (!up) { %>
    -
    +

    Starting up...

    diff --git a/src/main/webapp/assets/tpl/labs/page.html b/src/main/webapp/assets/tpl/labs/page.html index a0097b680..0fc133f84 100644 --- a/src/main/webapp/assets/tpl/labs/page.html +++ b/src/main/webapp/assets/tpl/labs/page.html @@ -102,7 +102,7 @@

    Colours


    Icons


    Glyphs

    - +

    diff --git a/src/main/webapp/assets/tpl/script/groovy.html b/src/main/webapp/assets/tpl/script/groovy.html index 06fc9d14b..19e88b794 100644 --- a/src/main/webapp/assets/tpl/script/groovy.html +++ b/src/main/webapp/assets/tpl/script/groovy.html @@ -29,7 +29,7 @@
    -
    +
    diff --git a/src/main/webapp/assets/tpl/script/swagger.html b/src/main/webapp/assets/tpl/script/swagger.html index 89b2bc4de..21fa5aa27 100644 --- a/src/main/webapp/assets/tpl/script/swagger.html +++ b/src/main/webapp/assets/tpl/script/swagger.html @@ -19,10 +19,10 @@ -->
    - +
    REST API Reference
    -
    +
     
    diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index ca0dba641..75a1bc912 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -26,12 +26,12 @@ Brooklyn JS REST client - - - - - - + + + + + +