mrunge pushed to python-django-horizon (master). "Import a fix for static files handling (..more)"

Thu Apr 23 09:47:07 UTC 2015

>From 90222751a13fcc5c936563e242347766805774e7 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Wed, 22 Apr 2015 10:03:34 +0200
Subject: Import a fix for static files handling

Change-Id: I4efbb39e6519913afe8aa8a43a567cdda0687bbb

diff --git a/0018-static-files-are-now-below-dashboard-static.patch b/0018-static-files-are-now-below-dashboard-static.patch
new file mode 100644
index 0000000..0b4e2c1
--- /dev/null
+++ b/0018-static-files-are-now-below-dashboard-static.patch
@@ -0,0 +1,44 @@
+From c39f153dc09c6ab8aac85775e25290547c380587 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Mon, 20 Apr 2015 12:37:41 +0200
+Subject: [PATCH] static files are now below /dashboard/static
+
+Change-Id: Ide2c97ae5ecbf1f71c6441b5b3b14ef60fec4b4e
+---
+ .../dashboards/theme/templates/horizon/common/_sidebar.html           | 2 +-
+ openstack_dashboard/dashboards/theme/templates/splash.html            | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+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' %}
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 76c2da7..bc566ff 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -41,6 +41,7 @@ Patch0014: 0014-IE-bug-fixes-https-bugzilla.redhat.com-show_bug.cgi-.patch
 Patch0015: 0015-Change-branding.patch
 Patch0016: 0016-Add-missing-translation-for-the-downstream-theme-zh_.patch
 Patch0017: 0017-Adapt-paths-for-theme-subpackage.patch
+Patch0018: 0018-static-files-are-now-below-dashboard-static.patch
 
 #
 # BuildArch needs to be located below patches in the spec file. Don't ask!
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-django-horizon.git/commit/?h=master&id=90222751a13fcc5c936563e242347766805774e7
