From 12867d114d8d40bf9a45b3e1eb9b0e50d736d333 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 24 Apr 2009 17:22:43 +0000
Subject: UI for server errors.

---
 theme/base/css/display.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2fb1c007f..0bc2e68b6 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -86,7 +86,7 @@ border:0;
 
 .error,
 .success {
-padding:4px 7px;
+padding:4px 1.55%;
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -426,6 +426,7 @@ line-height:1;
 #form_notice fieldset {
 border:0;
 padding:0;
+position:relative;
 }
 #form_notice legend {
 display:none;
@@ -480,7 +481,13 @@ margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-
+#form_notice .error {
+float:left;
+clear:both;
+width:96.9%;
+margin-bottom:0;
+line-height:1.618;
+}
 
 /* entity_profile */
 .entity_profile {
-- 
cgit v1.2.3-54-g00ecf


From efe8c47d7d9e91eb8308845b8b0717e84e36e346 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 27 Apr 2009 20:07:22 +0000
Subject: Minor CSS order/cleanup.

---
 theme/base/css/display.css | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0bc2e68b6..dc6b4bc29 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -842,23 +842,6 @@ text-transform:lowercase;
 }
 
 
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
 .notice-options {
 padding-left:2%;
 float:left;
@@ -1036,6 +1019,8 @@ padding-right:30px;
 .hentry .entry-content p {
 margin-bottom:18px;
 }
+.system_notice ul,
+.instructions ul,
 .hentry entry-content ol,
 .hentry .entry-content ul {
 list-style-position:inside;
@@ -1160,9 +1145,6 @@ clear:both;
 margin-bottom:0;
 }
 
-.instructions ul {
-list-style-position:inside;
-}
 .instructions p,
 .instructions ul {
 margin-bottom:18px;
-- 
cgit v1.2.3-54-g00ecf


From 1fde80cf73c3cf43e3613f7f57fe213df688a1ec Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 1 May 2009 23:32:59 +0000
Subject: Minor CSS updates (No min-height on shownotice page, site_notice is
 floated instead of positioned absolutely, notice entry-content is aligned
 with the nickname on shownotice page)

---
 theme/base/css/display.css | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index efa5f4ac6..c242977a9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -248,10 +248,10 @@ display:none;
 }
 
 #site_notice {
-position:absolute;
-top:65px;
-right:18px;
-width:250px;
+float:right;
+clear:right;
+margin-top:7px;
+margin-right:18px;
 width:24%;
 }
 #page_notice {
@@ -397,6 +397,9 @@ border-radius:7px;
 border-style:solid;
 border-width:1px;
 }
+#shownotice #content {
+min-height:0;
+}
 
 #content_inner {
 position:relative;
@@ -812,11 +815,14 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:70%;
+width:65%;
 }
 #showstream .notice div.entry-content {
 margin-left:0;
 }
+#shownotice .notice div.entry-content {
+margin-left:108px;
+}
 
 .notice .notice-options a,
 .notice .notice-options input {
-- 
cgit v1.2.3-54-g00ecf


From 51377258a1660fee02a3f92436dc40ee40f2a88d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sat, 2 May 2009 00:10:50 +0000
Subject: Aligned shownotice page's entry-content to left. Fixing vcard photo
 margin bottom value.

---
 theme/base/css/display.css | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c242977a9..10fc63638 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -769,16 +769,14 @@ overflow:hidden;
 font-weight:bold;
 }
 
-.notice .author .photo {
-margin-bottom:0;
-}
-
 .vcard .photo {
 display:inline;
 margin-right:11px;
-margin-bottom:11px;
 float:left;
 }
+#shownotice .vcard .photo {
+margin-bottom:4px;
+}
 .vcard .url {
 text-decoration:none;
 }
@@ -817,11 +815,9 @@ font-size:0.95em;
 margin-left:59px;
 width:65%;
 }
-#showstream .notice div.entry-content {
-margin-left:0;
-}
+#showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
-margin-left:108px;
+margin-left:0;
 }
 
 .notice .notice-options a,
-- 
cgit v1.2.3-54-g00ecf


From dcd69eec9098fd6bc6340a233796d6b242953057 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 18 May 2009 23:23:00 +0000
Subject: Increase entity_profile fn, nickname font-size slightly. Gave
 entity_profile more width.

