Merge branch 'userdesign' of /var/www/design into userdesign

3 files changed, 29 insertions, 19 deletions

diff --git a/actions/designsettings.php b/actions/designsettings.php
index e97d01ceb..866d8aaeb 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -71,6 +71,12 @@ class DesignsettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
+        $design = $user->getDesign();
+
+        if (empty($design)) {
+            $design = $this->defaultDesign();
+        }
+
         $this->elementStart('form', array('method' => 'post',
                                           'enctype' => 'multipart/form-data',
                                           'id' => 'form_settings_design',
@@ -122,7 +128,7 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementStart('li');
         $this->checkbox('design_background-image_repeat',
                         _('Tile background image'),
-                        false, null, true, false);
+                        $design->tile);
         $this->elementEnd('li');
 
         $this->elementEnd('ul');
@@ -132,12 +138,6 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Change colours'));
         $this->elementStart('ul', 'form_data');
 
-        $design = $user->getDesign();
-
-        if (empty($design)) {
-            $design = $this->defaultDesign();
-        }
-
         try {
 
             $bgcolor = new WebColor($design->backgroundcolor);
@@ -340,6 +340,8 @@ class DesignsettingsAction extends AccountSettingsAction
 
             $design->backgroundimage = $defaults['backgroundimage'];
 
+            $deisng->tile = $defaults['tile'];
+
         } catch (WebColorException $e) {
             common_log(LOG_ERR, _('Bad default color settings: ' .
                 $e->getMessage()));
@@ -369,6 +371,8 @@ class DesignsettingsAction extends AccountSettingsAction
             return;
         }
 
+        $tile = $this->boolean('design_background-image_repeat');
+
         $user = common_current_user();
         $design = $user->getDesign();
 
@@ -382,6 +386,7 @@ class DesignsettingsAction extends AccountSettingsAction
             $design->textcolor       = $tcolor->intValue();
             $design->linkcolor       = $lcolor->intValue();
             $design->backgroundimage = $filepath;
+            $design->tile            = $tile;
 
             $result = $design->update($original);
 
@@ -405,6 +410,7 @@ class DesignsettingsAction extends AccountSettingsAction
             $design->textcolor       = $tcolor->intValue();
             $design->linkcolor       = $lcolor->intValue();
             $design->backgroundimage = $filepath;
+            $design->tile            = $tile;
 
             $id = $design->insert();
 
diff --git a/classes/Design.php b/classes/Design.php
index acc94d196..4ea176677 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -41,7 +41,7 @@ class Design extends Memcached_DataObject
     public $textcolor;                       // int(4)
     public $linkcolor;                       // int(4)
     public $backgroundimage;                 // varchar(255)
-    public $tile;                            // tinyint(1)  
+    public $tile;                            // tinyint(1)
 
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Design',$k,$v); }
@@ -64,23 +64,26 @@ class Design extends Memcached_DataObject
             common_log(LOG_ERR, "Unable to create color for design $id.",
                 __FILE__);
         }
-        
+
         $css  = 'html, body { background-color: #' . $bgcolor->hexValue() . '} ' . "\n";
         $css .= '#content, #site_nav_local_views .current a { background-color: #';
         $css .= $ccolor->hexValue() . '} '."\n";
         $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . '} ' . "\n";
         $css .= 'html body { color: #'. $tcolor->hexValue() . '} '. "\n";
         $css .= 'a { color: #' . $lcolor->hexValue() . '} ' . "\n";
-        
+
         if (!empty($this->backgroundimage)) {
-        
-            $css .= 'body { background-image:url(' . 
-                Design::url($this->backgroundimage) . 
-                '); background-repeat:no-repeat; }' . "\n";
+
+           $repeat = ($this->tile) ? 'background-repeat:repeat;' :
+               'background-repeat:no-repeat;';
+
+            $css .= 'body { background-image:url(' .
+                Design::url($this->backgroundimage) .
+                '); ' . $repeat . ' }' . "\n";
         }
-        
+
         $out->element('style', array('type' => 'text/css'), $css);
-    
+
     }
 
     static function filename($id, $extension, $extra=null)
@@ -98,7 +101,7 @@ class Design extends Memcached_DataObject
 
         return $dir . $filename;
     }
-    
+
     static function url($filename)
     {
         $path = common_config('background', 'path');
@@ -121,5 +124,5 @@ class Design extends Memcached_DataObject
 
         return 'http://'.$server.$path.$filename;
     }
-    
+
 }
diff --git a/lib/common.php b/lib/common.php
index 0e710625c..629fee25b 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -78,7 +78,8 @@ $config =
                     'sidebarcolor' => '#CEE1E9',
                     'textcolor' => '#000000',
                     'linkcolor' => '#002E6E',
-                    'backgroundimage' => null),
+                    'backgroundimage' => null,
+                    'tile' => true),
               'path' => $_path,
               'logfile' => null,
               'logo' => null,