From e98c05e1e6e270c35175138316c49c0015abd65b Mon Sep 17 00:00:00 2001
From: Rick Salevsky <rsalevsky@suse.de>
Date: Thu, 5 Nov 2015 15:53:59 +0100
Subject: [PATCH 1/4] Integrate CSS branding

---
 .../app/assets/stylesheets/branding.scss      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/crowbar_framework/app/assets/stylesheets/branding.scss b/crowbar_framework/app/assets/stylesheets/branding.scss
index bd3ce1a8c..5f2adbb37 100644
--- a/crowbar_framework/app/assets/stylesheets/branding.scss
+++ b/crowbar_framework/app/assets/stylesheets/branding.scss
@@ -1,2 +1,26 @@
 @import "bootstrap/variables";
 @import "bootstrap/mixins";
+
+@function twbs-font-path($path) {
+  @return font-path($path);
+}
+
+@function twbs-image-path($path) {
+  @return image-path($path);
+}
+
+$bootstrap-sass-asset-helper: true;
+
+.bottom-line {
+  @include gradient-horizontal(#2b9a9b, #40b178, 0%, 90%);
+  background: #1fad7a;
+}
+
+// We need to link to logo.png again for the asset compilation
+.navbar-inverse {
+  .navbar-brand {
+    .title {
+      background: transparent url("/assets/logo.png") no-repeat;
+    }
+  }
+}
-- 
2.21.0


From caaed9ffcadb64603105c60682d9e4c6c47fa24f Mon Sep 17 00:00:00 2001
From: Rick Salevsky <rsalevsky@suse.de>
Date: Mon, 5 Oct 2015 16:51:18 +0200
Subject: [PATCH 2/4] Integrate branding error pages

---
 crowbar_framework/public/403.html | 16 +++++++++++-----
 crowbar_framework/public/404.html | 17 +++++++++++------
 crowbar_framework/public/422.html | 17 +++++++++++------
 crowbar_framework/public/500.html | 17 +++++++++++------
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/crowbar_framework/public/403.html b/crowbar_framework/public/403.html
index 38a1030f8..3b5f5fe16 100644
--- a/crowbar_framework/public/403.html
+++ b/crowbar_framework/public/403.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <title>
-      Error 403 | Crowbar
+      Error 403 | SUSE&reg; OpenStack Cloud Crowbar
     </title>
 
     <meta charset="utf-8" />
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/assets/vendor.css" />
     <link rel="stylesheet" href="/assets/application.css" />
     <link rel="stylesheet" href="/assets/branding.css" />
+    <link rel="shortcut icon" href="/assets/suse/favicon.ico" />
 
     <script src="/assets/vendor.js"></script>
     <script src="/assets/application.js"></script>
@@ -35,7 +36,7 @@
             <span class="icon-bar"></span>
           </button>
           <a href="/" class="navbar-brand">
-            <span class="title">Crowbar</span>
+            <span class="title">SUSE&reg; OpenStack Cloud Crowbar</span>
           </a>
         </div>
         <div class="collapse navbar-collapse navbar-right">
@@ -57,15 +58,20 @@
         <div class="panel-body">
           <p>
             Maybe you tried to access something you didn't have rights to. Please check your credentials and maybe try it
-            again. If this is an application error, please visit the <a href="http://github.com/crowbar/crowbar/wiki/error">Crowbar site</a>
-            for more information or to submit a bug report.
+            again.
+            If this is an application error, we encourage you to visit the
+            <a href="http://www.suse.com/support/">SUSE support site</a> for more information.
+            Return to the <a href="/">dashboard</a>.
           </p>
         </div>
       </div>
 
       <footer>
         <span>
-          Provided by <a href="https://crowbar.github.io/" target="_blank">Crowbar</a>
+          <a href="https://www.suse.com/cloud" target="_blank" />SUSE&reg; OpenStack Cloud 8</a>
+        </span>
+        <span>
+          Provided by <a href="https://www.suse.com" target="_blank">SUSE</a>
         </span>
       </footer>
     </div>
diff --git a/crowbar_framework/public/404.html b/crowbar_framework/public/404.html
index 136d4d0dc..90c424e8e 100644
--- a/crowbar_framework/public/404.html
+++ b/crowbar_framework/public/404.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <title>
-      Error 404 | Crowbar
+      Error 404 | SUSE&reg; OpenStack Cloud Crowbar
     </title>
 
     <meta charset="utf-8" />
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/assets/vendor.css" />
     <link rel="stylesheet" href="/assets/application.css" />
     <link rel="stylesheet" href="/assets/branding.css" />
+    <link rel="shortcut icon" href="/assets/suse/favicon.ico" />
 
     <script src="/assets/vendor.js"></script>
     <script src="/assets/application.js"></script>
@@ -35,7 +36,7 @@
             <span class="icon-bar"></span>
           </button>
           <a href="/" class="navbar-brand">
-            <span class="title">Crowbar</span>
+            <span class="title">SUSE&reg; OpenStack Cloud Crowbar</span>
           </a>
         </div>
         <div class="collapse navbar-collapse navbar-right">
@@ -56,16 +57,20 @@
         </div>
         <div class="panel-body">
           <p>
-            Please double check the URL you're trying to reach or consult your <a href="/utils">log files</a>. If this is
-            an application error, please visit the <a href="http://github.com/crowbar/crowbar/wiki/error">Crowbar site</a>
-            for more information or to submit a bug report. Return to the <a href="/">dashboard</a>.
+            Please double check the URL you're trying to reach or consult your <a href="/utils">log files</a>.
+            If this is an application error, we encourage you to visit the
+            <a href="http://www.suse.com/support/">SUSE support site</a> for more information.
+            Return to the <a href="/">dashboard</a>.
           </p>
         </div>
       </div>
 
       <footer>
         <span>
-          Provided by <a href="https://crowbar.github.io/" target="_blank">Crowbar</a>
+          <a href="https://www.suse.com/cloud" target="_blank" />SUSE&reg; OpenStack Cloud 8</a>
+        </span>
+        <span>
+          Provided by <a href="https://www.suse.com" target="_blank">SUSE</a>
         </span>
       </footer>
     </div>
diff --git a/crowbar_framework/public/422.html b/crowbar_framework/public/422.html
index c1739459c..1fe50fc45 100644
--- a/crowbar_framework/public/422.html
+++ b/crowbar_framework/public/422.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <title>
-      Error 422 | Crowbar
+      Error 422 | SUSE&reg; OpenStack Cloud Crowbar
     </title>
 
     <meta charset="utf-8" />
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/assets/vendor.css" />
     <link rel="stylesheet" href="/assets/application.css" />
     <link rel="stylesheet" href="/assets/branding.css" />
+    <link rel="shortcut icon" href="/assets/suse/favicon.ico" />
 
     <script src="/assets/vendor.js"></script>
     <script src="/assets/application.js"></script>
@@ -35,7 +36,7 @@
             <span class="icon-bar"></span>
           </button>
           <a href="/" class="navbar-brand">
-            <span class="title">Crowbar</span>
+            <span class="title">SUSE&reg; OpenStack Cloud Crowbar</span>
           </a>
         </div>
         <div class="collapse navbar-collapse navbar-right">
@@ -56,16 +57,20 @@
         </div>
         <div class="panel-body">
           <p>
-            Maybe you tried to change something you didn't have access to. If this is an application error, please visit the
-            <a href="http://github.com/crowbar/crowbar/wiki/error">Crowbar site</a> for more information or to submit a bug
-            report. Return to the <a href="/">dashboard</a>.
+            Maybe you tried to change something you didn't have access to.
+            If this is an application error, we encourage you to visit the
+            <a href="http://www.suse.com/support/">SUSE support site</a> for more information.
+            Return to the <a href="/">dashboard</a>.
           </p>
         </div>
       </div>
 
       <footer>
         <span>
-          Provided by <a href="https://crowbar.github.io/" target="_blank">Crowbar</a>
+          <a href="https://www.suse.com/cloud" target="_blank" />SUSE&reg; OpenStack Cloud 8</a>
+        </span>
+        <span>
+          Provided by <a href="https://www.suse.com" target="_blank">SUSE</a>
         </span>
       </footer>
     </div>
diff --git a/crowbar_framework/public/500.html b/crowbar_framework/public/500.html
index bf0505822..797a3b7c6 100644
--- a/crowbar_framework/public/500.html
+++ b/crowbar_framework/public/500.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <title>
-      Error 500 | Crowbar
+      Error 500 | SUSE&reg; OpenStack Cloud Crowbar
     </title>
 
     <meta charset="utf-8" />
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/assets/vendor.css" />
     <link rel="stylesheet" href="/assets/application.css" />
     <link rel="stylesheet" href="/assets/branding.css" />
+    <link rel="shortcut icon" href="/assets/suse/favicon.ico" />
 
     <script src="/assets/vendor.js"></script>
     <script src="/assets/application.js"></script>
@@ -35,7 +36,7 @@
             <span class="icon-bar"></span>
           </button>
           <a href="/" class="navbar-brand">
-            <span class="title">Crowbar</span>
+            <span class="title">SUSE&reg; OpenStack Cloud Crowbar</span>
           </a>
         </div>
         <div class="collapse navbar-collapse navbar-right">
@@ -56,16 +57,20 @@
         </div>
         <div class="panel-body">
           <p>
-            Please consult your <a href="/utils">log files</a> or double check the URL you're trying to reach. If this is an
-            application error, please visit the <a href="http://github.com/crowbar/crowbar/wiki/error">Crowbar site</a> for
-            more information or to submit a bug report. Return to the <a href="/">dashboard</a>.
+            Please consult your <a href="/utils">log files</a> or double check the URL you're trying to reach.
+            If this is an application error, we encourage you to visit the
+            <a href="http://www.suse.com/support/">SUSE support site</a> for more information.
+            Return to the <a href="/">dashboard</a>.
           </p>
         </div>
       </div>
 
       <footer>
         <span>
-          Provided by <a href="https://crowbar.github.io/" target="_blank">Crowbar</a>
+          <a href="https://www.suse.com/cloud" target="_blank" />SUSE&reg; OpenStack Cloud 8</a>
+        </span>
+        <span>
+          Provided by <a href="https://www.suse.com" target="_blank">SUSE</a>
         </span>
       </footer>
     </div>
-- 
2.21.0


From 301e701e7327e637999054fae10cd72bc7ee6bf1 Mon Sep 17 00:00:00 2001
From: Rick Salevsky <rsalevsky@suse.de>
Date: Mon, 5 Oct 2015 16:52:45 +0200
Subject: [PATCH 3/4] Replace documentation

---
 crowbar_framework/config/docs/core.yml | 28 ++++----------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/crowbar_framework/config/docs/core.yml b/crowbar_framework/config/docs/core.yml
index 37688c3ff..da0ee6a25 100644
--- a/crowbar_framework/config/docs/core.yml
+++ b/crowbar_framework/config/docs/core.yml
@@ -4,28 +4,8 @@ en:
       heading: 'Deployment Resources'
       order: 100
       items:
-        crowbar_users_guide:
-          text: 'Crowbar User Guide'
-          pdf: '/docs/crowbar_users_guide.pdf'
+        deployment_guide:
+          text: 'Deployment Guide'
+          link: '/docs/deployment/suse-openstack-cloud-deployment.en.html'
+          pdf: '/docs/suse-openstack-cloud-deployment.en.pdf'
           order: 100
-        crowbar_batch_command:
-          text: 'Crowbar Batch Command'
-          link: '/docs/batch.md'
-          order: 890
-        cisco_ucs_integration:
-          text: 'Cisco UCS Integration'
-          link: '/docs/cisco_ucs.md'
-          order: 900
-
-# Here's an example of how to add links for downstream documentation
-#    others:
-#      heading: 'Other Resources'
-#      items:
-#        end_user_guide:
-#          text: 'End User Guide'
-#          link: '/docs/user/'
-#          pdf: '/docs/user_en.pdf'
-#        admin_user_guide:
-#          text: 'Admin User Guide'
-#          link: '/docs/admin/'
-#          pdf: '/docs/admin_en.pdf'
-- 
2.21.0


From 4f01104a2424f132945e3e0e57e4a67c572d8003 Mon Sep 17 00:00:00 2001
From: Rick Salevsky <rsalevsky@suse.de>
Date: Mon, 5 Oct 2015 16:54:50 +0200
Subject: [PATCH 4/4] Update branding configuration

---
 crowbar_framework/config/branding.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crowbar_framework/config/branding.yml b/crowbar_framework/config/branding.yml
index 24bbe62fb..30020fe3f 100644
--- a/crowbar_framework/config/branding.yml
+++ b/crowbar_framework/config/branding.yml
@@ -16,7 +16,7 @@
 
 # The main page title that gets displayed on all pages on the top bar and within
 # the meta information.
-page_title: 'Crowbar'
+page_title: 'SUSE® OpenStack Cloud Crowbar'
 
 # The page slogan is an optional value. If you don't define it nothings gets
 # printed out. If you define it, it gets printed as a suffix for the page title.
@@ -26,11 +26,11 @@ page_slogan: ''
 # SUSE OpenStack Cloud for example should write something like SUSE OpenStack Cloud v2.0, whereas
 # Crowbar on Dell side writes Version 0.0.1. The variable CROWBAR_VERSION gets
 # replaced by the environment value.
-version: 'Version CROWBAR_VERSION'
+version: '<a href="https://www.suse.com/cloud" target="_new">SUSE&reg; OpenStack Cloud 8</a>'
 
 # The provider will get displayed on the footer of crowbar to show who provides
 # this nice project ;-)
-provider: '<a href="https://crowbar.github.io/" target="_blank">Crowbar</a>'
+provider: '<a href="http://www.suse.com" target="_new">SUSE&reg;</a>'
 
 # The favicon that gets displayed on all pages.
-favicon: ''
+favicon: 'suse/favicon.ico'
-- 
2.21.0

