From dea025abd07a642b41a70002b6a45a519b3d8bd4 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 14 May 2014 12:34:04 -0500
Subject: [PATCH] tips: Finalize help tips for groups

---
 .../i18n/en_US/help/tips/staff.groups.yaml    | 72 +++----------------
 include/staff/group.inc.php                   | 12 +++-
 include/staff/groups.inc.php                  |  4 +-
 3 files changed, 21 insertions(+), 67 deletions(-)

diff --git a/include/i18n/en_US/help/tips/staff.groups.yaml b/include/i18n/en_US/help/tips/staff.groups.yaml
index ab01c7c97..0b194fdaf 100644
--- a/include/i18n/en_US/help/tips/staff.groups.yaml
+++ b/include/i18n/en_US/help/tips/staff.groups.yaml
@@ -13,75 +13,21 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-add_new_group:
-    title: Add New Group
-    content: >
-
-group_information:
-    title: Group Information
-    content: >
-
-name:
-    title: Name
+groups:
+    title: Groups
     content: >
+        Groups are used to define an Agent's permissions in the help desk.
+        Groups can also grant access to Departments other than an Agent's
+        primary Department.
 
 status:
     title: Status
     content: >
-	By disabling, staff assigned to the group will be limited in their access to the help desk. 
-
-group_permissions:
-    title: Group Permissions
-    content: >
-
-can_create_tickets:
-    title: Can Create Tickets
-    content: >
-
-can_edit_tickets:
-    title: Can Edit Tickets
-    content: >
-
-can_post_reply:
-    title: Can Post Reply
-    content: >
-
-can_close_tickets:
-    title: Can Close Tickets
-    content: >
-
-can_assign_tickets:
-    title: Can Assign Tickets
-    content: >
-
-can_transfer_tickets:
-    title: Can Transfer Tickets
-    content: >
-
-can_delete_tickets:
-    title: Can Delete Tickets
-    content: >
-
-can_ban_emails:
-    title: Can Ban Emails
-    content: >
-
-can_manage_premade:
-    title: Can Manage Premade
-    content: >
-
-can_manage_faq:
-    title: Can Manage FAQ
-    content: >
-
-can_view_staff_stats_:
-    title: Can View Staff Stats.
-    content: >
+        If <span class="doc-desc-opt">Disabled</span>, Agents assigned to
+        this Group cannot sign in and will not receive Department Alerts
+        &amp; Notices.
 
 department_access:
     title: Department Access
     content: >
-
-support:
-    title: Support
-    content: >
+        Check all departments to which the Group members are allowed access.
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 258ca6523..5ba2fa6ac 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -51,8 +51,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong>Active</strong>
-                <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>><strong>Disabled</strong>
+                &nbsp;
+                <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>Disabled
                 &nbsp;<span class="error">*&nbsp;<?php echo $errors['status']; ?></span>
+                <i class="help-tip icon-question-sign" href="#status"></i>
             </td>
         </tr>
         <tr>
@@ -150,7 +152,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Department Access</strong>: Check all departments the group members are allowed to access.&nbsp;&nbsp;&nbsp;<a id="selectAll" href="#deptckb">Select All</a>&nbsp;&nbsp;<a id="selectNone" href="#deptckb">Select None</a>&nbsp;&nbsp;</em>
+                <em><strong>Department Access</strong>:
+                <i class="help-tip icon-question-sign" href="#department_access"></i>
+                &nbsp;<a id="selectAll" href="#deptckb">Select All</a>
+                &nbsp;&nbsp;
+                <a id="selectNone" href="#deptckb">Select None</a></em>
             </th>
         </tr>
         <?php
@@ -175,7 +181,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
     </tbody>
 </table>
-<p style="padding-left:225px;">
+<p style="text-align:center">
     <input type="submit" name="submit" value="<?php echo $submit_text; ?>">
     <input type="reset"  name="reset"  value="Reset">
     <input type="button" name="cancel" value="Cancel" onclick='window.location.href="groups.php"'>
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index e81bfef80..69a18e90d 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -40,7 +40,9 @@ else
 
 ?>
 <div style="width:700px;padding-top:5px; float:left;">
- <h2>User Groups</h2>
+ <h2>User Groups
+    <i class="help-tip icon-question-sign" href="#groups"></i>
+    </h2>
  </div>
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
     <b><a href="groups.php?a=add" class="Icon newgroup">Add New Group</a></b></div>
-- 
GitLab