Merge pull request #1163 from splitbrain/styler

Template Style Dialog Plugin

2 files changed, 8 insertions, 0 deletions

diff --git a/inc/html.php b/inc/html.php
index 1ccc056de..0914a1762 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -2080,6 +2080,13 @@ function html_admin(){
                     $menu['config']['prompt'].'</a></div></li>');
         }
         unset($menu['config']);
+
+        if($menu['styling']){
+            ptln('  <li class="admin_styling"><div class="li">'.
+                '<a href="'.wl($ID, array('do' => 'admin','page' => 'styling')).'">'.
+                $menu['styling']['prompt'].'</a></div></li>');
+        }
+        unset($menu['styling']);
     }
     ptln('</ul>');
 
diff --git a/inc/template.php b/inc/template.php
index c7dea6b46..f918d1a04 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -297,6 +297,7 @@ function tpl_metaheaders($alt = true) {
     // prepare seed for js and css
     $tseed   = $updateVersion;
     $depends = getConfigFiles('main');
+    $depends[] = DOKU_CONF."tpl/".$conf['template']."/style.ini";
     foreach($depends as $f) $tseed .= @filemtime($f);
     $tseed   = md5($tseed);