[python-django-horizon: 4/6] Updated patches from master-patches

[Matthias Runge]

commit b8dc0e976413413233cf902af81ef1bada6521a3
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Feb 3 21:35:40 2014 +0100

    Updated patches from master-patches

 0008-RCUE-navbar-and-login-screen.patch |   42 +++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/0008-RCUE-navbar-and-login-screen.patch b/0008-RCUE-navbar-and-login-screen.patch
index 69b7636..7d9c8a9 100644
--- a/0008-RCUE-navbar-and-login-screen.patch
+++ b/0008-RCUE-navbar-and-login-screen.patch
@@ -1,10 +1,10 @@
-From a20f718947419a0921de909389f4f3ecb7521620 Mon Sep 17 00:00:00 2001
+From 981e1e300bf3e3518955576afa14405e97ab1f39 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Thu, 19 Sep 2013 13:58:16 +0200
 Subject: [PATCH] RCUE navbar and login screen
 
 ---
- openstack_dashboard/settings.py                    |   3 +-
+ openstack_dashboard/settings.py                    |  12 +-
  .../static/dashboard/css/font-awesome.min.css      |   4 +
  .../static/dashboard/fonts/FontAwesome.otf         | Bin 0 -> 62856 bytes
  .../dashboard/fonts/OpenSans-Bold-webfont.eot      | Bin 0 -> 21190 bytes
@@ -77,7 +77,7 @@ Subject: [PATCH] RCUE navbar and login screen
  .../templates/horizon/_subnav_list.html            |  20 +
  .../templates/horizon/common/_sidebar.html         |  98 +++--
  openstack_dashboard_theme/templates/splash.html    |  19 +-
- 73 files changed, 3403 insertions(+), 112 deletions(-)
+ 73 files changed, 3403 insertions(+), 121 deletions(-)
  create mode 100644 openstack_dashboard_theme/static/dashboard/css/font-awesome.min.css
  create mode 100644 openstack_dashboard_theme/static/dashboard/fonts/FontAwesome.otf
  create mode 100755 openstack_dashboard_theme/static/dashboard/fonts/OpenSans-Bold-webfont.eot
@@ -146,18 +146,10 @@ Subject: [PATCH] RCUE navbar and login screen
  create mode 100644 openstack_dashboard_theme/templates/horizon/_subnav_list.html
 
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 7b70478..4fd7949 100644
+index 7b70478..b50efb1 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
-@@ -119,6 +119,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
- )
- 
- TEMPLATE_LOADERS = (
-+    'django.template.loaders.filesystem.Loader',
-     'django.template.loaders.app_directories.Loader',
-     'horizon.loaders.TemplateLoader'
- )
-@@ -146,7 +147,7 @@ COMPRESS_ENABLED = True
+@@ -146,7 +146,7 @@ COMPRESS_ENABLED = True
  COMPRESS_OUTPUT_DIR = 'dashboard'
  COMPRESS_CSS_HASHING_METHOD = 'hash'
  COMPRESS_PARSER = 'compressor.parser.HtmlParser'
@@ -166,6 +158,30 @@ index 7b70478..4fd7949 100644
  
  INSTALLED_APPS = [
      'openstack_dashboard',
+@@ -158,22 +158,14 @@ INSTALLED_APPS = [
+     'django.contrib.humanize',
+     'compressor',
+     'horizon',
+-    'openstack_dashboard.dashboards.project',
+-    'openstack_dashboard.dashboards.admin',
+-    'openstack_dashboard.dashboards.settings',
+     'openstack_auth',
+-    'openstack_dashboard.dashboards.router',
+ ]
+ 
+ THEME_APP = 'openstack_dashboard_theme'
+ 
+ try:
+     __import__(THEME_APP)
+-    TEMPLATE_DIRS = (os.path.join(ROOT_PATH, '..', THEME_APP,
+-                        'templates'),) + TEMPLATE_DIRS
+-    STATICFILES_DIRS = STATICFILES_DIRS + (
+-        os.path.join(ROOT_PATH, '..', THEME_APP, 'templates'),)
+-
++    INSTALLED_APPS.insert(0, THEME_APP)
+ except Exception:
+     pass
+ 
 diff --git a/openstack_dashboard_theme/static/dashboard/css/font-awesome.min.css b/openstack_dashboard_theme/static/dashboard/css/font-awesome.min.css
 new file mode 100644
 index 0000000..449d6ac