updating config files for duepuntozero

diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index f8209bb872b1c302597c6263989b1c7f3a3d10b9..edf12c35fa10c185f073381d7dadd6db108e9133 100644 (file)
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -43,6 +43,11 @@ function clean_form(&$a, &$colorset, $user){
     $colorset = array(
        'default'=>t('default'), 
         'greenzero'=>t('greenzero'),
+        'purplezero'=>t('purplezero'),
+        'easterbunny'=>t('easterbunny'),
+        'darkzero'=>t('darkzero'),
+        'comix'=>t('comix'),
+        'slackr'=>t('slackr'),
     );
     if ($user) {
         $color = get_pconfig(local_user(), 'duepuntozero', 'colorset');
@@ -54,7 +59,7 @@ function clean_form(&$a, &$colorset, $user){
         '$submit' => t('Submit'),
         '$baseurl' => $a->get_baseurl(),
         '$title' => t("Theme settings"),
-        '$colorset' => array('duepuntozero_colorset', t('Color scheme'), $color, '', $colorset),
+        '$colorset' => array('duepuntozero_colorset', t('Variations'), $color, '', $colorset),
     ));
     return $o;
 }

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index e6c276c0a3e3d2229e49d439ca1a2960675920e4..ba3f25d3e26e002b461e8d97ac433d3ddca286e4 100644 (file)
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -5,6 +5,23 @@ function duepuntozero_init(&$a) {
 $a->theme_info = array();
 set_template_engine($a, 'smarty3');
 
+    $colorset = get_pconfig( local_user(), 'duepuntozero','colorset');
+    if (!$colorset)
+       $colorset = get_config('duepuntozero', 'colorset');          // user setting have priority, then node settings
+    if ($colorset) {
+        if ($colorset == 'greenzero')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
+        if ($colorset == 'purplezero')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/purplezero.css" type="text/css" media="screen" />'."\n";
+        if ($colorset == 'easterbunny')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/easterbunny.css" type="text/css" media="screen" />'."\n";
+        if ($colorset == 'darkzero')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/darkzero.css" type="text/css" media="screen" />'."\n";
+        if ($colorset == 'comix')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/comix.css" type="text/css" media="screen" />'."\n";
+        if ($colorset == 'slackr')
+            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/slackr.css" type="text/css" media="screen" />'."\n";
+    }
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {