Click on text to activate checkboxes in dept config

include/staff/department.inc.php

@@ -82,9 +82,13 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
                 <?php echo __('Type');?>:
             </td>
             <td>
+                <label>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Public');?></strong>
+                </label>
                 &nbsp;
+                <label>
                 <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Private');?></strong> <?php echo mb_convert_case(__('(internal)'), MB_CASE_TITLE);?>
+                </label>
                 &nbsp;<i class="help-tip icon-question-sign" href="#type"></i>
             </td>
         </tr>
@@ -135,12 +139,12 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
         <tr>
             <td><?php echo __('Ticket Assignment'); ?>:</td>
             <td>
-                <span>
+                <label>
                 <input type="checkbox" name="assign_members_only" <?php echo
                 $info['assign_members_only']?'checked="checked"':''; ?>>
                 <?php echo __('Restrict ticket assignment to department members'); ?>
+                </label>
                 <i class="help-tip icon-question-sign" href="#sandboxing"></i>
-                </span>
             </td>
         </tr>
         <tr>
@@ -201,12 +205,12 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
                 <?php echo __('New Ticket');?>:
             </td>
             <td>
-                <span>
+                <label>
                 <input type="checkbox" name="ticket_auto_response" value="0" <?php echo !$info['ticket_auto_response']?'checked="checked"':''; ?> >
 
                 <?php echo __('<strong>Disable</strong> for this Department'); ?>
+                </label>
                 <i class="help-tip icon-question-sign" href="#new_ticket"></i>
-                </span>
             </td>
         </tr>
         <tr>
@@ -214,11 +218,11 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
                 <?php echo __('New Message');?>:
             </td>
             <td>
-                <span>
+                <label>
                 <input type="checkbox" name="message_auto_response" value="0" <?php echo !$info['message_auto_response']?'checked="checked"':''; ?> >
                 <?php echo __('<strong>Disable</strong> for this Department'); ?>
+                </label>
                 <i class="help-tip icon-question-sign" href="#new_message"></i>
-                </span>
             </td>
         </tr>
         <tr>
@@ -342,7 +346,7 @@ foreach ($dept->getMembers() as $member) {
             <option value="0" data-quick-add>&mdash; <?php echo __('Add New');?> &mdash;</option>
           </select>
           <span style="display:inline-block;width:60px"> </span>
-          <label>
+          <label class="inline checkbox">
             <input type="checkbox" data-name="member_alerts" value="1" />
             <?php echo __('Alerts'); ?>
           </label>

include/staff/staff.inc.php

@@ -153,25 +153,22 @@ if (count($bks) > 1) {
           <td colspan="2">
             <div class="error"><?php echo $errors['isadmin']; ?></div>
             <div class="error"><?php echo $errors['isactive']; ?></div>
-            <label>
+            <label class="checkbox">
             <input type="checkbox" name="islocked" value="1"
               <?php echo (!$staff->isactive) ? 'checked="checked"' : ''; ?> />
               <?php echo __('Locked'); ?>
             </label>
-            <br/>
-            <label>
+            <label class="checkbox">
             <input type="checkbox" name="isadmin" value="1"
               <?php echo ($staff->isadmin) ? 'checked="checked"' : ''; ?> />
               <?php echo __('Administrator'); ?>
             </label>
-            <br/>
-            <label>
+            <label class="checkbox">
             <input type="checkbox" name="assigned_only"
               <?php echo ($staff->assigned_only) ? 'checked="checked"' : ''; ?> />
               <?php echo __('Limit ticket access to ONLY assigned tickets'); ?>
             </label>
-            <br/>
-            <label>
+            <label class="checkbox">
             <input type="checkbox" name="onvacation"
               <?php echo ($staff->onvacation) ? 'checked="checked"' : ''; ?> />
               <?php echo __('Vacation Mode'); ?>
@@ -253,7 +250,7 @@ if (count($bks) > 1) {
               <option value="0" data-quick-add>&mdash; <?php echo __('Add New');?> &mdash;</option>
             </select>
             <span style="display:inline-block;width:20px"> </span>
-            <label>
+            <label class="inline checkbox">
               <input type="checkbox" data-name="dept_access_alerts" value="1" />
               <?php echo __('Alerts'); ?>
             </label>

scp/css/scp.css

@@ -2647,12 +2647,19 @@ label.checkbox {
     padding-left: 1.3em;
     text-indent: -1.3em;
 }
+label.inline.checkbox {
+    display: inline-block;
+}
+label.checkbox + label.checkbox {
+    margin-top: 0.3em;
+}
 input[type=checkbox] {
   width: 1em;
   height: 1em;
   box-sizing: content-box;
   padding: 0;
   margin:0;
+  margin-right: 0.1em;
   vertical-align: bottom;
   position: relative;
   top: -0.05em;