Using unique @for, @id pair for jabber and sms options in subscriptions

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index ba6171ef4ccc596abc16376f039414db6eb32875..7b10b3425bd7a6957b3f4cce1a6a49b7b1640cba 100644 (file)
--- 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);
         }