diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/showgroup.php | 3 | ||||
| -rw-r--r-- | actions/shownotice.php | 2 | ||||
| -rw-r--r-- | actions/subscriptions.php | 22 | ||||
| -rw-r--r-- | actions/tag.php | 13 |
4 files changed, 32 insertions, 8 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 5704b13d1..a0d05ba37 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -221,7 +221,8 @@ class ShowgroupAction extends GroupDesignAction function showGroupProfile() { - $this->elementStart('div', 'entity_profile vcard author'); + $this->elementStart('div', array('id' => 'i', + 'class' => 'entity_profile vcard author')); $this->element('h2', null, _('Group profile')); diff --git a/actions/shownotice.php b/actions/shownotice.php index a23027f7c..ca6b60d1f 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -167,7 +167,7 @@ class ShownoticeAction extends OwnerDesignAction function title() { if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') '; + $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')'; } else { $base = $this->profile->nickname; } diff --git a/actions/subscriptions.php b/actions/subscriptions.php index ba6171ef4..7b10b3425 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -196,12 +196,30 @@ class SubscriptionsListItem extends SubscriptionListItem $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $this->profile->id); if (common_config('xmpp', 'enabled')) { - $this->out->checkbox('jabber', _('Jabber'), $sub->jabber); + $attrs = array('name' => 'jabber', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'jabber-'.$this->profile->id); + if ($sub->jabber) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber')); } else { $this->out->hidden('jabber', $sub->jabber); } if (common_config('sms', 'enabled')) { - $this->out->checkbox('sms', _('SMS'), $sub->sms); + $attrs = array('name' => 'sms', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'sms-'.$this->profile->id); + if ($sub->sms) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'sms-'.$this->profile->id), _('SMS')); } else { $this->out->hidden('sms', $sub->sms); } diff --git a/actions/tag.php b/actions/tag.php index ee9617b66..72668a0c9 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -102,12 +102,17 @@ class TagAction extends Action function showContent() { - $nl = new NoticeList($this->notice, $this); + if(Event::handle('StartTagShowContent', array($this))) { + + $nl = new NoticeList($this->notice, $this); - $cnt = $nl->show(); + $cnt = $nl->show(); - $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, - $this->page, 'tag', array('tag' => $this->tag)); + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'tag', array('tag' => $this->tag)); + + Event::handle('EndTagShowContent', array($this)) + } } function isReadOnly($args) |