From c6ac7bf5056321570a534810badb23582525e0fb Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 15 Apr 2015 13:57:27 +0200
Subject: [PATCH] Adapt paths for -theme subpackage
Change-Id: I4e1a46957c536d81bc376de6425888750382c2f6
static files are now below /dashboard/static
Change-Id: Ide2c97ae5ecbf1f71c6441b5b3b14ef60fec4b4e
---
openstack_dashboard/dashboards/theme/templates/_stylesheets.html | 4 +---
.../dashboards/theme/templates/horizon/common/_sidebar.html | 2 +-
openstack_dashboard/dashboards/theme/templates/splash.html | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/openstack_dashboard/dashboards/theme/templates/_stylesheets.html b/openstack_dashboard/dashboards/theme/templates/_stylesheets.html
index 4615e6f..198c227 100755
--- a/openstack_dashboard/dashboards/theme/templates/_stylesheets.html
+++ b/openstack_dashboard/dashboards/theme/templates/_stylesheets.html
@@ -3,9 +3,7 @@
{% compress css %}
<link href='{{ STATIC_URL }}dashboard/scss/horizon.scss' type='text/scss' media='screen' rel='stylesheet' />
<link href='{{ STATIC_URL }}dashboard/scss/rhtheme.scss' type='text/scss' media='screen' rel='stylesheet' />
-<link href='{{ STATIC_URL }}dashboard/css/rickshaw.css' type='text/css' media='screen' rel='stylesheet' />
-<link href='{{ STATIC_URL }}dashboard/scss/horizon_charts.scss' type='text/scss' media='screen' rel='stylesheet' />
-<link href='{{ STATIC_URL }}dashboard/scss/horizon_workflow.scss' type='text/scss' media='screen' rel='stylesheet' />
+<link href='{{ STATIC_URL }}horizon/lib/rickshaw.css' type='text/css' media='screen' rel='stylesheet' />
<link href='{{ STATIC_URL }}horizon/lib/font-awesome/scss/font-awesome.scss' type='text/scss' media='screen' rel='stylesheet' />
{% endcompress %}
diff --git a/openstack_dashboard/dashboards/theme/templates/horizon/common/_sidebar.html b/openstack_dashboard/dashboards/theme/templates/horizon/common/_sidebar.html
index e5e7480..ee06be2 100644
--- a/openstack_dashboard/dashboards/theme/templates/horizon/common/_sidebar.html
+++ b/openstack_dashboard/dashboards/theme/templates/horizon/common/_sidebar.html
@@ -4,7 +4,7 @@
<div class="header rcue clearfix">
<div class="navbar utility">
<div class="navbar-inner">
- <a class="brand" href="{% url 'horizon:user_home' %}"><img src="/static/dashboard/img/brand.svg" alt="{% site_branding %}" /></a>
+ <a class="brand" href="{% url 'horizon:user_home' %}"><img src="/dashboard/static/dashboard/img/brand.svg" alt="{% site_branding %}" /></a>
{% horizon_main_nav %}
{% include "_header.html" %}
{% if request.horizon.dashboard.supports_tenants %}
diff --git a/openstack_dashboard/dashboards/theme/templates/splash.html b/openstack_dashboard/dashboards/theme/templates/splash.html
index 830fd8c..4b4e61a 100644
--- a/openstack_dashboard/dashboards/theme/templates/splash.html
+++ b/openstack_dashboard/dashboards/theme/templates/splash.html
@@ -8,13 +8,13 @@
</head>
<body id="splash">
<a href="http://www.redhat.com/" id="redhat">
- <img src="/static/dashboard/img/logo.svg" alt="Red Hat" />
+ <img src="/dashboard/static/dashboard/img/logo.svg" alt="Red Hat" />
</a>
<div class="container">
<div class="row-fluid">
<div class="span12">
<div id="brand">
- <img src="/static/dashboard/img/brand.svg">
+ <img src="/dashboard/static/dashboard/img/brand.svg">
</div><!--/#brand-->
</div><!--/.span*-->
{% include 'auth/_login.html' %}