Added background image tile flag to Design

diff --git a/classes/Design.php b/classes/Design.php
index f5c87b489c0d9f967c5f0be18ba4929bc0533747..acc94d1969099c18e10a03a09c4eaaaec3d0c465 100644 (file)
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -41,6 +41,7 @@ class Design extends Memcached_DataObject
     public $textcolor;                       // int(4)
     public $linkcolor;                       // int(4)
     public $backgroundimage;                 // varchar(255)
+    public $tile;                            // tinyint(1)  
 
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Design',$k,$v); }
@@ -63,23 +64,23 @@ 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) .
+        
+            $css .= 'body { background-image:url(' . 
+                Design::url($this->backgroundimage) . 
                 '); background-repeat:no-repeat; }' . "\n";
         }
-
+        
         $out->element('style', array('type' => 'text/css'), $css);
-
+    
     }
 
     static function filename($id, $extension, $extra=null)
@@ -97,7 +98,7 @@ class Design extends Memcached_DataObject
 
         return $dir . $filename;
     }
-
+    
     static function url($filename)
     {
         $path = common_config('background', 'path');
@@ -120,5 +121,5 @@ class Design extends Memcached_DataObject
 
         return 'http://'.$server.$path.$filename;
     }
-
+    
 }

diff --git a/classes/laconica.ini b/classes/laconica.ini
index c04ae758f4785a50f32b579b8618c9e542459f4f..56968198487d98d0763531b6db67bd1e86dc1e92 100755 (executable)
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -46,6 +46,7 @@ sidebarcolor = 1
 textcolor = 1
 linkcolor = 1
 backgroundimage = 2
+tile = 17
 
 [design__keys]
 id = N

diff --git a/db/laconica.sql b/db/laconica.sql
index bd95d1ade639063ccdbd1ac15cf6f2f11edc486d..1f302de167a45a0ea5532ee97fa8221ea53fbc9e 100644 (file)
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -495,7 +495,8 @@ create table design (
     sidebarcolor integer comment 'sidebar background color',
     textcolor integer comment 'text color',
     linkcolor integer comment 'link color',
-    backgroundimage varchar(255) comment 'background image, if any'
+    backgroundimage varchar(255) comment 'background image, if any',
+    tile tinyint default 0 comment 'tile background image'
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table group_block (