From 2f693c4c9453fc61bea960ba8767fdf68e5130cd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 15 Jun 2009 21:02:12 +0000
Subject: [PATCH 1/2] Updated swatch numbering

---
 actions/designsettings.php     | 21 ++++++++++-----------
 js/farbtastic/farbtastic.go.js | 12 ++++++------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/actions/designsettings.php b/actions/designsettings.php
index dba983fdf7..46a5843f87 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -106,10 +106,10 @@ class DesignsettingsAction extends AccountSettingsAction
         }
 
         $this->elementStart('li');
-        $this->element('label', array('for' => 'swatch-0'), _('Background'));
+        $this->element('label', array('for' => 'swatch-1'), _('Background'));
         $this->element('input', array('name' => 'design_background',
                                       'type' => 'text',
-                                      'id' => 'swatch-0',
+                                      'id' => 'swatch-1',
                                       'class' => 'swatch',
                                       'maxlength' => '7',
                                       'size' => '7',
@@ -117,10 +117,10 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('li');
         
         $this->elementStart('li');
-        $this->element('label', array('for' => 'swatch-1'), _('Content'));
+        $this->element('label', array('for' => 'swatch-2'), _('Content'));
         $this->element('input', array('name' => 'design_content',
                                       'type' => 'text',
-                                      'id' => 'swatch-1',
+                                      'id' => 'swatch-2',
                                       'class' => 'swatch',
                                       'maxlength' => '7',
                                       'size' => '7',
@@ -128,10 +128,10 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('li');
     
         $this->elementStart('li');                          
-        $this->element('label', array('for' => 'swatch-2'), _('Sidebar'));
+        $this->element('label', array('for' => 'swatch-3'), _('Sidebar'));
         $this->element('input', array('name' => 'design_sidebar',
                                     'type' => 'text',
-                                    'id' => 'swatch-2',
+                                    'id' => 'swatch-3',
                                     'class' => 'swatch',
                                     'maxlength' => '7',
                                     'size' => '7',
@@ -139,10 +139,10 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('li');
 
         $this->elementStart('li');                          
-        $this->element('label', array('for' => 'swatch-3'), _('Text'));
+        $this->element('label', array('for' => 'swatch-4'), _('Text'));
         $this->element('input', array('name' => 'design_text',
                                     'type' => 'text',
-                                    'id' => 'swatch-3',
+                                    'id' => 'swatch-4',
                                     'class' => 'swatch',
                                     'maxlength' => '7',
                                     'size' => '7',
@@ -150,15 +150,14 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('li');
 
         $this->elementStart('li');
-        $this->element('label', array('for' => 'swatch-4'), _('Links'));
+        $this->element('label', array('for' => 'swatch-5'), _('Links'));
         $this->element('input', array('name' => 'design_links',
                                      'type' => 'text',
-                                     'id' => 'swatch-4',
+                                     'id' => 'swatch-5',
                                      'class' => 'swatch',
                                      'maxlength' => '7',
                                      'size' => '7',
                                      'value' => $design->linkcolor));
-
        $this->elementEnd('li');
 
        $this->elementEnd('ul');
diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 0149eca7d9..4e0493b40a 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -10,19 +10,19 @@ $(document).ready(function() {
     function UpdateColors(S) {
         C = $(S).val();
         switch (parseInt(S.id.slice(-1))) {
-            case 0: default:
+            case 1: default:
                 $('body').css({'background-color':C});
                 break;
-            case 1:
+            case 2:
                 $('#content').css({'background-color':C});
                 break;
-            case 2:
+            case 3:
                 $('#aside_primary').css({'background-color':C});
                 break;
-            case 3:
-                $('body').css({'color':C});
-                break;
             case 4:
+                $('html body').css({'color':C});
+                break;
+            case 5:
                 $('a').css({'color':C});
                 break;
         }

From bd8f9a979acb1607e00499dfba223a51b57596af Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 02:33:10 +0000
Subject: [PATCH 2/2] Converts user entry in the form of '#1B2' into '#11BB22'
 for user design swatches

---
 js/farbtastic/farbtastic.go.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 4e0493b40a..2f202ced1f 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -59,7 +59,9 @@ $(document).ready(function() {
         swatches
             .each(SynchColors)
             .blur(function() {
-                $(this).val($(this).val().toUpperCase());
+                tv = $(this).val();
+                $(this).val(tv.toUpperCase());
+                (tv.length == 4) ? ((tv[0] == '#') ? $(this).val('#'+tv[1]+tv[1]+tv[2]+tv[2]+tv[3]+tv[3]) : '') : '';
              })
             .focus(function() {
                 $('#color-picker').show();