From 998e6044e527f5fc46d031d4aa01935cab47ab1a Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Fri, 23 Jan 2009 04:29:21 +0000 Subject: uiredesign --- actions/block.php | 28 +++++++++++++++------ actions/unblock.php | 70 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 28 deletions(-) (limited to 'actions') diff --git a/actions/block.php b/actions/block.php index 64bd97a4f..e77b634c8 100644 --- a/actions/block.php +++ b/actions/block.php @@ -90,17 +90,31 @@ class BlockAction extends Action { parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - if ($this->arg('block')) { - $this->areYouSureForm(); - } else if ($this->arg('no')) { + if ($this->arg('no')) { $cur = common_current_user(); - common_redirect(common_local_url('subscribers', array('nickname' => $cur->nickname))); - } else if ($this->arg('yes')) { + $other = Profile::staticGet('id', $this->arg('blockto')); + common_redirect(common_local_url('showstream', array('nickname' => $other->nickname))); + } elseif ($this->arg('yes')) { $this->blockProfile(); + } elseif ($this->arg('blockto')) { + $this->showPage(); } } } + + function showContent() { + $this->areYouSureForm(); + } + + function title() { + return _('Block user'); + } + + function showNoticeForm() { + // nop + } + /** * Confirm with user. * @@ -111,7 +125,6 @@ class BlockAction extends Action function areYouSureForm() { $id = $this->profile->id; - common_show_header(_('Block user')); $this->element('p', null, _('Are you sure you want to block this user? '. 'Afterwards, they will be unsubscribed from you, '. @@ -134,7 +147,6 @@ class BlockAction extends Action $this->submit('no', _('No')); $this->submit('yes', _('Yes')); $this->elementEnd('form'); - common_show_footer(); } /** @@ -160,7 +172,7 @@ class BlockAction extends Action foreach ($this->args as $k => $v) { if ($k == 'returnto-action') { $action = $v; - } else if (substr($k, 0, 9) == 'returnto-') { + } elseif (substr($k, 0, 9) == 'returnto-') { $args[substr($k, 9)] = $v; } } diff --git a/actions/unblock.php b/actions/unblock.php index 59270f882..bad496353 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -1,5 +1,16 @@ + * @author Robin Millette + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://laconi.ca/ + * * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. * @@ -17,67 +28,86 @@ * along with this program. If not, see . */ -if (!defined('LACONICA')) { exit(1); } +if (!defined('LACONICA')) { + exit(1); +} +/** + * Unblock a user action class. + * + * @category Action + * @package Laconica + * @author Evan Prodromou + * @author Robin Millette + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://laconi.ca/ + */ class UnblockAction extends Action { - var $profile = null; + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + */ function prepare($args) { - parent::prepare($args); - if (!common_logged_in()) { $this->clientError(_('Not logged in.')); return false; } - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { $this->clientError(_('There was a problem with your session token. Try again, please.')); return; } - $id = $this->trimmed('unblockto'); - if (!$id) { $this->clientError(_('No profile specified.')); return false; } - $this->profile = Profile::staticGet('id', $id); - if (!$this->profile) { $this->clientError(_('No profile with that ID.')); return false; } - return true; } + /** + * Handle request + * + * Shows a page with list of favorite notices + * + * @param array $args $_REQUEST args; handled in prepare() + * + * @return void + */ function handle($args) { parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->unblock_profile(); + $this->unblockProfile(); } } - function unblock_profile() + /** + * Unblock a user. + * + * @return void + */ + function unblockProfile() { - - $cur = common_current_user(); - + $cur = common_current_user(); $result = $cur->unblock($this->profile); - if (!$result) { $this->serverError(_('Error removing the block.')); return; } - foreach ($this->args as $k => $v) { if ($k == 'returnto-action') { $action = $v; @@ -85,7 +115,6 @@ class UnblockAction extends Action $args[substr($k, 9)] = $v; } } - if ($action) { common_redirect(common_local_url($action, $args)); } else { @@ -94,3 +123,4 @@ class UnblockAction extends Action } } } + -- cgit v1.2.3-54-g00ecf From c628bbb1928308fe1e20f00eccfdc2a1b2c9105e Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Fri, 23 Jan 2009 05:11:04 +0000 Subject: make avatar bigger on single notice pages --- actions/shownotice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/shownotice.php b/actions/shownotice.php index beae478ba..d5f35cd84 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -95,7 +95,7 @@ class ShownoticeAction extends Action return false; } - $this->avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); + $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); return true; } -- cgit v1.2.3-54-g00ecf From 500ed2f5eb752a1a1e82d83c8c8b1c58897789b8 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 05:23:28 +0000 Subject: Cleanup --- actions/remotesubscribe.php | 16 ++++++++++++++-- actions/showstream.php | 2 +- theme/base/css/display.css | 16 ++++++++++++++-- theme/identica/css/display.css | 13 +++++++------ 4 files changed, 36 insertions(+), 11 deletions(-) (limited to 'actions') diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 3c8346fbe..f727a63b8 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action { # id = remotesubscribe conflicts with the # button on profile page - $this->elementStart('form', array('id' => 'remsub', 'method' => 'post', - 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('form', array('id' => 'form_remote_subscribe', + 'method' => 'post', + 'class' => 'form_settings', + 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('fieldset'); + $this->element('legend', 'Subscribe to a remote user'); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('nickname', _('User nickname'), $this->nickname, _('Nickname of the user you want to follow')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('profile_url', _('Profile URL'), $this->profile_url, _('URL of your profile on another compatible microblogging service')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Subscribe')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/showstream.php b/actions/showstream.php index 157ccdd0c..2fd56ad2e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -367,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'entity_subscribe_remote'), + 'class' => 'entity_remote_subscribe'), _('Subscribe')); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d5532a5c9..b4f3ffd54 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -144,7 +144,8 @@ font-weight:bold; #form_settings_avatar legend, #newgroup legend, #editgroup legend, -#form_tag_user legend { +#form_tag_user legend, +#form_remote_subscribe legend { display:none; } @@ -586,7 +587,8 @@ cursor:pointer; width:100%; } .entity_actions a, -#entity_nudge p { +#entity_nudge p, +.entity_remote_subscribe { text-decoration:none; font-weight:bold; display:block; @@ -606,6 +608,16 @@ padding-left:20px; padding:4px 4px 4px 23px; } +.entity_remote_subscribe { +padding:4px; +border-width:2px; +border-style:solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + + .entity_tags ul { list-style-type:none; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 17e2aee9e..f61d063b6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -26,7 +26,8 @@ display:none; input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select { +input, textarea, select, +.entity_remote_subscribe { border-color:#aaa; } @@ -34,7 +35,8 @@ border-color:#aaa; input.submit, #form_notice.warning #notice_text-count, #nav_register a, -.form_settings .form_note { +.form_settings .form_note, +.entity_remote_subscribe { background-color:#A9BF4F; } @@ -43,7 +45,8 @@ input:focus, textarea:focus, select:focus, border-color:#A9BF4F; } input.submit, -#nav_register a { +#nav_register a, +.entity_remote_subscribe { color:#fff; } @@ -74,9 +77,7 @@ background-color:#fcfcfc; background-color:#fcfffc; } -#aside_primary, -#entity_subscribe a, -#TB_window input.submit { +#aside_primary { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf