From 9e41e1a359a744961949e810f8b55c2c89556f9e Mon Sep 17 00:00:00 2001
From: Paolino Paperino <paperino@paperopoli.com>
Date: Mon, 11 Sep 2017 16:06:39 +0200
Subject: [PATCH] 017-09-11: FG; Changed index.html to make it more general.
Leave it up to later code (e.g. openstack-dashboard charm) to: -
subsistute string DASHBOARD_BASEURL (e.g., with
https://dashboard.cloud.garr.it) - make sure the following paths are
properly setup on openstack-dashboard: +
/static/dashboard/css/dashboard_css1.css +
/static/dashboard/css/dashboard_css2.css +
/static/dashboard/js/dashboard_js1.js (referenced in the header section)
+ /static/dashboard/js/dashboard_js2.js (referenced in the body section)
---
index.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/index.html b/index.html
index ac4cbb2..82e0c03 100644
--- a/index.html
+++ b/index.html
@@ -11,13 +11,13 @@
- <link rel="stylesheet" href="https://dashboard.cloud.garr.it/static/dashboard/css/34f8a8f8d5e5.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="DASHBOARD_BASEURL/static/dashboard/css/dashboard_css1.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="https://dashboard.cloud.garr.it/static/dashboard/css/b05d1a2aed96.css" type="text/css" />
+ <link rel="stylesheet" href="DASHBOARD_BASEURL/static/dashboard/css/dashboard_css2.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="idpselect.css">
- <link rel="shortcut icon" href="https://dashboard.cloud.garr.it/static/dashboard/img/favicon.ico"/>
+ <link rel="shortcut icon" href="DASHBOARD_BASEURL/static/dashboard/img/favicon.ico"/>
@@ -32,7 +32,7 @@
}
</script>
- <script type="text/javascript" src="https://dashboard.cloud.garr.it/static/dashboard/js/7fd3f7d69c71.js"></script>
+ <script type="text/javascript" src="DASHBOARD_BASEURL/static/dashboard/js/dashboard_js1.js"></script>
<script type='text/javascript' charset='utf-8'>
(function (global) {
@@ -50,7 +50,7 @@
* should be aware of.
*/
var conf = horizon.conf;
- conf.static_url = "https://dashboard.cloud.garr.it/static/";
+ conf.static_url = "DASHBOARD_BASEURL/static/";
conf.ajax = {
queue_limit: 10
};
@@ -103,7 +103,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="text-center">
- <img class="splash-logo" src="https://dashboard.cloud.garr.it/static/dashboard/img/logo-splash.png">
+ <img class="splash-logo" src="DASHBOARD_BASEURL/static/dashboard/img/logo-splash.png">
</div>
</div>
<h3>Select your Identity Provider - GARR Cloud</h3>
@@ -114,8 +114,8 @@
</div>
<div id="footer">
</div>
- <script type="text/javascript" src="https://dashboard.cloud.garr.it/i18n/js/horizon+openstack_dashboard/"></script>
- <script type="text/javascript" src="https://dashboard.cloud.garr.it/static/dashboard/js/488859da08b5.js"></script>
+ <script type="text/javascript" src="DASHBOARD_BASEURL/i18n/js/horizon+openstack_dashboard/"></script>
+ <script type="text/javascript" src="DASHBOARD_BASEURL/static/dashboard/js/dashboard_js2.js"></script>
<script type="text/html" id="modal_template"><div class="modal" data-backdrop="{{modal_backdrop}}"><div class="modal-dialog"><div class="modal-content"><div class='modal-header'><a class='close' data-dismiss='modal' href="#"><span class="fa fa-times"></span></a><h3 class="modal-title">{{title}}</h3></div><div class='modal-body'>
{{body}}
@@ -145,7 +145,7 @@
- <script src='https://dashboard.cloud.garr.it/static/horizon/lib/bootstrap_datepicker/locales/bootstrap-datepicker.it.js'></script>
+ <script src='DASHBOARD_BASEURL/static/horizon/lib/bootstrap_datepicker/locales/bootstrap-datepicker.it.js'></script>
--
GitLab