summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-14 02:03:50 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-14 02:03:50 -0700
commit946d016df2a5e0af5e1b4b983b30c113dd02b4ea (patch)
tree36933bc1817238b313a479fb97e0b296f136892e
parentd0eb2058a519941e205f7b0960d9a5e0707207bb (diff)
Reworked output for design settings page
-rw-r--r--actions/designsettings.php164
-rw-r--r--lib/common.php7
2 files changed, 136 insertions, 35 deletions
diff --git a/actions/designsettings.php b/actions/designsettings.php
index 66476e677..8595cbc4c 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -22,6 +22,7 @@
* @category Settings
* @package Laconica
* @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Zach Copley <zach@controlyourself.ca>
* @copyright 2008-2009 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
@@ -104,42 +105,73 @@ class DesignsettingsAction extends AccountSettingsAction
$design = $this->defaultDesign();
}
- $labelSwatch = array('Background',
- 'Content',
- 'Sidebar',
- 'Text',
- 'Links');
-
- foreach($userSwatch as $propertyvalue => $value) {
- $foo = array_values($value);
- $this->elementStart('li');
- $this->element('label', array('for' => 'swatch-'.$s), _($labelSwatch[$s]));
- $this->element('input', array('name' => 'swatch-'.$s, //prefer swatch[$s] ?
- 'type' => 'text',
- 'id' => 'swatch-'.$s,
- 'class' => 'swatch',
- 'maxlength' => '7',
- 'size' => '7',
- 'value' => $foo[0]));
- $this->elementEnd('li');
- $s++;
- }
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'swatch-5'), _('Background'));
+ $this->element('input', array('name' => 'design_background',
+ 'type' => 'text',
+ 'id' => 'swatch-5',
+ 'class' => 'swatch',
+ 'maxlength' => '7',
+ 'size' => '7',
+ 'value' => $design->backgroundcolor));
+ $this->elementEnd('li');
+
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'swatch-1'), _('Content'));
+ $this->element('input', array('name' => 'design_content',
+ 'type' => 'text',
+ 'id' => 'swatch-1',
+ 'class' => 'swatch',
+ 'maxlength' => '7',
+ 'size' => '7',
+ 'value' => $design->contentcolor));
+ $this->elementEnd('li');
+
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'swatch-2'), _('Sidebar'));
+ $this->element('input', array('name' => 'design_sidebar',
+ 'type' => 'text',
+ 'id' => 'swatch-2',
+ 'class' => 'swatch',
+ 'maxlength' => '7',
+ 'size' => '7',
+ 'value' => $design->sidebarcolor));
+ $this->elementEnd('li');
- $this->elementEnd('ul');
- $this->elementEnd('fieldset');
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'swatch-3'), _('Text'));
+ $this->element('input', array('name' => 'design_text',
+ 'type' => 'text',
+ 'id' => 'swatch-3',
+ 'class' => 'swatch',
+ 'maxlength' => '7',
+ 'size' => '7',
+ 'value' => $design->textcolor));
+ $this->elementEnd('li');
- $this->element('input', array('id' => 'settings_design_reset',
- 'type' => 'reset',
- 'value' => 'Reset',
- 'class' => 'submit form_action-primary',
- 'title' => _('Reset back to default')));
- $this->submit('save', _('Save'), 'submit form_action-secondary', 'save', _('Save design'));
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'swatch-4'), _('Links'));
+ $this->element('input', array('name' => 'design_links',
+ 'type' => 'text',
+ 'id' => 'swatch-4',
+ 'class' => 'swatch',
+ 'maxlength' => '7',
+ 'size' => '7',
+ 'value' => $design->linkcolor));
- /*TODO: Check submitted form values:
- json_encode(form values)
- if submitted Swatch == DefaultSwatch, don't store in DB.
- else store in BD
- */
+ $this->elementEnd('li');
+
+ $this->elementEnd('ul');
+ $this->elementEnd('fieldset');
+
+ $this->element('input', array('id' => 'settings_design_reset',
+ 'type' => 'reset',
+ 'value' => 'Reset',
+ 'class' => 'submit form_action-primary',
+ 'title' => _('Reset back to default')));
+
+ $this->submit('save', _('Save'), 'submit form_action-secondary',
+ 'save', _('Save design'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
@@ -156,8 +188,21 @@ class DesignsettingsAction extends AccountSettingsAction
function handlePost()
{
- // TODO: implement this
- return;
+ // CSRF protection
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->showForm(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ return;
+ }
+
+ if ($this->arg('save')) {
+ $this->saveDesign();
+ } else if ($this->arg('reset')) {
+ $this->resetDesign();
+ } else {
+ $this->showForm(_('Unexpected form submission.'));
+ }
}
/**
@@ -196,4 +241,53 @@ class DesignsettingsAction extends AccountSettingsAction
$this->element('script', array('type' => 'text/javascript',
'src' => $farbtasticGo));
}
+
+ /**
+ * Get a default user design
+ *
+ * @return Design design
+ */
+
+ function defaultDesign()
+ {
+ $defaults = common_config('site', 'design');
+
+ $design = new Design();
+ $design->backgroundcolor = $defaults['backgroundcolor'];
+ $design->contentcolor = $defaults['contentcolor'];
+ $design->sidebarcolor = $defaults['sidebarcolor'];
+ $design->textcolor = $defaults['textcolor'];
+ $design->linkcolor = $defaults['linkcolor'];
+ $design->backgroundimage = $defaults['backgroundimage'];
+
+ return $design;
+ }
+
+ /**
+ * Save the user's design settings
+ *
+ * @return void
+ */
+
+ function saveDesign()
+ {
+ $user = common_current_user();
+
+
+
+ $this->showForm(_('Design preferences saved.'), true);
+ }
+
+ /**
+ * Reset design settings to previous saved value if any, or
+ * the defaults
+ *
+ * @return void
+ */
+
+ function resetDesign()
+ {
+ $this->showForm(_('Design preferences reset.'), true);
+ }
+
}
diff --git a/lib/common.php b/lib/common.php
index 5aafdfe0e..a55fb264e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -72,6 +72,13 @@ $config =
'server' => $_server,
'theme' => 'default',
'skin' => 'default',
+ 'design' =>
+ array('backgroundcolor' => '#F0F2F5',
+ 'contentcolor' => '#FFFFFF',
+ 'sidebarcolor' => '#CEE1E9',
+ 'textcolor' => '#000000',
+ 'linkcolor' => '#002E6E',
+ 'backgroundimage' => null),
'path' => $_path,
'logfile' => null,
'logo' => null,