From: garvinhicking <garvinhicking>
Date: Wed, 29 Aug 2007 19:56:48 +0000 (+0000)
Subject: backport
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6b54a8cc96e3eaa5683ceba1513161eb0f8be064;p=s9y.git

backport
---

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index ce396b2..706b2b9 100644
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -8,21 +8,35 @@ $probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $sere
 if (file_exists($probelang)) {
     include $probelang;
 }
-    
+
 include dirname(__FILE__) . '/lang_en.inc.php';
 
 $serendipity['smarty']->assign(array('currpage'=> "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']));
 
+$colorsets = array(
+    'purple' => BP_COLORSET_OPT1,
+    'blue'   => BP_COLORSET_OPT2,
+    'green'  => BP_COLORSET_OPT3,
+    'blank'  => BP_COLORSET_DEF
+);
+
+if ($serendipity['GET']['adminModule'] == 'templates') {
+    $css_files = glob(dirname(__FILE__) . '/*_style.css');
+    foreach($css_files AS $css_file) {
+        $css_file = str_replace('_style.css', '', basename($css_file));
+        if (!isset($colorsets[$css_file])) {
+            $colorsets[$css_file] = $css_file;
+        }
+    }
+}
+
 $template_config = array(
     array(
         'var'           => 'colorset',
         'name'          => THEME_COLORSET,
         'type'          => 'select',
         'default'       => 'purple',
-        'select_values' => array('purple' => BP_COLORSET_OPT1,
-                                 'blue' => BP_COLORSET_OPT2,
-                                 'green' => BP_COLORSET_OPT3,
-                                 'blank' => BP_COLORSET_DEF)
+        'select_values' => $colorsets
     ),
     array(
         'var'           => 'layouttype',