Option to set theme width added. Minor layout changes

diff --git a/view/theme/cleanzero/config.php b/view/theme/cleanzero/config.php
index 7982a75c5b9ca61c8cf07e72e95464d1829b1738..312e9d3dd2c7fdb1036c34a81227db2c50486178 100644 (file)
--- a/view/theme/cleanzero/config.php
+++ b/view/theme/cleanzero/config.php
@@ -12,8 +12,9 @@ function theme_content(&$a){
        $resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
        $color = get_pconfig(local_user(), 'cleanzero', 'color' );
        $font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
+       $theme_width= get_pconfig(local_user(), 'cleanzero', 'theme_width' );
        
-       return cleanzero_form($a,$color,$font_size,$resize);
+       return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
 }
 
 function theme_post(&$a){
@@ -24,6 +25,7 @@ function theme_post(&$a){
                set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);   
                set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
                set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+               set_pconfig(local_user(), 'cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
        }
 }
 
@@ -32,8 +34,8 @@ function theme_admin(&$a){
        $resize = get_config('cleanzero', 'resize' );
        $color = get_config('cleanzero', 'color' );
        $font_size = get_config('cleanzero', 'font_size' );
-       
-       return cleanzero_form($a,$color,$font_size,$resize);
+       $theme_width= get_config('cleanzero', 'theme_width' );
+       return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
 }
 
 function theme_admin_post(&$a){
@@ -41,11 +43,13 @@ function theme_admin_post(&$a){
                set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
                set_config('cleanzero', 'color', $_POST['cleanzero_color']);
                set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+               set_config('cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
+
        }
 }
 
 
-function cleanzero_form(&$a, $color,$font_size,$resize){
+function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
        $colors = array(
                "cleanzero"=>"cleanzero", 
                "cleanzero-green"=>"green",
@@ -65,7 +69,12 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
                "250"=>"3 (250px)",
                "150"=>"4 (150px)",
               );
-       
+       $theme_widths =array (
+               "standard"=>"standard",
+               "narrow"=>"narrow",
+               "wide"=>"wide",
+               );
+
        $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
@@ -73,6 +82,7 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
                '$title' => t("Theme settings"),
                '$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
                '$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+               '$theme_width' => array('cleanzero_theme_width', t('Set theme width'), $theme_width, '', $theme_widths),
                '$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
        ));
        return $o;

diff --git a/view/theme/cleanzero/style.php b/view/theme/cleanzero/style.php
index b820d3b7a17f0f01ff5e6a73d61e060f9489e56e..682c527f1c08fdd86692cc3d0b000c74615046c9 100644 (file)
--- a/view/theme/cleanzero/style.php
+++ b/view/theme/cleanzero/style.php
@@ -1,21 +1,24 @@
 <?php
        $color=false;
        $cleanzero_font_size=false;
+       $cleanzero_theme_width=false;
 
        $site_color = get_config("cleanzero","color");
        $site_cleanzero_font_size = get_config("cleanzero", "font_size" );
-
+       $site_cleanzero_theme_width = get_config("cleanzero", "theme_width");
        
        if (local_user()) {
                $color = get_pconfig(local_user(), "cleanzero","color");
                $cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
+               $cleanzero_theme_width = get_pconfig(local_user(), "cleanzero", "theme_width");
        
        }
        
        if ($color===false) $color=$site_color;
        if ($color===false) $color="cleanzero";
        if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
-
+       if ($cleanzero_theme_width===false) $cleanzero_theme_width=$site_cleanzero_theme_width;
+       if ($cleanzero_theme_width===false) $cleanzero_theme_width="standard";
        
                
        if (file_exists("$THEMEPATH/$color/style.css")){
@@ -68,4 +71,70 @@
                                        }
                ";
        }
+       if ($cleanzero_theme_width === "standard") {
+               echo "
+                     section {
+                       margin: 0px 10%;
+                       margin-right:10%;
+                       }
+
+                     aside {
+                       margin-left: 10%;
+                      }
+                     nav {
+                       margin-left: 10%;
+                       margin-right: 10%;
+
+                      }
+
+                     nav #site-location {
+                       right: 10%;
+
+                      }
+               ";
+       }
+
+       if ($cleanzero_theme_width === "narrow") {
+               echo "
+                     section {
+                       margin: 0px 15%;
+                       margin-right:15%;
+                       }
+
+                     aside {
+                       margin-left: 15%;
+                      }
+                     nav {
+                       margin-left: 15%;
+                       margin-right: 15%;
 
+                      }
+
+                     nav #site-location {
+                       right: 15%;
+
+                      }
+               ";
+       }
+       if ($cleanzero_theme_width === "wide") {
+               echo "
+                     section {
+                       margin: 0px 5%;
+                       margin-right:5%;
+                       }
+
+                     aside {
+                       margin-left: 5%;
+                      }
+                     nav {
+                       margin-left: 5%;
+                       margin-right: 5%;
+
+                      }
+
+                     nav #site-location {
+                       right: 5%;
+
+                      }
+               ";
+       }

diff --git a/view/theme/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
index 07e7cba05095f39629909c4498e59ca28e9c8ae9..bfe18af27d9e3445fec331440f6d3ed84a71600b 100644 (file)
--- a/view/theme/cleanzero/theme_settings.tpl
+++ b/view/theme/cleanzero/theme_settings.tpl
@@ -1,7 +1,7 @@
 {{inc field_select.tpl with $field=$color}}{{endinc}}
 {{inc field_select.tpl with $field=$font_size}}{{endinc}}
 {{inc field_select.tpl with $field=$resize}}{{endinc}}
-
+{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
 
 
 <div class="settings-submit-wrapper">