---
 theme/base/css/display.css | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index dc6b4bc29..8029a5eee 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -492,7 +492,7 @@ line-height:1.618;
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:67.702%;
+width:74.702%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -528,12 +528,15 @@ margin-bottom:4px;
 .entity_profile .entity_nickname {
 margin-left:11px;
 display:inline;
-font-weight:bold;
 }
 .entity_profile .entity_nickname {
 margin-left:0;
 }
-
+.entity_profile .fn,
+.entity_profile .nickname {
+font-size:1.1em;
+font-weight:bold;
+}
 .entity_profile .entity_fn dd:before {
 content: "(";
 font-weight:normal;
@@ -555,7 +558,7 @@ display:none;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:4.35%;
+margin-left:2.35%;
 max-width:25%;
 }
 .entity_actions h2 {
-- 
cgit v1.2.3-54-g00ecf


From da74a29e0385042e974dbe50c03acd160f982e18 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 18 May 2009 23:45:45 +0000
Subject: Using list-style-position:inside for lists so that bullets don't leak
 out of the container.

Added more padding to groups with most posts table
---
 theme/base/css/display.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 547752b51..eda04be77 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -639,6 +639,7 @@ margin-bottom:29px;
 clear:both;
 float:left;
 width:100%;
+list-style-position:inside;
 }
 .aside .section h2 {
 text-transform:uppercase;
@@ -662,6 +663,7 @@ list-style-type:none;
 float:left;
 margin-right:7px;
 margin-bottom:7px;
+display:inline;
 }
 .section .entities li .photo {
 margin-right:0;
@@ -1042,7 +1044,7 @@ margin-left:18px;
 
 /* TOP_POSTERS */
 .section tbody td {
-padding-right:11px;
+padding-right:18px;
 padding-bottom:11px;
 }
 .section .vcard .photo {
-- 
cgit v1.2.3-54-g00ecf


From 0c442e459e42b5d5aa168f7e2d3a0ff9f6bb0cd5 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 19 May 2009 17:05:30 +0000
Subject: Added reset button Rearranged swatch layout Added background image
 upload input file

---
 actions/designsettings.php     | 36 ++++++++++++++++++++++++++++--------
 js/farbtastic/farbtastic.go.js |  2 +-
 theme/base/css/display.css     | 11 +++++++++++
 3 files changed, 40 insertions(+), 9 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/actions/designsettings.php b/actions/designsettings.php
index 0deb3f684..a85b36a25 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -82,7 +82,16 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Change background image'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->element('p', null, _('Upload background image'));
+        $this->element('label', array('for' => 'design_ background-image_file'), 
+                                _('Upload file'));
+        $this->element('input', array('name' => 'design_background-image_file',
+                                      'type' => 'file',
+                                      'id' => 'design_background-image_file'));
+        $this->element('p', 'form_guide', _('You can upload your personal background image. The maximum file size is 2Mb.'));
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                      'type' => 'hidden',
+                                      'id' => 'MAX_FILE_SIZE',
+                                      'value' => ImageFile::maxFileSizeInt()));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
@@ -108,15 +117,22 @@ class DesignsettingsAction extends AccountSettingsAction
         $userSwatch = ($userSwatch) ? json_decode($userSwatch, true) : $defaultSwatch;
 
         $s = 0;
-        $labelSwatch = array('Background color',
-                             'Content background color',
-                             'Sidebar background color',
-                             'Text color',
-                             'Link color');
+        $labelSwatch = array('Background',
+                             'Content',
+                             'Sidebar',
+                             'Text',
+                             'Links');
         foreach($userSwatch as $propertyvalue => $value) {
-            $foo = array_values($value); //Is this necessary? $value[0] doesn't work because of invalid key
+            $foo = array_values($value);
             $this->elementStart('li');
-            $this->input("swatch-".$s, $labelSwatch[$s], $foo[0]);
+            $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++;
         }
@@ -125,6 +141,10 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('fieldset');
 
         $this->submit('save', _('Save'));
