From a13bfa5848705d23353783f195b67c088a72a8cb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 18:16:20 +0000 Subject: Ticket http://laconi.ca/trac/ticket/1274 Minimised form_notice markup by removing unordered lists. There is a minor CSS rule reassignment done by changing the selectors. There is no visual change in the final result. --- lib/messageform.php | 10 --------- lib/noticeform.php | 9 -------- theme/base/css/display.css | 51 ++++++++-------------------------------------- 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/lib/messageform.php b/lib/messageform.php index f41508305..b8878ec1f 100644 --- a/lib/messageform.php +++ b/lib/messageform.php @@ -132,20 +132,14 @@ class MessageForm extends Form $mutual_users->free(); unset($mutual_users); - $this->out->elementStart('ul', 'form_data'); - $this->out->elementStart('li', array('id' => 'notice_to')); $this->out->dropdown('to', _('To'), $mutual, null, false, ($this->to) ? $this->to->id : null); - $this->out->elementEnd('li'); - $this->out->elementStart('li', array('id' => 'notice_text')); $this->out->element('textarea', array('id' => 'notice_data-text', 'cols' => 35, 'rows' => 4, 'name' => 'content'), ($this->content) ? $this->content : ''); - $this->out->elementEnd('li'); - $this->out->elementEnd('ul'); } /** @@ -156,14 +150,10 @@ class MessageForm extends Form function formActions() { - $this->out->elementStart('ul', 'form_actions'); - $this->out->elementStart('li', array('id' => 'notice_submit')); $this->out->element('input', array('id' => 'notice_action-submit', 'class' => 'submit', 'name' => 'message_send', 'type' => 'submit', 'value' => _('Send'))); - $this->out->elementEnd('li'); - $this->out->elementEnd('ul'); } } diff --git a/lib/noticeform.php b/lib/noticeform.php index 0c991c969..606b5d028 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -134,9 +134,6 @@ class NoticeForm extends Form function formData() { - - $this->out->elementStart('ul', 'form_data'); - $this->out->elementStart('li', array('id' => 'notice_text')); $this->out->element('label', array('for' => 'notice_data-text'), sprintf(_('What\'s up, %s?'), $this->user->nickname)); // XXX: vary by defined max size @@ -145,8 +142,6 @@ class NoticeForm extends Form 'rows' => 4, 'name' => 'status_textarea'), ($this->content) ? $this->content : ''); - $this->out->elementEnd('li'); - $this->out->elementEnd('ul'); $this->out->elementStart('dl', 'form_note'); $this->out->element('dt', null, _('Available characters')); @@ -168,14 +163,10 @@ class NoticeForm extends Form function formActions() { - $this->out->elementStart('ul', 'form_actions'); - $this->out->elementStart('li', array('id' => 'notice_submit')); $this->out->element('input', array('id' => 'notice_action-submit', 'class' => 'submit', 'name' => 'status_submit', 'type' => 'submit', 'value' => _('Send'))); - $this->out->elementEnd('li'); - $this->out->elementEnd('ul'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index a10ec0223..90cd00d55 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -421,6 +421,7 @@ padding:0; display:none; } #form_notice textarea { +float:left; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -431,30 +432,19 @@ padding:7px 7px 16px 7px; } #form_notice label { display:block; +float:left; font-size:1.3em; margin-bottom:7px; } -#form_notice .form_data li { -float:left; -} - -#form_notice #notice_attach_file label, #form_notice #notice_submit label { display:none; } - -#form_notice #notice_attachment { -margin-top:25px; -margin-left:4px; -} - #form_notice .form_note { position:absolute; top:99px; right:98px; z-index:9; } - #form_notice .form_note dt { font-weight:bold; display:none; @@ -464,42 +454,19 @@ font-weight:bold; line-height:1.15; padding:1px 2px; } - -#form_notice #notice_data-attach_view { -position:absolute; -top:25px; -right:30px; -margin-left:4px; -padding:0; -width:16px; -height:16px; -border:0; -text-indent:-9999px; -} -#form_notice .form_actions { +#form_notice #notice_action-submit { +width:60px; +padding:8px; position:absolute; bottom:0; right:0; } -#form_notice .form_actions input.submit { -width:60px; -padding:8px; -} - -#form_notice li { -margin-bottom:0; -} - -#form_notice #notice_to { -margin-bottom:7px; -} - -#notice_to label { -float:left; -margin-right:18px; +#form_notice label[for=to] { margin-top:11px; } -#notice_to select { +#form_notice select[id=to] { +margin-bottom:7px; +margin-left:18px; float:left; } /*end FORM NOTICE*/ -- cgit v1.2.3-54-g00ecf From a7d8f7197e87fd7cbed8b58e07b3904929adf0c5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 22:48:51 +0000 Subject: Alignment of notice-options in IE6 --- theme/base/css/ie6.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css index 10b31cbcb..fa6ec92d2 100644 --- a/theme/base/css/ie6.css +++ b/theme/base/css/ie6.css @@ -9,3 +9,6 @@ margin-left:0; .entity_profile .entity_depiction { margin-bottom:123px; } +.notice div.entry-content { +width:63%; +} -- cgit v1.2.3-54-g00ecf From 90e5f01f8af656a3475dc99592a4b13dc1851350 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 22:53:21 +0000 Subject: Processing indicator (aka spinner thingy) for form_notice submits --- js/util.js | 2 ++ theme/base/images/icons/icon_processing.gif | Bin 0 -> 673 bytes theme/identica/css/display.css | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 theme/base/images/icons/icon_processing.gif diff --git a/js/util.js b/js/util.js index 3ad038612..81139744f 100644 --- a/js/util.js +++ b/js/util.js @@ -161,6 +161,7 @@ $(document).ready(function(){ $("#form_notice").addClass("warning"); return false; } + $("#form_notice").addClass("processing"); $("#notice_action-submit").attr("disabled", "disabled"); $("#notice_action-submit").addClass("disabled"); return true; @@ -179,6 +180,7 @@ $(document).ready(function(){ NoticeHover(); NoticeReply(); } + $("#form_notice").removeClass("processing"); $("#notice_action-submit").removeAttr("disabled"); $("#notice_action-submit").removeClass("disabled"); } diff --git a/theme/base/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif new file mode 100644 index 000000000..d0bce1542 Binary files /dev/null and b/theme/base/images/icons/icon_processing.gif differ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 576a2e14b..69be11623 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -94,7 +94,11 @@ color:#333; #form_notice.warning #notice_text-count { color:#000; } - +#form_notice.processing #notice_action-submit { +background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +} #nav_register a { text-decoration:none; -- cgit v1.2.3-54-g00ecf From 4eb59da0389862cc9f5a737553379fa2f679c1fb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 22:59:29 +0000 Subject: Processing indicator CSS for the default theme --- theme/default/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 85b5aa13e..bb0b84a67 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -94,6 +94,11 @@ color:#333; #form_notice.warning #notice_text-count { color:#000; } +#form_notice.processing #notice_action-submit { +background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +} #nav_register a { -- cgit v1.2.3-54-g00ecf From e810077c0e958b6c6a28a66dc9fe2ade21600dd3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 23:18:55 +0000 Subject: Processing indicator image for the default theme --- theme/default/images/icons/icon_processing.gif | Bin 0 -> 673 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/default/images/icons/icon_processing.gif diff --git a/theme/default/images/icons/icon_processing.gif b/theme/default/images/icons/icon_processing.gif new file mode 100644 index 000000000..d0bce1542 Binary files /dev/null and b/theme/default/images/icons/icon_processing.gif differ -- cgit v1.2.3-54-g00ecf From 959d9eda2304df317719ff9768cb555210c98ad0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 25 Mar 2009 23:40:33 +0000 Subject: Unused file. --- theme/default/images/icons/icon_processing.gif | Bin 673 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 theme/default/images/icons/icon_processing.gif diff --git a/theme/default/images/icons/icon_processing.gif b/theme/default/images/icons/icon_processing.gif deleted file mode 100644 index d0bce1542..000000000 Binary files a/theme/default/images/icons/icon_processing.gif and /dev/null differ -- cgit v1.2.3-54-g00ecf