diff --git a/include/i18n/en_US/help/tips/staff.team.yaml b/include/i18n/en_US/help/tips/staff.team.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..094132354d56ea56cadd131aaa421f6d2d4ba22c
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.team.yaml
@@ -0,0 +1,55 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Teams
+#
+# Fields:
+# title - Shown in bold at the top of the popover window
+# content - The body of the help popover
+# links - List of links shows below the content
+# title - Link title
+# href - href of link (links starting with / are translated to the
+# helpdesk installation path)
+#
+# The key names such as 'helpdesk_name' should not be translated as they
+# must match the HTML #ids put into the page template.
+#
+---
+teams:
+ title: Teams
+ content: >
+ Teams are one or more Agents teamed together for the purpose of
+ ticket assignment. Team membership can span across Department
+ boundaries.
+
+status:
+ title: Status
+ content: >
+ If <span class="doc-desc-opt">Disabled</span>, this Team will not be
+ available for ticket assignments nor receive Alerts & Notices on
+ previous assignments.
+
+lead:
+ title: Team Lead
+ content: >
+ A <span class="doc-desc-title">Team</span> can have an appointed
+ leader who can receive <span class="doc-desc-title">Alerts &
+ Notices</span> separate from the members.
+ links:
+ - title: Configure Alerts & Notices
+ href: /scp/settings.php?t=alerts
+
+assignment_alert:
+ title: Assignment Alert
+ content: >
+ You may disable the <span class="doc-desc-title">Ticket Assignment
+ Alert</span> for tickets assigned to this Team.
+ links:
+ - title: Configure Alerts & Notices
+ href: /scp/settings.php?t=alerts
+
+members:
+ title: Team Members
+ content: >
+ Team membership is configured via the Agent profile.
+ links:
+ - title: Manage Staff
+ href: /scp/staff.php
diff --git a/include/i18n/en_US/help/tips/staff.team_form.yaml b/include/i18n/en_US/help/tips/staff.team_form.yaml
deleted file mode 100644
index 6a712735d16b9548cd874754a63518923e509cbb..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.team_form.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Team Form
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-add_new_team:
- title: Add New Team
- content: >
-
-team_information:
- title: Team Information
- content: >
-
-name:
- title: Name
- content: >
- Name of Team visible in the drop down when configuring auto-assignement of Help Topics or Ticket Filters.
- Team Name will also show as an option when assigning from Ticket Thread.
-status:
- title: Status
- content: >
- If Disabled, Team will not be available for ticket assignments nor receive Alerts & Notices on previous assignments.
-
-team_lead:
- title: Team Lead
- content: >
- Assign Team Lead where applicable. You can also set Alerts & Notices to be sent to only Team Lead or both Team Lead and Team Members.
-
- links:
- - title: Manage Alerts & Notices
- href: /scp/settings.php
-
-assignment_alerts:
- title: Assignment Alerts
- content: >
- Disable Global Alerts & Notices from being sent to Team for New Ticket Assignment Alerts.
diff --git a/include/i18n/en_US/help/tips/staff.teams.yaml b/include/i18n/en_US/help/tips/staff.teams.yaml
deleted file mode 100644
index cd3b22675890c227c0c7b49737356a0bff8dfd54..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.teams.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Teams
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-add_new_team:
- title: Add New Team
- content: >
-
-teams:
- title: Teams
- content: >
-
-team_name:
- title: Team Name
- content: >
-
-status:
- title: Status
- content: >
-
-members:
- title: Members
- content: >
-
-team_lead:
- title: Team Lead
- content: >
-
-created:
- title: Created
- content: >
diff --git a/include/staff/team.inc.php b/include/staff/team.inc.php
index 6c36c1ac202fdcb542976c30098f41667634c501..994abb5a29f0a2a26d4fa1dcae054ea6cad7108d 100644
--- a/include/staff/team.inc.php
+++ b/include/staff/team.inc.php
@@ -25,13 +25,15 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2>Team</h2>
+ <h2>Team
+ <i class="help-tip icon-question-sign" href="#teams"></i>
+ </h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
<h4><?php echo $title; ?></h4>
- <em><strong>Team Information</strong>: Disabled team won't be availabe for ticket assignment or alerts.</em>
+ <em><strong>Team Information</strong>:</em>
</th>
</tr>
</thead>
@@ -50,9 +52,13 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Status:
</td>
<td>
+ <span>
<input type="radio" name="isenabled" value="1" <?php echo $info['isenabled']?'checked="checked"':''; ?>><strong>Active</strong>
- <input type="radio" name="isenabled" value="0" <?php echo !$info['isenabled']?'checked="checked"':''; ?>><strong>Disabled</strong>
+
+ <input type="radio" name="isenabled" value="0" <?php echo !$info['isenabled']?'checked="checked"':''; ?>>Disabled
<span class="error">* </span>
+ <i class="help-tip icon-question-sign" href="#status"></i>
+ </span>
</td>
</tr>
<tr>
@@ -60,6 +66,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Team Lead:
</td>
<td>
+ <span>
<select name="lead_id">
<option value="0">— None —</option>
<option value="" disabled="disabled">Select Team Lead (Optional)</option>
@@ -72,23 +79,28 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['lead_id']; ?></span>
+ <span class="error"><?php echo $errors['lead_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#lead"></i>
+ </span>
</td>
</tr>
<tr>
<td width="180">
- Assignment Alerts:
+ Assignment Alert:
</td>
<td>
<input type="checkbox" name="noalerts" value="1" <?php echo $info['noalerts']?'checked="checked"':''; ?> >
- <strong>Disable</strong> assignment alerts for this team (<i>override global settings.</i>)
+ <strong>Disable</strong> for this Team
+ <i class="help-tip icon-question-sign" href="#assignment_alert"></i>
</td>
</tr>
<?php
if($team && ($members=$team->getMembers())){ ?>
<tr>
<th colspan="2">
- <em><strong>Team Members</strong>: To add additional members go to target member's profile </em>
+ <em><strong>Team Members</strong>:
+ <i class="help-tip icon-question-sign" href="#members"></i>
+</em>
</th>
</tr>
<?php
@@ -114,7 +126,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="teams.php"'>
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index 2e6f375cda44a751090ad22a10fc01b8b47c9e0a..410b738b305894377363f231b8982f127d9a7899 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -39,7 +39,9 @@ else
?>
<div style="width:700px;padding-top:5px; float:left;">
- <h2>Teams</h2>
+ <h2>Teams
+ <i class="help-tip icon-question-sign" href="#teams"></i>
+ </h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
<b><a href="teams.php?a=add" class="Icon newteam">Add New Team</a></b></div>
diff --git a/scp/teams.php b/scp/teams.php
index 98cb82b898ebdad185cd24289f11a53553672e28..750ac9ca43f086a607635ea863e33bdc6d3ee51c 100644
--- a/scp/teams.php
+++ b/scp/teams.php
@@ -93,10 +93,9 @@ if($_POST){
}
$page='teams.inc.php';
-$tip_namespace = 'staff.teams';
+$tip_namespace = 'staff.team';
if($team || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='team.inc.php';
- $tip_namespace = 'staff.team_form';
}
$nav->setTabActive('staff');