+        $this->element('input', array('type' => 'reset',
+                                      'value' => 'Reset',
+                                      'class' => 'form_action-secondary'));
+
 /*TODO: Check submitted form values: 
 json_encode(form values)
 if submitted Swatch == DefaultSwatch, don't store in DB.
diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 64dd7db20..77e213513 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
     $('#color-picker').hide();
 
     var f = $.farbtastic('#color-picker', UpdateColors);
-    var swatches = $('#settings_design_color input');
+    var swatches = $('#settings_design_color .swatch');
 
     swatches
         .each(UpdateColors)
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index eda04be77..8bd0ae1c4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1161,6 +1161,17 @@ width:400px;
 margin-right:28px;
 }
 
+#settings_design_color .form_data li {
+width:33%;
+}
+#settings_design_color .form_data label {
+float:none;
+}
+#settings_design_color .form_data .swatch {
+padding:11px;
+margin-left:0;
+}
+
 .instructions ul {
 list-style-position:inside;
 }
-- 
cgit v1.2.3-54-g00ecf


From 56a8a255fff0037c29db09d4abf6631e9c45c730 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 21 May 2009 00:12:48 +0000
Subject: Changed No/Yes and Reset/Save locations. They are now a little more
 usable by first offering the option to undo and than do.

---
 actions/deletenotice.php       | 4 ++--
 actions/designsettings.php     | 5 +++--
 theme/base/css/display.css     | 4 +++-
 theme/default/css/display.css  | 4 ++--
 theme/identica/css/display.css | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 6c350b33a..e733f9650 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -112,8 +112,8 @@ class DeletenoticeAction extends DeleteAction
         $this->hidden('token', common_session_token());
         $this->hidden('notice', $this->trimmed('notice'));
         $this->element('p', null, _('Are you sure you want to delete this notice?'));
-        $this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes');
-        $this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no');
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/designsettings.php b/actions/designsettings.php
index 8a7c26104..315e5a199 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -140,11 +140,12 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
 
-        $this->submit('save', _('Save'));
         $this->element('input', array('id' => 'settings_design_reset',
                                       'type' => 'reset',
                                       'value' => 'Reset',
-                                      'class' => 'form_action-secondary'));
+                                      'class' => 'submit form_action-primary',
+                                      'title' => _('Reset back to default')));
+        $this->submit('save', _('Save'), 'submit form_action-secondary', 'save', _('Save design'));
 
 /*TODO: Check submitted form values: 
 json_encode(form values)
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8bd0ae1c4..edec14163 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -198,9 +198,11 @@ padding:0 7px;
 }
 
 
+.form_settings input.form_action-primary {
+padding:0;
+}
 .form_settings input.form_action-secondary {
 margin-left:29px;
-padding:0;
 }
 
 #form_search .submit {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index e4b57ef49..fce2e7e29 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -33,7 +33,7 @@ border-color:#aaa;
 border-color:#C3D6DF;
 }
 
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 background:none;
 }
 
@@ -60,7 +60,7 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 color:#002E6E;
 }
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9d625848f..df114417e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -33,7 +33,7 @@ border-color:#aaa;
 border-color:#ddd;
 }
 
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 background:none;
 }
 
@@ -60,7 +60,7 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 color:#002E6E;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 69e88546fd846146e021b86b0d7d4ddfd382eb31 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 22 May 2009 02:46:22 +0000
Subject: Init styles for conversation page

---
 theme/base/css/display.css     |  7 +++++++
 theme/default/css/display.css  | 17 +++++++++++++----
 theme/identica/css/display.css | 17 +++++++++++++----
 3 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'theme/base/css/display.css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index edec14163..5d2b5231c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -747,6 +747,13 @@ border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
 }
+.notices .notices {
+margin-top:7px;
+margin-left:3%;
+width:97%;
+float:left;
+}
+
 
 /* NOTICES */
 #notices_primary {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fce2e7e29..16c9322a5 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -175,10 +175,6 @@ background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 /* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
@@ -214,6 +210,19 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
+
+.notices .notices {
+background-color:rgba(200, 200, 200, 0.025);
+}
+.notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.075);
+}
+.notices .notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.100);
+}
 /*END: NOTICES */
 
 #new_group a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index df114417e..2fb123a20 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -175,10 +175,6 @@ background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 /* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
@@ -214,6 +210,19 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
+
+.notices .notices {
+background-color:rgba(200, 200, 200, 0.025);
+}
+.notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.075);
+}
+.notices .notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.100);
+}
 /*END: NOTICES */
 
 #new_group a {
-- 
cgit v1.2.3-54-g00ecf