From 5c69c75f466a867c9ba3225f0a8e36e733255337 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 14 Jan 2009 02:33:19 -0500 Subject: Move block and unblock forms to their own widgets --- lib/unblockform.php | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 lib/unblockform.php (limited to 'lib/unblockform.php') diff --git a/lib/unblockform.php b/lib/unblockform.php new file mode 100644 index 000000000..4cb9ae4f5 --- /dev/null +++ b/lib/unblockform.php @@ -0,0 +1,130 @@ +. + * + * @category Form + * @package Laconica + * @author Evan Prodromou + * @author Sarven Capadisli + * @copyright 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/ + */ + +if (!defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/form.php'; + +/** + * Form for unblocking a user + * + * @category Form + * @package Laconica + * @author Evan Prodromou + * @author Sarven Capadisli + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + * + * @see BlockForm + */ + +class UnblockForm extends Form +{ + /** + * Profile of user to unblock + */ + + var $profile = null; + + /** + * Return-to args + */ + + var $args = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param Profile $profile profile of user to unblock + * @param array $args return-to args + */ + + function __construct($out=null, $profile=null, $args=null) + { + parent::__construct($out); + + $this->profile = $profile; + $this->args = $args; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'unblock-' . $this->profile->id; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('unblock'); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $this->out->hidden('unblockto-' . $this->profile->id, + $this->profile->id, + 'unblockto'); + if ($this->args) { + foreach ($this->args as $k => $v) { + $this->out->hidden('returnto-' . $k, $v); + } + } + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Unblock')); + } +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From bb4a6a514bb62a0fef2314512c121951a40437e7 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 22:36:57 +0000 Subject: user_actions form markup and styling --- actions/showstream.php | 1 + lib/blockform.php | 15 ++++++++++++++- lib/subscribeform.php | 2 +- lib/unblockform.php | 13 ++++++++++++- lib/unsubscribeform.php | 2 +- theme/base/css/display.css | 30 ++++++++++++------------------ theme/identica/css/display.css | 35 +++++++++++++++++++++++------------ 7 files changed, 64 insertions(+), 34 deletions(-) (limited to 'lib/unblockform.php') diff --git a/actions/showstream.php b/actions/showstream.php index 1d79ea30d..d550ec295 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -22,6 +22,7 @@ * @category Personal * @package Laconica * @author Evan Prodromou + * @author Sarven Capadisli * @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/ diff --git a/lib/blockform.php b/lib/blockform.php index 51e43f8b5..b7790681d 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -88,6 +88,19 @@ class BlockForm extends Form return 'block-' . $this->profile->id; } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_block'; + } + + /** * Action of the form * @@ -127,4 +140,4 @@ class BlockForm extends Form { $this->out->submit('submit', _('Block')); } -} \ No newline at end of file +} diff --git a/lib/subscribeform.php b/lib/subscribeform.php index 8b69efd1a..231e740a7 100644 --- a/lib/subscribeform.php +++ b/lib/subscribeform.php @@ -89,7 +89,7 @@ class SubscribeForm extends Form function formClass() { - return 'form_subscribe'; + return 'form_user_subscribe'; } diff --git a/lib/unblockform.php b/lib/unblockform.php index 4cb9ae4f5..025011a82 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -88,6 +88,17 @@ class UnblockForm extends Form return 'unblock-' . $this->profile->id; } + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_unblock'; + } + /** * Action of the form * @@ -127,4 +138,4 @@ class UnblockForm extends Form { $this->out->submit('submit', _('Unblock')); } -} \ No newline at end of file +} diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index b222f0e54..092369db7 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -89,7 +89,7 @@ class UnsubscribeForm extends Form function formClass() { - return 'form_unsubscribe'; + return 'form_user_unsubscribe'; } /** diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c776aea0..fc1f35e35 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -570,8 +570,7 @@ display:none; list-style-type:none; } #user_actions li { -border-top-width:1px; -border-top-style:dotted; +margin-bottom:4px; } #user_actions li:first-child { border-top:0; @@ -584,34 +583,29 @@ padding:0; display:none; } -#user_actions a, #user_actions input.submit { display:block; text-align:left; -padding:4px 0 4px 19px; +cursor:pointer; +width:100%; } #user_actions a { text-decoration:none; } -#user_subscribe a, -#TB_window input.submit, -#user_actions input.submit { -border:0; -cursor:pointer; -padding-left:16px; -width:100%; -font-size:0.9em; -} -#user_subscribe a { -width:auto; + + +.form_user_block input.submit, +.form_user_unblock input.submit { +border:0; padding-left:20px; } -#user_subscribe a, -#TB_window input.submit, + + +#user_subscribe input.submit, .form_user_subscribe input.submit { -font-weight:bold; + } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d5a5ce956..eb5f78b9e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -125,30 +125,41 @@ background-image:url(../../base/images/icons/icon_vcard.gif); /*user_actions*/ #user_actions li { -border-top-color:#eee; +/*border-top-color:#eee;*/ } -#user_subscribe a, -#TB_window input.submit, -.form_user_subscribe input.submit { -background-image: url(../images/icons/twotone/green/shield.gif); -background-position: 0 45%; + + +.form_user_send-a-message input.submit, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit { +background-position: 0 40%; background-repeat: no-repeat; +background-color:transparent; } +.form_user_subscribe input.submit, .form_user_unsubscribe input.submit { -background-color:#647819; +background-color:#A9BF4F; color:#fff; } +.form_user_unsubscribe input.submit { +background-color:#97BFD1; +} + #user_send-a-message a { -background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/quote.gif); } .form_user_nudge input.submit { -background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/mail.gif); } -.form_user_block input.submit { -background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../images/icons/twotone/green/shield.gif); +color:#000; } + /* NOTICES */ .notices li.over { background-color:#fcfcfc; @@ -242,4 +253,4 @@ background-color:#0f0; } #home #intro #step_create-a-community a { background-color:#00f; -} \ No newline at end of file +} -- 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 'lib/unblockform.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