From 6c7842129841878b65c1d686de64f98f1edcb16f Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 06:31:53 +0000 Subject: Moved common_profile_new_message_nudge() to showstream.php --- actions/showstream.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'actions/showstream.php') diff --git a/actions/showstream.php b/actions/showstream.php index 3882af845..a411fae5b 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -326,7 +326,24 @@ class ShowstreamAction extends Action } $this->elementEnd('li'); - common_profile_new_message_nudge($cur, $this->user, $this->profile); +// common_profile_new_message_nudge($cur, $this->user, $this->profile); + + $user = User::staticGet('id', $this->profile->id); + if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { + $this->elementStart('li', array('id' => 'user_send_a_new_message')); + $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), + _('Send a message')); + $this->elementEnd('li'); + + if ($user->email && $user->emailnotifynudge) { + $this->elementStart('li', array('id' => 'user_nudge')); + $nf = new NudgeForm($this, $user); + $nf->show(); + $this->elementEnd('li'); + } + } + + if ($cur && $cur->id != $this->profile->id) { $blocked = $cur->hasBlocked($this->profile); @@ -349,7 +366,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'remotesubscribe'), + 'id' => 'user_subscribe_remote'), _('Subscribe')); } -- cgit v1.2.3-54-g00ecf From 27b627c09451c099b18a7cde90f6a028f820046c Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 06:54:17 +0000 Subject: Made user_actions styles more consistent --- actions/showstream.php | 2 +- theme/base/css/display.css | 15 ++++++++++----- theme/identica/css/display.css | 9 +++++---- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'actions/showstream.php') diff --git a/actions/showstream.php b/actions/showstream.php index a411fae5b..6ed6abc9e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -330,7 +330,7 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('id' => 'user_send_a_new_message')); + $this->elementStart('li', array('id' => 'user_send-a-message')); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), _('Send a message')); $this->elementEnd('li'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5b17fa53a..c60097145 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -611,16 +611,25 @@ width:100%; } #user_actions a { text-decoration:none; +font-weight:bold; +width:100%; +display:block; } .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { border:0; padding-left:20px; } +#user_send-a-message a { +padding:4px 4px 4px 23px; + +} #user_subscribe input.submit, @@ -631,13 +640,9 @@ padding-left:20px; #user_send-a-message form { -clear:left; -width:322px; -margin-top:18px; } #user_send-a-message textarea { -width:96%; } .user_tags ul { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index e3b5310f7..2b91c5504 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -41,7 +41,9 @@ color:#fff; a, div.notice-options input, .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { color:#002E6E; } @@ -63,8 +65,7 @@ background-color:#CEE1E9; #notice_text-count { color:#333; } -#form_notice.warning #notice_text-count, -#user_actions a { +#form_notice.warning #notice_text-count { color:#000; } @@ -131,7 +132,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -.form_user_send-a-message input.submit, +#user_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit { -- cgit v1.2.3-54-g00ecf From 92e2f3babc89863518b8711a1b62661752d806f5 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 07:14:43 +0000 Subject: Added @title to user_action inputs and anchor and form legends --- actions/showstream.php | 5 +++-- lib/blockform.php | 14 +++++++++++++- lib/nudgeform.php | 14 +++++++++++++- lib/subscribeform.php | 13 ++++++++++++- lib/unblockform.php | 13 ++++++++++++- lib/unsubscribeform.php | 12 +++++++++++- 6 files changed, 64 insertions(+), 7 deletions(-) (limited to 'actions/showstream.php') diff --git a/actions/showstream.php b/actions/showstream.php index 6ed6abc9e..76249d14d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -331,8 +331,9 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { $this->elementStart('li', array('id' => 'user_send-a-message')); - $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), - _('Send a message')); + $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), + 'title' => _('Send a direct message to this user')), + _('Message')); $this->elementEnd('li'); if ($user->email && $user->emailnotifynudge) { diff --git a/lib/blockform.php b/lib/blockform.php index b7790681d..ea22c1cec 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -112,6 +112,18 @@ class BlockForm extends Form return common_local_url('block'); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Block this user')); + } + + /** * Data elements of the form * @@ -138,6 +150,6 @@ class BlockForm extends Form function formActions() { - $this->out->submit('submit', _('Block')); + $this->out->submit('submit', _('block'), 'submit', null, _('Block this user')); } } diff --git a/lib/nudgeform.php b/lib/nudgeform.php index 6374a7698..7380462a7 100644 --- a/lib/nudgeform.php +++ b/lib/nudgeform.php @@ -105,6 +105,18 @@ class NudgeForm extends Form array('nickname' => $this->profile->nickname)); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Nudge this user')); + } + + /** * Action elements * @@ -113,6 +125,6 @@ class NudgeForm extends Form function formActions() { - $this->out->submit('submit', _('Send a nudge')); + $this->out->submit('submit', _('Nudge'), 'submit', null, _('Send a nudge to this user')); } } diff --git a/lib/subscribeform.php b/lib/subscribeform.php index 231e740a7..c65134e46 100644 --- a/lib/subscribeform.php +++ b/lib/subscribeform.php @@ -104,6 +104,17 @@ class SubscribeForm extends Form return common_local_url('subscribe'); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Subscribe to this user')); + } + /** * Data elements of the form * @@ -125,6 +136,6 @@ class SubscribeForm extends Form function formActions() { - $this->out->submit('submit', _('Subscribe')); + $this->out->submit('submit', _('Subscribe'), 'submit', null, _('Subscribe to this user')); } } diff --git a/lib/unblockform.php b/lib/unblockform.php index 025011a82..6a8831b29 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -110,6 +110,17 @@ class UnblockForm extends Form return common_local_url('unblock'); } + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Unblock this user')); + } + + /** * Data elements of the form * @@ -136,6 +147,6 @@ class UnblockForm extends Form function formActions() { - $this->out->submit('submit', _('Unblock')); + $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user')); } } diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index 092369db7..ce91a1340 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -103,6 +103,16 @@ class UnsubscribeForm extends Form return common_local_url('unsubscribe'); } + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Unsubscribe from this user')); + } + /** * Data elements of the form * @@ -124,6 +134,6 @@ class UnsubscribeForm extends Form function formActions() { - $this->out->submit('submit', _('Unsubscribe')); + $this->out->submit('submit', _('Unsubscribe'), 'submit', null, _('Unsubscribe from this user')); } } -- cgit v1.2.3-54-g00ecf