Repository: brooklyn-ui Updated Branches: refs/heads/master b6a2a7028 -> 0ebdb5c99
Make absolute paths relative Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/e2538391 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/e2538391 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/e2538391 Branch: refs/heads/master Commit: e253839173243a2da5c9fcfd61938e78c32c673f Parents: d82eda2 Author: Mark McKenna <m4rkmcke...@gmail.com> Authored: Fri Aug 12 15:49:13 2016 +0100 Committer: Mark McKenna <m4rkmcke...@gmail.com> Committed: Tue Aug 16 14:02:14 2016 +0100 ---------------------------------------------------------------------- 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 +- src/main/webapp/assets/tpl/home/applications.html | 4 ++-- src/main/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/html/swagger-ui.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/html/swagger-ui.html b/src/main/webapp/assets/html/swagger-ui.html index fdba6d8..e66393b 100644 --- a/src/main/webapp/assets/html/swagger-ui.html +++ b/src/main/webapp/assets/html/swagger-ui.html @@ -88,7 +88,7 @@ <li class="dropdown"> <a href="#" class="nav1 nav1_script dropdown-toggle" data-toggle="dropdown">Script</a> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> - <li><a href="/assets/html/swagger-ui.html" target="_blank" class="nav1 nav1_apidoc">REST API</a></li> + <li><a href="./assets/html/swagger-ui.html" target="_blank" class="nav1 nav1_apidoc">REST API</a></li> <li><a href="/#v1/script/groovy" class="nav1 nav1_groovy">Groovy</a></li> </ul> </li> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/js/view/entity-config.js ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/js/view/entity-config.js b/src/main/webapp/assets/js/view/entity-config.js index a115bb3..e377956 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); http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/js/view/entity-sensors.js ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/js/view/entity-sensors.js b/src/main/webapp/assets/js/view/entity-sensors.js index 9e91331..0b5b7a0 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); http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/js/view/viewutils.js ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/js/view/viewutils.js b/src/main/webapp/assets/js/view/viewutils.js index 95fcd5d..04791ac 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; http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/app-add-wizard/create.html ---------------------------------------------------------------------- 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 e5e4406..6c3fac0 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 @@ under the License. <div class="tab-content"> <div class="tab-pane active" id="templateTab"> - <div id="catalog-applications-throbber"><img src="/assets/images/throbber.gif"/></div> + <div id="catalog-applications-throbber"><img src="./assets/images/throbber.gif"/></div> <!-- TODO: transform the menu to list --> <div id="catalog-applications-empty" class="hide"> The applications catalog is empty. http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/help/page.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/help/page.html b/src/main/webapp/assets/tpl/help/page.html index 6d44c27..1a5763a 100644 --- a/src/main/webapp/assets/tpl/help/page.html +++ b/src/main/webapp/assets/tpl/help/page.html @@ -21,7 +21,7 @@ under the License. <!-- Help page --> <div class="container container-fluid single-main-container brooklyn-help-page"> <div id="help-page"> - <div class="help-logo-right"><img width="450" src="/assets/img/bridge.png"/></div> + <div class="help-logo-right"><img width="450" src="./assets/img/bridge.png"/></div> <h3>Brooklyn Help</h3> <p>This is the Brooklyn JavaScript web client for the REST API.<br/> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/home/applications.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/home/applications.html b/src/main/webapp/assets/tpl/home/applications.html index 3c38989..8f876c0 100644 --- a/src/main/webapp/assets/tpl/home/applications.html +++ b/src/main/webapp/assets/tpl/home/applications.html @@ -62,7 +62,7 @@ under the License. Reload Properties</button> </div> <div id="reload-brooklyn-properties-indicator" class="throbber hide" style="float: right;"> - <img src="/assets/images/throbber.gif"/> + <img src="./assets/images/throbber.gif"/> </div> <dl class="dl-horizontal"></dl> @@ -71,7 +71,7 @@ under the License. Clear HA Node Records</button> </div> <div id="clear-ha-node-records-indicator" class="throbber hide" style="float: right;"> - <img src="/assets/images/throbber.gif"/> + <img src="./assets/images/throbber.gif"/> </div> </div> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/home/server-caution.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/home/server-caution.html b/src/main/webapp/assets/tpl/home/server-caution.html index 94bd622..8692a2e 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 @@ under the License. <% } else if (!up) { %> <div style="float: right; position: relative; top: -45px; height: 0; overflow: visible;"> - <img src="/assets/img/icon-status-starting.gif" width="60"/></div> + <img src="./assets/img/icon-status-starting.gif" width="60"/></div> <p><strong> Starting up...</strong></p> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/labs/page.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/labs/page.html b/src/main/webapp/assets/tpl/labs/page.html index a0097b6..0fc133f 100644 --- a/src/main/webapp/assets/tpl/labs/page.html +++ b/src/main/webapp/assets/tpl/labs/page.html @@ -102,7 +102,7 @@ $(document).ready(function() { <h1>Icons</h1><br/> <div><b>Glyphs</b></div><br/> -<img src="/assets/img/glyphicons-halflings.png"/> +<img src="./assets/img/glyphicons-halflings.png"/> <br/><br/> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/script/groovy.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/script/groovy.html b/src/main/webapp/assets/tpl/script/groovy.html index 06fc9d1..19e88b7 100644 --- a/src/main/webapp/assets/tpl/script/groovy.html +++ b/src/main/webapp/assets/tpl/script/groovy.html @@ -29,7 +29,7 @@ under the License. <div class="output"> - <div class="throbber"><img src="/assets/images/throbber.gif"/></div> + <div class="throbber"><img src="./assets/images/throbber.gif"/></div> <div class="toggler-region error"> <div class="toggler-header"> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/assets/tpl/script/swagger.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/script/swagger.html b/src/main/webapp/assets/tpl/script/swagger.html index 89b2bc4..21fa5aa 100644 --- a/src/main/webapp/assets/tpl/script/swagger.html +++ b/src/main/webapp/assets/tpl/script/swagger.html @@ -19,10 +19,10 @@ under the License. --> <div class="single-main-container"> -<link rel="stylesheet" href="/assets/css/swagger.css"> +<link rel="stylesheet" href="./assets/css/swagger.css"> <div class="apidoc-title"> REST API Reference </div> -<div class="throbber"><img src="/assets/images/throbber.gif"/></div> +<div class="throbber"><img src="./assets/images/throbber.gif"/></div> <div id="message-bar" class="swagger-ui-wrap"> </div> <div id="swagger-ui-container" class="swagger-ui-wrap"></div> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e2538391/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index ca0dba6..75a1bc9 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -26,12 +26,12 @@ <title>Brooklyn JS REST client</title> - <link rel="stylesheet" href="/assets/css/codemirror.css"> - <link rel="stylesheet" href="/assets/js/libs/font-awesome/css/font-awesome.css"> - <link rel="stylesheet" href="/assets/css/show-hint.css"> - <link rel="stylesheet" href="/assets/css/styles.css"> - <link rel="stylesheet" href="/assets/css/codemirror-brooklyn.css"> - <link rel="stylesheet" href="/assets/css/brooklyn.css"> + <link rel="stylesheet" href="./assets/css/codemirror.css"> + <link rel="stylesheet" href="./assets/js/libs/font-awesome/css/font-awesome.css"> + <link rel="stylesheet" href="./assets/css/show-hint.css"> + <link rel="stylesheet" href="./assets/css/styles.css"> + <link rel="stylesheet" href="./assets/css/codemirror-brooklyn.css"> + <link rel="stylesheet" href="./assets/css/brooklyn.css"> <style> body { padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ @@ -60,7 +60,7 @@ <li class="dropdown"> <a href="#" class="nav1 nav1_script dropdown-toggle" data-toggle="dropdown">Script</a> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> - <li><a href="/assets/html/swagger-ui.html" target="_blank" class="nav1 nav1_apidoc">REST API</a></li> + <li><a href="./assets/html/swagger-ui.html" target="_blank" class="nav1 nav1_apidoc">REST API</a></li> <li><a href="#v1/script/groovy" class="nav1 nav1_groovy">Groovy</a></li> </ul> </li> @@ -77,7 +77,7 @@ </div> <!-- load our code with require.js. data-main is replaced with optimised file at build --> -<script type="text/javascript" data-main="assets/js/config.js" src="assets/js/libs/require.js"></script> +<script type="text/javascript" data-main="./assets/js/config.js" src="./assets/js/libs/require.js"></script> </body> </html>
