mrunge pushed to python-django-horizon (master). "Updated patches from master-patches (..more)"

[notifications at fedoraproject.org]

>From a2f1c802b70a843a66854ce4bb7e909c1e22ebba Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 16 Apr 2015 12:30:47 +0200
Subject: Updated patches from master-patches

Change-Id: I109616b8c5bc18ae34ba6524ab5d7d51eb2b1156

diff --git a/0017-Adapt-paths-for-theme-subpackage.patch b/0017-Adapt-paths-for-theme-subpackage.patch
new file mode 100644
index 0000000..8306d39
--- /dev/null
+++ b/0017-Adapt-paths-for-theme-subpackage.patch
@@ -0,0 +1,25 @@
+From 0b4a3c896cd46a5b73951b7727e6c22d71177815 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Wed, 15 Apr 2015 13:57:27 +0200
+Subject: [PATCH] Adapt paths for -theme subpackage
+
+Change-Id: I4e1a46957c536d81bc376de6425888750382c2f6
+---
+ openstack_dashboard/dashboards/theme/templates/_stylesheets.html | 4 +---
+ 1 file changed, 1 insertion(+), 3 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/python-django-horizon.spec b/python-django-horizon.spec
index 1f41a3e..b5d9e40 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -40,6 +40,7 @@ Patch0013: 0013-Restore-missing-translation-for-the-downstream-theme.patch
 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
 
 #
 # 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=a2f1c802b70a843a66854ce4bb7e909c1e22ebba