From 640dc04cf5551d6a5a86fd2e6e191fc484fcf8c6 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Mon, 13 Oct 2014 18:08:59 +1100
Subject: [PATCH] Dedicated layout partial for custom styles

---
 modules/backend/layouts/_custom_styles.htm | 19 +++++++++++++++++++
 modules/backend/layouts/_head.htm          |  3 ++-
 modules/backend/layouts/auth.htm           | 13 +++----------
 modules/backend/layouts/default.htm        |  8 --------
 modules/backend/models/BackendSettings.php |  4 ++++
 5 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 modules/backend/layouts/_custom_styles.htm
diff --git a/modules/backend/layouts/_custom_styles.htm b/modules/backend/layouts/_custom_styles.htm
new file mode 100644
index 000000000..8e3a56291
--- /dev/null
+++ b/modules/backend/layouts/_custom_styles.htm
@@ -0,0 +1,19 @@
+<?php
+    use Backend\Models\BackendSettings;
+?>
+<?php if (BackendSettings::isConfigured()): ?>
+<?php
+    $logo = Backend\Models\BackendSettings::getLogo();
+?>
+
+    <style>
+        .oc-bg-logo {
+            background-image: linear-gradient(to bottom, rgba(249,249,249,0.7) 0%,rgba(249,249,249,0.7) 100%), url(<?= \Backend\Models\BackendSettings::getLogo() ?>);
+        }
+        .oc-logo-white {
+            background-image: url(<?= $logo ?>);
+            height: 170px !important;
+        }
+    </style>
+
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index e224d731e..c790eb592 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -80,4 +80,5 @@
 // -->
 </script>
 <?= $this->makeAssets() ?>
-<?= Block::placeholder('head') ?>
\ No newline at end of file
+<?= Block::placeholder('head') ?>
+<?= $this->makeLayoutPartial('custom_styles') ?>
\ No newline at end of file
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index 2b4ea1178..ba9058093 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -12,7 +12,7 @@
         <script src="<?= URL::to('modules/backend/assets/js/vendor/modernizr.min.js') ?>"></script>
         <script src="<?= URL::to('modules/backend/assets/js/october.flashmessage.js') ?>"></script>
         <script src="<?= URL::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
-        
+
         <script>
         <!--
             backendBasePath = '<?= Backend::baseUrl() ?>';
@@ -20,10 +20,12 @@
         </script>
         <?= $this->makeAssets() ?>
         <?= Block::placeholder('head') ?>
+        <?= $this->makeLayoutPartial('custom_styles') ?>
     </head>
     <body class="outer <?= $this->bodyClass ?>">
         <div id="layout-canvas">
             <div class="layout">
+
                 <div class="layout-row min-size layout-head">
                     <div class="layout-cell">
                         <h1 class="oc-logo-white"><?= e(trans('system::lang.app.name')) ?></h1>
@@ -41,15 +43,6 @@
 
             </div>
         </div><!-- /layout-canvas -->
-
-        <?php if ($logo = \Backend\Models\BackendSettings::getLogo()): ?>
-            <style>
-                .oc-logo-white {
-                    background-image: url(<?= $logo ?>);
-                    height: 170px !important;
-                }
-            </style>
-        <?php endif ?>
     </body>
 </html>
 
diff --git a/modules/backend/layouts/default.htm b/modules/backend/layouts/default.htm
index 66a83a088..59a95ea17 100644
--- a/modules/backend/layouts/default.htm
+++ b/modules/backend/layouts/default.htm
@@ -47,13 +47,5 @@
 
             </div>
         </div>
-
-        <?php if ($logo = \Backend\Models\BackendSettings::getLogo()): ?>
-            <style>
-                .oc-bg-logo {
-                    background-image: linear-gradient(to bottom, rgba(249,249,249,0.7) 0%,rgba(249,249,249,0.7) 100%), url(<?= \Backend\Models\BackendSettings::getLogo() ?>);
-                }
-            </style>
-        <?php endif ?>
     </body>
 </html>
\ No newline at end of file
diff --git a/modules/backend/models/BackendSettings.php b/modules/backend/models/BackendSettings.php
index 4069f78d6..f3e3234c8 100644
--- a/modules/backend/models/BackendSettings.php
+++ b/modules/backend/models/BackendSettings.php
@@ -35,7 +35,11 @@ class BackendSettings extends Model
     {
         $this->app_name = Lang::get('system::lang.app.name');
         $this->app_motto = Lang::get('system::lang.app.motto');
+
+        // Carrot
         $this->primary_color = '#e67e22';
+
+        // Midnight Blue
         $this->secondary_color = '#2b3e50';
     }
 
