From 50f98abfd3a9843c8e4ac0433a4fbf41757be46e Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 16 Mar 2015 22:12:16 -0400
Subject: Merge and improve pull-request #666 (custom stylesheet)

---
 app/Template/config/application.php | 3 +++
 app/Template/layout.php             | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'app/Template')

diff --git a/app/Template/config/application.php b/app/Template/config/application.php
index 26f3743e..f6c9db94 100644
--- a/app/Template/config/application.php
+++ b/app/Template/config/application.php
@@ -20,6 +20,9 @@
     <?= $this->formSelect('application_date_format', $date_formats, $values, $errors) ?><br/>
     <p class="form-help"><?= t('ISO format is always accepted, example: "%s" and "%s"', date('Y-m-d'), date('Y_m_d')) ?></p>
 
+    <?= $this->formLabel(t('Custom Stylesheet'), 'application_stylesheet') ?>
+    <?= $this->formTextarea('application_stylesheet', $values, $errors) ?><br/>
+
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
     </div>
diff --git a/app/Template/layout.php b/app/Template/layout.php
index 9290a21e..68028240 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -17,6 +17,10 @@
         <?= $this->css($this->u('app', 'colors'), false) ?>
         <?= $this->css('assets/css/app.css') ?>
 
+        <?php if ($this->config->get('application_stylesheet')): ?>
+            <style><?= $this->e($this->config->get('application_stylesheet')) ?></style>
+        <?php endif ?>
+
         <link rel="icon" type="image/png" href="assets/img/favicon.png">
         <link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png">
         <link rel="apple-touch-icon" sizes="72x72" href="assets/img/touch-icon-ipad.png">
-- 
cgit v1.2.3