Merge branch 'uiredesign' of /var/www/trunk into uiredesign

This commit is contained in:
Evan Prodromou 2009-01-17 21:12:20 +00:00
commit 3ce45acfa8
4 changed files with 13 additions and 6 deletions

View File

@ -111,7 +111,7 @@ class FavorForm extends Form
*/ */
function formLegend() function formLegend()
{ {
$this->out->element('legend', null, _('Delete this notice')); $this->out->element('legend', null, _('Favor this notice'));
} }
@ -137,7 +137,7 @@ class FavorForm extends Form
function formActions() function formActions()
{ {
$this->out->submit('favor-submit-' . $this->notice->id, $this->out->submit('favor-submit-' . $this->notice->id,
_('Favorite')); _('Favor'), 'submit', null, _('Favor this notice'));
} }
/** /**

View File

@ -313,13 +313,14 @@ class HTMLOutputter extends XMLOutputter
* @todo add a $name parameter * @todo add a $name parameter
*/ */
function submit($id, $label, $cls='submit', $name=null) function submit($id, $label, $cls='submit', $name=null, $title=null)
{ {
$this->element('input', array('type' => 'submit', $this->element('input', array('type' => 'submit',
'id' => $id, 'id' => $id,
'name' => ($name) ? $name : $id, 'name' => ($name) ? $name : $id,
'class' => $cls, 'class' => $cls,
'value' => $label)); 'value' => $label,
'title' => $title));
} }
/** /**

View File

@ -442,7 +442,7 @@ class NoticeListItem extends Widget
$this->out->element('dt', null, _('Reply to this notice')); $this->out->element('dt', null, _('Reply to this notice'));
$this->out->elementStart('dd'); $this->out->elementStart('dd');
$this->out->element('a', array('href' => $reply_url, $this->out->element('a', array('href' => $reply_url,
'title' => _('reply')), _('Reply')); 'title' => _('Reply to this notice')), _('Reply'));
$this->out->elementEnd('dd'); $this->out->elementEnd('dd');
$this->out->elementEnd('dl'); $this->out->elementEnd('dl');
} }
@ -463,7 +463,7 @@ class NoticeListItem extends Widget
$this->out->element('dt', null, _('Delete this notice')); $this->out->element('dt', null, _('Delete this notice'));
$this->out->elementStart('dd'); $this->out->elementStart('dd');
$this->out->element('a', array('href' => $deleteurl, $this->out->element('a', array('href' => $deleteurl,
'title' => _('delete')), _('Delete')); 'title' => _('Delete this notice')), _('Delete'));
$this->out->elementEnd('dd'); $this->out->elementEnd('dd');
$this->out->elementEnd('dl'); $this->out->elementEnd('dl');
} }

View File

@ -784,6 +784,12 @@ margin-right:11px;
.notice-options .notice_reply dt { .notice-options .notice_reply dt {
display:none; display:none;
} }
.notice-options input,
.notice-options a {
text-indent:-9999px;
}
.notice-options .notice_reply a, .notice-options .notice_reply a,
.notice-options form input.submit { .notice-options form input.submit {
display:block; display:block;