summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-25 17:24:10 -0400
committerEvan Prodromou <evan@status.net>2010-03-25 17:24:10 -0400
commitcbf321eeb371fecdb069a33301629a6d045425f1 (patch)
treeeb44b8419e74d5653d2fa178e84f46e0b01401bf /actions
parent9c63ae6e443e7b23f64e31617a1762393473509a (diff)
parentc066e5285c12be5ccf243e8be79dc07977f78366 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'actions')
-rw-r--r--actions/showgroup.php3
-rw-r--r--actions/subscriptions.php22
2 files changed, 22 insertions, 3 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/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);
}