Code Review / openstack-build / horizon-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: ba36849)
Add patch tabs broke horizon ; OSCI-976
authorRoman Vyalov <rvyalov@mirantis.com>
Wed, 18 Dec 2013 10:54:34 +0000 (14:54 +0400)
committerRoman Vyalov <rvyalov@mirantis.com>
Wed, 18 Dec 2013 11:31:50 +0000 (15:31 +0400)
Change-Id: I780f7bd600353a475dd85779a8c2aca07307faf3

debian/patches/mos-fix-murano-savana-dashboard.patch [new file with mode: 0644] patch | blob
debian/patches/series patch | blob | history
rpm/SOURCES/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch patch | blob | history
rpm/SOURCES/mos-fix-murano-savana-dashboard.patch [new file with mode: 0644] patch | blob
rpm/SPECS/python-django-horizon.spec patch | blob | history

diff --git a/debian/patches/mos-fix-murano-savana-dashboard.patch b/debian/patches/mos-fix-murano-savana-dashboard.patch
new file mode 100644 (file)
index 0000000..0d1153c
--- /dev/null
+++ b/debian/patches/mos-fix-murano-savana-dashboard.patch
@@ -0,0 +1,21 @@
+diff --git a/horizon/templates/base.html b/horizon/templates/base.html
+index 1b791d0..f767d7c 100644
+--- a/horizon/templates/base.html
++++ b/horizon/templates/base.html
+@@ -10,6 +10,7 @@
+     {% endblock %}
+     {% include "horizon/_conf.html" %}
+     {% include "horizon/client_side/_script_loader.html" %}
++    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
+   </head>
+   <body id="{% block body_id %}{% endblock %}">
+     {% block content %}
+diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashb
+index e69de29..60f4074 100644
+--- a/openstack_dashboard/static/dashboard/less/fix_tabs.css
++++ b/openstack_dashboard/static/dashboard/less/fix_tabs.css
+@@ -0,0 +1,4 @@
++.nav-tabs > li > a {
++padding-right: 5px;
++padding-left: 5px;
++}
diff --git a/debian/patches/series b/debian/patches/series
index 66e56af6dc727494556c3591acf5bb96dabb5f09..813ce13c93ef2494702ec418dc7f90378ae21f7c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix-ubuntu-tests.patch
 ubuntu_settings.patch
 
 mos-disable-metering.patch
+mos-fix-murano-savana-dashboard.patch
diff --git a/rpm/SOURCES/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/rpm/SOURCES/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index d25054e186a181fa28bdc01127d2ddc1e829f71a..94740bb13428ee5fefccef63848bc5fa9807b51d 100644 (file)
--- a/rpm/SOURCES/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/rpm/SOURCES/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1342,7 +1342,7 @@ index 6f771b2..3ddb8a0 100644
 --- a/test-requirements.txt
 +++ b/test-requirements.txt
 @@ -14,4 +14,3 @@ selenium
- sphinx>=1.1.2
+ sphinx>=1.1.2,<1.2
  # for bug 1091333, remove after sphinx >1.1.3 is released.
  docutils==0.9.1
 -oslo.sphinx
diff --git a/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch b/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch
new file mode 100644 (file)
index 0000000..0d1153c
--- /dev/null
+++ b/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch
@@ -0,0 +1,21 @@
+diff --git a/horizon/templates/base.html b/horizon/templates/base.html
+index 1b791d0..f767d7c 100644
+--- a/horizon/templates/base.html
++++ b/horizon/templates/base.html
+@@ -10,6 +10,7 @@
+     {% endblock %}
+     {% include "horizon/_conf.html" %}
+     {% include "horizon/client_side/_script_loader.html" %}
++    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
+   </head>
+   <body id="{% block body_id %}{% endblock %}">
+     {% block content %}
+diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashb
+index e69de29..60f4074 100644
+--- a/openstack_dashboard/static/dashboard/less/fix_tabs.css
++++ b/openstack_dashboard/static/dashboard/less/fix_tabs.css
+@@ -0,0 +1,4 @@
++.nav-tabs > li > a {
++padding-right: 5px;
++padding-left: 5px;
++}
diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index 162893a4a7091a841821beb013cd460de32eb254..a8f3193e3b8e4ef130969adba1185cb426934d90 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -34,6 +34,7 @@ Patch0009: 0009-do-not-truncate-the-logo-related-rhbz-877138.patch
 Patch0010: 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
 #mirantis OpenStack patch
 Patch0100: mos-disable-metering.patch
+Patch0101: mos-fix-murano-savana-dashboard.patch
 
 
 
@@ -168,6 +169,7 @@ Customization module for OpenStack Dashboard to provide a branded logo.
 %patch0009 -p1
 %patch0010 -p1
 %patch0100 -p1
+%patch0101 -p1
 
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;