summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-06-15 21:02:12 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-06-15 21:02:12 +0000
commit2f693c4c9453fc61bea960ba8767fdf68e5130cd (patch)
tree75b6f507989a4b1434012bf6d750a91dc9d0a11d
parent807d84d448fb453de777d7a1ef938150bb03de3e (diff)
Updated swatch numbering
-rw-r--r--actions/designsettings.php21
-rw-r--r--js/farbtastic/farbtastic.go.js12
2 files changed, 16 insertions, 17 deletions
diff --git a/actions/designsettings.php b/actions/designsettings.php
index dba983fdf..46a5843f8 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 0149eca7d..4e0493b40 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:
- $('#content').css({'background-color':C});
- break;
case 2:
- $('#aside_primary').css({'background-color':C});
+ $('#content').css({'background-color':C});
break;
case 3:
- $('body').css({'color':C});
+ $('#aside_primary').css({'background-color':C});
break;
case 4:
+ $('html body').css({'color':C});
+ break;
+ case 5:
$('a').css({'color':C});
break;
}