diff --git a/css/osticket.css b/css/osticket.css
index 5ec2e8e295a2dd2c6d555e62f0c162c63a838b29..1638f464cf1e8fb79e2f84866dacecbc9073213f 100644
--- a/css/osticket.css
+++ b/css/osticket.css
@@ -67,3 +67,17 @@ input.dp {
height:16px;
background:inherit;
}
+
+.draft-saved {
+ background-color: black;
+ background-color: rgba(0, 0, 0, 0.7);
+ color: white;
+ padding: 4px 8px 6px;
+ border-radius: 3px;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ line-height: 14px;
+}
+
+.delete-draft:hover {
+ background-color: #fc9f41 !important;
+}
diff --git a/css/redactor.css b/css/redactor.css
index c347ede070da623a5fabfe2d2978abd82ce38c8b..ea84c64ef5f2562de15b623d79c20be44d8cfbb8 100644
--- a/css/redactor.css
+++ b/css/redactor.css
@@ -328,7 +328,6 @@ body .redactor_box_fullscreen {
white-space: nowrap;
}
.redactor_toolbar.redactor-toolbar-external {
- z-index: 999;
box-shadow: none;
border: 1px solid rgba(0, 0, 0, 0.1);
}
@@ -364,6 +363,7 @@ body .redactor_air .redactor_toolbar {
outline: none;
background-color: #1f78d8;
color: #fff;
+ text-decoration: none;
}
.redactor_toolbar li a:hover i:before {
color: #fff;
diff --git a/include/class.config.php b/include/class.config.php
index 9a02dd480ea92ea3143f693314d48be92cd9136a..23772d05b8d48028e3ee55bd2da0793e90a4f58a 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -419,6 +419,13 @@ class OsticketConfig extends Config {
return $this->get('default_priority_id');
}
+ function getDefaultPriority() {
+ if (!isset($this->defaultPriority))
+ $this->defaultPriority = Priority::lookup($this->getDefaultPriorityId());
+
+ return $this->defaultPriority;
+ }
+
function getDefaultTemplateId() {
return $this->get('default_template_id');
}
@@ -936,8 +943,8 @@ class OsticketConfig extends Config {
'autolock_minutes'=>$vars['autolock_minutes'],
'enable_captcha'=>isset($vars['enable_captcha'])?1:0,
'auto_claim_tickets'=>isset($vars['auto_claim_tickets'])?1:0,
- 'show_assigned_tickets'=>isset($vars['show_assigned_tickets'])?1:0,
- 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?1:0,
+ 'show_assigned_tickets'=>isset($vars['show_assigned_tickets'])?0:1,
+ 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?0:1,
'show_related_tickets'=>isset($vars['show_related_tickets'])?1:0,
'hide_staff_name'=>isset($vars['hide_staff_name'])?1:0,
'enable_html_thread'=>isset($vars['enable_html_thread'])?1:0,
diff --git a/include/class.dept.php b/include/class.dept.php
index 04a0e1b72a43cbd6eaa8ce203698961a0813bfca..5a7363a937d94e54277e5094dd8fd8a1886d8174 100644
--- a/include/class.dept.php
+++ b/include/class.dept.php
@@ -141,6 +141,16 @@ class Dept {
return $this->getMembers(array('available'=>1));
}
+ function getMembersForAlerts() {
+ if ($this->isGroupMembershipEnabled() == 2) {
+ // Disabled for this department
+ $rv = array();
+ }
+ else {
+ $rv = $this->getAvailableMembers();
+ }
+ return $rv;
+ }
function getSLAId() {
return $this->ht['sla_id'];
@@ -327,6 +337,10 @@ class Dept {
return $num;
}
+ function __toString() {
+ return $this->getName();
+ }
+
/*----Static functions-------*/
function getIdByName($name) {
$id=0;
diff --git a/include/class.email.php b/include/class.email.php
index efc4a12601250c18c2ef9094e2f34ed5879bf6d9..aa6facef4bdc65069d159e27aaca430160a54c1f 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -38,6 +38,10 @@ class Email {
$this->ht=db_fetch_array($res);
+ $this->ht['mail_proto'] = $this->ht['mail_protocol'];
+ if ($this->ht['mail_encryption'] == 'SSL')
+ $this->ht['mail_proto'] .= "/".$this->ht['mail_encryption'];
+
$this->id=$this->ht['email_id'];
$this->address=$this->ht['name']?($this->ht['name'].'<'.$this->ht['email'].'>'):$this->ht['email'];
@@ -261,6 +265,9 @@ class Email {
$errors['passwd'] = 'Unable to encrypt password - get technical support';
}
+ list($vars['mail_protocol'], $encryption) = explode('/', $vars['mail_proto']);
+ $vars['mail_encryption'] = $encryption ?: 'NONE';
+
if($vars['mail_active']) {
//Check pop/imapinfo only when enabled.
if(!function_exists('imap_open'))
diff --git a/include/class.i18n.php b/include/class.i18n.php
index ecf2f92f653cbf059a4469507843d6553c5fba38..a06edbae1319a0e9b314b476111aa3e6afe466ea 100644
--- a/include/class.i18n.php
+++ b/include/class.i18n.php
@@ -157,7 +157,19 @@ class Internationalization {
}
}
+ static function getLanguageDescription($lang) {
+ $langs = self::availableLanguages();
+ $lang = strtolower($lang);
+ if (isset($langs[$lang]))
+ return $langs[$lang]['desc'];
+ else
+ return $lang;
+ }
+
static function availableLanguages($base=I18N_DIR) {
+ static $cache = false;
+ if ($cache) return $cache;
+
$langs = (include I18N_DIR . 'langs.php');
// Consider all subdirectories and .phar files in the base dir
@@ -182,9 +194,9 @@ class Internationalization {
);
}
}
- usort($installed, function($a, $b) { return strcasecmp($a['code'], $b['code']); });
+ uasort($installed, function($a, $b) { return strcasecmp($a['code'], $b['code']); });
- return $installed;
+ return $cache = $installed;
}
// TODO: Move this to the REQUEST class or some middleware when that
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 4e83c6f4843b78a29bf992a0190e515b1e82e8ff..3ab0d891a84e15a14a7a7c2ccd0634d557776a6b 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -723,6 +723,15 @@ class MailFetcher {
return $ticket;
}
+ static function getSupportedProtos() {
+ return array(
+ 'IMAP/SSL' => 'IMAP + SSL',
+ 'IMAP' => 'IMAP',
+ 'POP/SSL' => 'POP + SSL',
+ 'POP' => 'POP',
+ );
+ }
+
function fetchEmails() {
diff --git a/include/class.priority.php b/include/class.priority.php
index f4e7cf8c5485b8f0e039dcc41df2b57b33e22a72..63a7434c479f88075ec1170d2a6410768891a0ef 100644
--- a/include/class.priority.php
+++ b/include/class.priority.php
@@ -15,12 +15,12 @@
**********************************************************************/
class Priority {
-
+
var $id;
var $ht;
function Priority($id){
-
+
$this->id =0;
$this->load($id);
}
@@ -65,6 +65,10 @@ class Priority {
return ($this->ht['ispublic']);
}
+ function __toString() {
+ return $this->getDesc();
+ }
+
/* ------------- Static ---------------*/
function lookup($id) {
return ($id && is_numeric($id) && ($p=new Priority($id)) && $p->getId()==$id)?$p:null;
diff --git a/include/class.template.php b/include/class.template.php
index 4394c0fc1af09a7fbeeb2d3a06c7de1f550afea2..d73640cf67f250a00e7dcdce08b7985563a148c2 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -518,7 +518,8 @@ class EmailTemplate {
$inst = self::lookup(self::create($vars, $errors));
// Inline images (attached to the draft)
- $inst->attachments->upload(Draft::getAttachmentIds($inst->getBody()), true);
+ if ($inst)
+ $inst->attachments->upload(Draft::getAttachmentIds($inst->getBody()), true);
return $inst;
}
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 4b708707f916268bbb4985c52fcf103f0c2629b0..27e293523ba0689f7106e544f8f375e6e0a8bce4 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -938,7 +938,7 @@ class Ticket {
//Only alerts dept members if the ticket is NOT assigned.
if($cfg->alertDeptMembersONNewTicket() && !$this->isAssigned()) {
- if(($members=$dept->getMembers()))
+ if(($members=$dept->getMembersForAlerts()))
$recipients=array_merge($recipients, $members);
}
@@ -1211,8 +1211,8 @@ class Ticket {
$recipients=array_merge($recipients, $members);
} elseif($cfg->alertDeptMembersONOverdueTicket() && !$this->isAssigned()) {
//Only alerts dept members if the ticket is NOT assigned.
- if(($members=$dept->getMembers()))
- $recipients=array_merge($recipients, $members);
+ if ($members = $dept->getMembersForAlerts())
+ $recipients = array_merge($recipients, $members);
}
//Always alert dept manager??
if($cfg->alertDeptManagerONOverdueTicket() && $dept && ($manager=$dept->getManager()))
@@ -1409,7 +1409,7 @@ class Ticket {
$recipients = array_merge($recipients, $members);
} elseif($cfg->alertDeptMembersONTransfer() && !$this->isAssigned()) {
//Only alerts dept members if the ticket is NOT assigned.
- if(($members=$dept->getMembers()))
+ if(($members=$dept->getMembersForAlerts()))
$recipients = array_merge($recipients, $members);
}
diff --git a/include/class.topic.php b/include/class.topic.php
index 8d4d460ab1dd915b3b53a047cc425e15541fb348..ad3b21a416f147ba443d2417c786f1bb7c6299b2 100644
--- a/include/class.topic.php
+++ b/include/class.topic.php
@@ -221,7 +221,7 @@ class Topic {
elseif(($tid=self::getIdByName($vars['topic'], $vars['pid'])) && $tid!=$id)
$errors['topic']='Topic already exists';
- if(!$vars['dept_id'])
+ if (!is_numeric($vars['dept_id']))
$errors['dept_id']='You must select a department';
if($errors) return false;
@@ -234,8 +234,7 @@ class Topic {
.',topic='.db_input($vars['topic'])
.',topic_pid='.db_input($vars['pid'])
.',dept_id='.db_input($vars['dept_id'])
- .',priority_id='.db_input(isset($vars['priority_id'])
- ? $vars['priority_id'] : 0)
+ .',priority_id='.db_input($vars['priority_id'])
.',sla_id='.db_input($vars['sla_id'])
.',form_id='.db_input($vars['form_id'])
.',page_id='.db_input($vars['page_id'])
diff --git a/include/i18n/en_US/config.yaml b/include/i18n/en_US/config.yaml
index 9ec6537a20eaf27afa0a7568a7c7048a1237ccd0..9d1e385c3bd979cf2bd12dcfeb6f6f9aa874085b 100644
--- a/include/i18n/en_US/config.yaml
+++ b/include/i18n/en_US/config.yaml
@@ -12,7 +12,7 @@ core:
default_priority_id: 2
enable_daylight_saving: 0
- reply_separator: '-- do not edit --'
+ reply_separator: '-- reply above this line --'
# Do not translate below here
allowed_filetypes: '.doc, .pdf, .jpg, .jpeg, .gif, .png, .xls, .docx, .xlsx, .txt'
diff --git a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
index 7667d5f4a2721023f27c01e3a8efe59ac85580aa..cfafe4f49d8c1ce5d102fd51cda083b4a099d418 100644
--- a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
@@ -16,9 +16,8 @@
system_logs:
title: System Logs
content: >
- If there is anything that is not working correctly, this is the place to
- start. This is where you will find any troubleshooting related logging
- activity (e.g., Errors, Warnings, or Bugs).
+ This is where you will find any troubleshooting related logging
+ activity (e.g., Errors, Warnings, or Bugs).
links:
- title: Customize what type of activity is logged by changing the <br /><span class="doc-desc-title">Default Log Level</span>.
href: /scp/settings.php?t=system
@@ -26,15 +25,15 @@ system_logs:
date_span:
title: Date Span
content: >
- Narrow your calendar range that you would like to view in the <span
+ Select your calendar range that you would like to view in the <span
class="doc-desc-title">System Logs</span>.
type:
title: Type
content: >
- Choose an option to narrow your focus on a specific type of activity.
- <span class="doc-desc-opt">Debug</span> represents the least
- severity, and <span class="doc-desc-opt">Error</span> represents
+ Choose an option to narrow your focus on a specific type of activity.
+ <span class="doc-desc-opt">Debug</span> represents the least
+ severity, and <span class="doc-desc-opt">Error</span> represents
the greatest severity.
showing_logs:
diff --git a/include/i18n/en_US/help/tips/emails.addnew_email.yaml b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
deleted file mode 100644
index 95834ec6447e218f48d6fb3fa9b611b5b4d18a76..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.addnew_email.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Add New Email
-#
-# 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.
-#
----
-email_information_settings:
- title: Email Information & Settings
- content: >
-
-email_address:
- title: Email Address
- content: >
-
-email_name:
- title: Email Name
- content: >
-
-setting:
- title: Setting
- content: >
-
-username:
- title: Username
- content: >
-
-password:
- title: Password
- content: >
-
-login_information:
- title: Login Information
- content: >
- While this is optional, it is required if IMAP/POP or SMTP (with
- authorization) are enabled.
-
-mail_account:
- title: Mail Account
- content: >
- Optional setting for fetching incoming emails. Mail fetching must be enabled with autocron active or external cron setup.
- links:
- - title: Manage <span class="doc-desc-title">Email Polling</span> & <span class="doc-desc-title">AutoCron</span> settings.
- href: /scp/settings.php?t=emails
-status:
- title: Status
- content: >
-
-host:
- title: Host
- content: >
-
-port:
- title: Port
- content: >
-
-protocol:
- title: Protocol
- content: >
-
-encryption:
- title: Encryption
- content: >
-
-fetch_frequency:
- title: Fetch Frequency
- content: >
-
-emails_per_fetch:
- title: Emails Per Fetch
- content: >
-
-fetched_emails:
- title: Fetched Emails
- content: >
-
-smtp_settings:
- title: SMTP Settings
- content: >
- When enabled, the <span class="doc-desc-title">email account</span> will use
- the SMTP server instead of internal PHP mail() function for outgoing emails.
-
-status:
- title: Status
- content: >
-
-smtp_host:
- title: SMTP Host
- content: >
-
-smtp_port:
- title: SMTP Port
- content: >
-
-authentication_required:
- title: Authentication Required
- content: >
-
-allow_header_spoofing:
- title: Allow Header Spoofing
- content: >
-
-internal_notes:
- title: Internal Notes
- content: >
diff --git a/include/i18n/en_US/help/tips/emails.banlist.yaml b/include/i18n/en_US/help/tips/emails.banlist.yaml
index d651d01718e0fda532347300b57e2779bc3ac0eb..64438563fa8f16e4d27fbcee6bd3b565443b2714 100644
--- a/include/i18n/en_US/help/tips/emails.banlist.yaml
+++ b/include/i18n/en_US/help/tips/emails.banlist.yaml
@@ -13,35 +13,8 @@
# must match the HTML #ids put into the page template.
#
---
-ban_new_email:
- title: Ban New Email
- content: >
-
-banned_email_addresses:
+ban_list:
title: Banned Email Addresses
content: >
- (Offer an intro to email address banning here.)
-
-query_search:
- title: Query Search
- content: >
-
-showing_:
- title: Showing…
- content: >
-
-email_address:
- title: Email Address
- content: >
-
-ban_status:
- title: Ban Status
- content: >
-
-date_added:
- title: Date Added
- content: >
-
-last_updated:
- title: Last Updated
- content: >
+ Emails received from banned email addresses listed in the ban list
+ will be automatically rejected.
diff --git a/include/i18n/en_US/help/tips/emails.email.yaml b/include/i18n/en_US/help/tips/emails.email.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5735bdbb638a7b4ec11700ed9f2818fa89b59b30
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.email.yaml
@@ -0,0 +1,138 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Add New Email
+#
+# 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.
+#
+---
+new_ticket_help_topic:
+ title: New Ticket Help Topic
+ content: >
+ Choose a <span class="doc-desc-title">Help Topic</span> to be
+ automatically associated with tickets created via this Email
+ Address.
+ <br/><br/>
+ Forms associated with the Help Topic will be added to the ticket,
+ but will not have any data.
+ links:
+ - title: Manage Help Topics
+ href: /scp/helptopics.php
+
+new_ticket_priority:
+ title: New Ticket Priority
+ content: >
+ Choose the <span class="doc-desc-title">priority</span> for new
+ tickets created via ths Email Address.
+
+new_ticket_department:
+ title: New Ticket Department
+ content: >
+ Choose the <span class="doc-desc-title">Department</span> to which
+ new tickets created via this Email Address will be routed.
+ links:
+ - title: Manage Departments
+ href: /scp/departments.php
+
+auto_response:
+ title: New Ticket Auto-Response
+ content: >
+ You may disable the Auto-Response sent to the User when a new ticket
+ is created via this Email Address.
+
+username:
+ title: Username
+ content: >
+
+password:
+ title: Password
+ content: >
+
+login_information:
+ title: Email Login Information
+ content: >
+ The <span class="doc-desc-title">Username</span> and <span
+ class="doc-desc-title">Password</span> are required to fetch email
+ from IMAP / POP mail boxes as well as to send email through SMTP.
+
+mail_account:
+ title: Fetching Email
+ content: >
+ Fetch emails from a remote IMAP or POP mail box and convert them
+ to tickets in your help desk.
+ links:
+ - title: Manage <span class="doc-desc-title">Email Polling</span> & <span class="doc-desc-title">AutoCron</span> settings.
+ href: /scp/settings.php?t=emails
+
+host_and_port:
+ title: Remote Host
+ content: >
+ Enter the <span class="doc-desc-title">hostname</span> and <span
+ class="doc-desc-title">port</span> number for your mail server. This
+ may be available in the documentation for your hosting account or
+ from your email administrator.
+
+protocol:
+ title: Mail Box Protocol
+ content: >
+ Select the mail box protocol supported by your remote mail server.
+ IMAP is recommended and SSL is encouraged if at all possible.
+
+fetch_frequency:
+ title: Fetch Frequency
+ content: >
+ Enter how often, in minutes, the system will poll the mail box.
+ <br/><br/>
+ This will define the average delay in receiving an Auto-Response
+ after a User sends an email to this mail box.
+
+emails_per_fetch:
+ title: Emails Per Fetch
+ content: >
+ Enter the number of emails processed at one time.
+
+fetched_emails:
+ title: Fetched Emails
+ content: >
+ Decide what to do with processed emails:
+ <br/><br/>
+ <span class="doc-desc-opt"><b>Move to Folder</b></span>:
+ This will backup your email from the INBOX to a
+ folder you specify. If the folder does not yet exist on the server,
+ the system will attempt to automatically create it.
+ (<b>Recommended</b>)
+ <hr>
+ <span class="doc-desc-opt"><b>Delete Emails</b></span>: This will delete
+ your email from the INBOX once it is processed.
+ <hr>
+ <span class="doc-desc-opt"><b>Do Nothing</b></span>: This will leave emails
+ in your INBOX. The system will record the
+ message ids of your email and attempt not to refetch it. However,
+ this option may cause duplicate tickets to be created.
+ (<em>Not Recommended</em>)
+
+smtp_settings:
+ title: SMTP Settings
+ content: >
+ Email sent from the help desk can be sent through an SMTP server.
+ This is recommended, if possible, as it will increase the likelyhood
+ of email delivery and will make the emails less likely to be marked
+ as spam.
+
+header_spoofing:
+ title: Allow Header Spoofing
+ content: >
+ Enable this to allow sending emails via this mail box from an address
+ other that the one given in the <span class="doc-desc-title">Email
+ Address</span> setting above.
+ <br/><br/>
+ This advanced setting is generally used when sending mail from
+ aliases of this mail box.
+
diff --git a/include/i18n/en_US/help/tips/emails.email_template_form.yaml b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
deleted file mode 100644
index 8621207a9c786f4924ee75d050c0d7777f2b634b..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.email_template_form.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Email Template 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_template:
- title: Add New Template
- content: >
-
-template_information:
- title: Template Information
- content: >
-
-name:
- title: Name
- content: >
-
-status:
- title: Status
- content: >
- Enable this template so that it will be visible as an option when
- creating/editing a <span class="doc-desc-title">Department</span>.
-
-language:
- title: Language
- content: >
- As our translation endeavors grow in development, more options will become
- available.
-
-template_to_clone:
- title: Template to Clone
- content: >
- Choose the <span class="doc-desc-opt">Default Template</span> to clone
- if this is your first time creating an <span class="doc-desc-title">Email Template</span>. Each Template
- contains a set of customized Alerts, Responses, Notices, etc. that are utilized
- depending on the relevant event that triggers them. By cloning <span
- class="doc-desc-title">Template Sets</span>, you are able to create <span
- class="doc-desc-title">Templates</span> that only differ minimally without
- having to recreate the details they have in common.
-
-admin_notes:
- title: Admin Notes
- content: >
- These notes are only visible to those whose account type is <span
- class="doc-desc-title">Admin</span>.
diff --git a/include/i18n/en_US/help/tips/emails.emails.yaml b/include/i18n/en_US/help/tips/emails.emails.yaml
deleted file mode 100644
index 8e982d172bd26a695df29d9e7fe1a2ba5f1f6c4f..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.emails.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Emails
-#
-# 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_email:
- title: Add New Email
- content: >
- Custom lists are used to provide drop-down lists for custom forms.
-
-email_addresses:
- title: Email Addresses
- content: >
-
-email:
- title: Email
- content: >
-
-priority:
- title: Priority
- content: >
-
-department:
- title: Department
- content: >
diff --git a/include/i18n/en_US/help/tips/emails.manage_banlist.yaml b/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
deleted file mode 100644
index e4a4b7855933d6d3209f7db0475e1ce0e8bbcae1..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Manage Email Ban List
-#
-# 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.
-#
----
-filter_name:
- title: Filter Name
- content: >
-
-ban_status:
- title: Ban Status
- content: >
-
-email_address:
- title: Email Address
- content: >
diff --git a/include/i18n/en_US/help/tips/emails.template.yaml b/include/i18n/en_US/help/tips/emails.template.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..43458156b51cb8f01addd800e7b55b8d171cf83b
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.template.yaml
@@ -0,0 +1,45 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Templates
+#
+# 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.
+#
+---
+email_templates:
+ title: Email Templates
+ content: >
+ Email Template Sets are used to send Auto-Responses and Alerts for
+ various actions that can take place during a Ticket’s lifetime.
+
+
+template_to_clone:
+ title: Template to Clone
+ content: >
+ Choose a Template Set to clone or simply start with the stock email
+ templates.
+
+language:
+ title: Language
+ content: >
+ Select desired language for the <span
+ class="doc-desc-opt">stock</span> <span class="doc-desc-title">Email
+ Template Set</span>. Language packs are available on osTicket.com.
+ links:
+ - title: osTicket Language Packs
+ href: http://osticket.com/download
+
+status:
+ title: Status
+ content: >
+ <span class="doc-desc-opt">Enabled</span> Template Sets are
+ available to be associated with Departments and set to the system
+ default. Template Sets currently in-use cannot be <span
+ class="doc-desc-opt">Disabled</span>.
diff --git a/include/i18n/en_US/help/tips/emails.templates.yaml b/include/i18n/en_US/help/tips/emails.templates.yaml
deleted file mode 100644
index 57d0e063b5df6f96fece9c9ded0656cd866e1945..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.templates.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Templates
-#
-# 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.
-#
----
-email_templates:
- title: Email Templates
- content: >
- Templates are used as auto-responses for various actions that can take
- place during a Ticket’s lifetime. Alerts are sent to Agents as assigned by
- Department, Team, Help Topic or Group. Responses or Replies are intended
- for the customer or user who created the Ticket. You can create your own
- set of Templates for each Department and customize each message. We highly
- suggest you copy the Default Templates to create a new set for editing. To
- do this, click <span class="doc-desc-title">Add New Template</span>, then
- select the Default Template from the drop-down list next to <span
- class="doc-desc-title">Template to Clone</span>.
-
-showing_templates:
- title: Showing…Templates
- content: >
- Be sure to check the Page section below to ensure that there are not more
- pages displaying more Agent (Staff) Members.
-
-name:
- title: Name
- content: >
-
-status:
- title: Status
- content: >
-
-in_use:
- title: In-Use
- content: >
diff --git a/include/i18n/en_US/help/tips/forms.yaml b/include/i18n/en_US/help/tips/forms.yaml
index e9af021772a1274984bc40d72742a4ef3f69ffcc..020bb06911a5cf1594a05f79092d9a6d41144221 100644
--- a/include/i18n/en_US/help/tips/forms.yaml
+++ b/include/i18n/en_US/help/tips/forms.yaml
@@ -77,7 +77,7 @@ field_variable:
via <code>%{ticket.user.variable}</code></em>
field_delete:
- title: Remote this Field
+ title: Remove this Field
content: >
Check and save the form to remove a field from this form.<br>
<br>
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_response.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.canned_response.yaml
diff --git a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
deleted file mode 100644
index d4f3c913410a6ece7def3ed527704f94c2651fae..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> Canned Responses
-#
-# 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_response:
- title: Add New Response
- content: >
-
-canned_responses:
- title: Canned Responses
- content: >
- Create responses to your more frequently asked questions to expedite
- Client support. You can also upload attachments to <span
- class="doc-desc-title">Canned Responses</span>.
-
-showing_premade_responses:
- title: Showing… Premade Responses
- content: >
-
-title:
- title: Title
- content: >
-
-status:
- title: Status
- content: >
-
-department:
- title: Department
- content: >
diff --git a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
deleted file mode 100644
index f715307e631dd840853a6d787bb7044cac7cea4d..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> Categories
-#
-# 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.
-#
----
-faq_categories:
- title: FAQ Categories
- content: >
- Categories must first be created before any <span class="doc-desc-title">
- FAQs</span> can be published.
-
-setting:
- title: Setting
- content: >
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml b/include/i18n/en_US/help/tips/knowledgebase.category.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.category.yaml
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml b/include/i18n/en_US/help/tips/knowledgebase.faq.yaml
similarity index 93%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.faq.yaml
index 0c9d272d870549bc4b799a420f61b0450ed8502c..6d3e407bb5387269c531ef98b4d07954e7bf37f3 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.faq.yaml
@@ -1,5 +1,5 @@
#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQ -> Add New FAQ
+# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQ
#
# Fields:
# title - Shown in bold at the top of the popover window
@@ -20,4 +20,4 @@ listing_type:
FAQ</span> to be published on public knowledgebase if the parent category is public.
links:
- title: Enable the Public Knowledgebase for the Client Portal
- href: /scp/settings.php?t=kb
\ No newline at end of file
+ href: /scp/settings.php?t=kb
diff --git a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
deleted file mode 100644
index 2c257c8d632dc53442b9676c364bdc7a910eeaf3..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQs
-#
-# 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.
-#
----
-page_header:
- title: Frequently Asked Questions
- content: >
- You must first create <span class="doc-desc-title">Categories</span>
- before any <span class="doc-desc-title">FAQs</span> can be published.
- It is also recommended that you create <span class="doc-desc-title">Help
- Topics</span> before adding <span class="doc-desc-title">FAQs</span>.
- links:
- - title: Create Categories
- href: /scp/categories.php
- - title: Create Help Topics
- href: /scp/helptopics.php
-search_box:
- title: Search for Articles
- content: >
-
-category_select:
- title: Category Filter
- content: >
-
-help_topic_select:
- title: Help Topic Filter
- content: >
-
-resulted_listings:
- title: Resulted Listings
- content: >
-
-listed_categories:
- title: Adding FAQs…
- content: >
- Select one of your categories below to add
- <span class="doc-desc-title">FAQs</span> within it.
diff --git a/include/i18n/en_US/help/tips/manage.addnew_api.yaml b/include/i18n/en_US/help/tips/manage.addnew_api.yaml
deleted file mode 100644
index 668ea53db830447d57be8d5120414cc783d2e2f9..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_api.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New API Key
-#
-# 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.
-#
----
-status:
- title: Status
- content: >
-
-ip_address:
- title: IP Address
- content: >
-
-services:
- title: Services
- content: >
-
-can_create_tickets:
- title: Can Create Tickets
- content: >
- Define various options (XML/JSON/Email) and how they will affect the user
- experience.
-
-can_execute_cron:
- title: Can Execute Cron
- content: >
- <span class="doc-tip-title">Cron</span> is a techincal reference to
- scheduled tasks. Allowing cron execution via the API enables usage
- of the <cron>rcron.php</cron> script packaged in the
- <code>scripts/</code> folder with the system.
diff --git a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
deleted file mode 100644
index fe1b51df48d47b959ffca83014257d5a974dc5b3..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New Help Topic
-#
-# 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.
-#
----
-help_topic_information:
- title: Help Topic Information
- content: >
- Your Help Topics help guide what information is gathered from a Client and
- how that Client is handled by your Company. The Help Topics are specific to
- a Department and can include Custom Forms.
-
-topic:
- title: Topic
- content: >
- Choose a Topic Label by which you want this Help Topic to be recognized.
-
-status:
- title: Status
- content: >
- If disabled, this Help Topic will not be able to be selected by Clients in
- the Client Interface.
-
-type:
- title: Type
- content: >
- If a Topic is labelled as Private, it will only be available for Agents to
- choose when an Agent opens a new Ticket under the Staff Panel.
-
-parent_topic:
- title: Parent Topic
- content: >
- Do you want the New Topic to be treated as a subtopic? If so, then choose a
- Parent Topic under which your New Topic will belong.
-
-new_ticket_options:
- title: New Ticket Options
- content: >
-
-custom_form:
- title: Custom Form
- content: >
- Custom Forms will help you acquire more specific information from Client’s
- that are relevant to specific Departments and/or Help Topics.
- links:
- - title: Create a Custom Form
- href: /scp/forms.php
-
-priority:
- title: Priority
- content: >
- New Tickets created related to the New Topic will be labeled as having what
- priority level?
-
-department:
- title: Department
- content: >
- If a Client chooses this New Topic as relevant to their situation, to what
- Department do you want their Ticket to be routed?
-
-sla_plan:
- title: SLA Plan
- content: >
- Each Department has a default SLA plan for their Tickets. However, if your
- New Topic is a special case requiring different time constraints, you can
- override the Departments default SLA Plan by choosing an SLA Plan here.
- links:
- - title: Create or Edit SLA Plans
- href: /scp/slas.php
-
-thank_you_page:
- title: Thank-You Page
- content: >
- Choose the Thank-You Page to which a Client is directed after opening a
- Ticket.
- links:
- - title: Manage your Thank-You Page
- href: /scp/pages.php
-
-auto_assign_to:
- title: Auto-assign to…
- content: >
- You may optionally choose to what Agent or Team the Tickets characterized
- by this New Topic will be sent.
- links:
- - title: Manage Teams
- href: /scp/teams.php
-
-ticket_auto_response:
- title: Ticket Auto-response
- content: >
- If enabled, this will prevent any alert sent out to notify any Agent of the
- new ticket. Therefore, this overrides any setting of the
- <span class="doc-desc-title">Department</span> to which the ticket belongs.
-
-admin_notes:
- title: Admin Notes
- content: >
- These notes are only visible to those whose account type is <span
- class='doc-desc-opt'>Admin</span>.
-
-add_topic:
- title: Add Topic
- content: >
diff --git a/include/i18n/en_US/help/tips/manage.addnew_page.yaml b/include/i18n/en_US/help/tips/manage.addnew_page.yaml
deleted file mode 100644
index 245496351c965ff350f60da80c6ac1b47e64f4e7..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_page.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New Page
-#
-# 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.
-#
----
-page_information:
- title: Page Information
- content: >
-
-name:
- title: Name
- content: >
-
-type:
- title: Type
- content: >
-
-status:
- title: Status
- content: >
-
-page_body:
- title: Page Body
- content: >
diff --git a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
deleted file mode 100644
index 255a4e24d806492805c55395022f9c7457019149..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New SLA Plan
-#
-# 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.
-#
----
-name:
- title: Name
- content: >
- Choose a name for this <span class="doc-desc-title">SLA Plan</span>
- that will reflect its purpose or specificity (e.g., exclusivity to
- a <span class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span>).
-
-grace_period:
- title: Grace Period
- content: >
- This is the how many hours pass by before the status of tickets
- with this <span class="doc-desc-title">SLA Plan</span> are rendered
- as <span class="doc-desc-opt">Overdue</span>.
-
-status:
- title: Status
- content: >
-
-priority_escalation:
- title: Priority Escalation
- content: >
- If enabled, the <span class="doc-desc-title">Priority</span> level
- of tickets will increase as the duration of a ticket’s status as
- <span class="doc-desc-opt">Overdue</span> increases. It is
- recommended to enable to help your Agents prioritize their tickets
- properly.
-
-transient:
- title: Transient
- content: >
- Enable this if you want to allow restrictions of a <span
- class="doc-desc-title">SLA Plan</span> to be overridden
- when a ticket is transferred or its <span
- class="doc-desc-title">Help Topic</span> is changed.
-
-ticket_overdue_alerts:
- title: Ticket Overdue Alerts
- content: >
diff --git a/include/i18n/en_US/help/tips/manage.api_keys.yaml b/include/i18n/en_US/help/tips/manage.api_keys.yaml
index 6fe6e7c819a02b8e359fa6879b7781882c415438..f7bdbdae78693b8a9e1c51ddf2e6f9d93f379e7a 100644
--- a/include/i18n/en_US/help/tips/manage.api_keys.yaml
+++ b/include/i18n/en_US/help/tips/manage.api_keys.yaml
@@ -13,22 +13,20 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_api_key:
- title: Add New API Key
- content: >
-
-api_keys_table:
- title: API Keys
- content: >
api_key:
title: API Key
content: >
+ API keys are used to authenticate clients submitting new tickets via
+ the Application Programming Interface (API). API keys are used
+ instead of passwords. Since API keys may be sent unencrypted, they
+ are linked to each client's network IP address.
+ links:
+ - title: osTicket API Documentation
+ href: https://github.com/osTicket/osTicket-1.8/blob/develop/setup/doc/api.md
ip_addr:
title: IP Address
content: >
-
-status:
- title: Status
- content: >
+ Client's network IP address. Each unique client IP address will
+ require separate API keys
diff --git a/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml b/include/i18n/en_US/help/tips/manage.custom_list.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
rename to include/i18n/en_US/help/tips/manage.custom_list.yaml
diff --git a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml b/include/i18n/en_US/help/tips/manage.filter.yaml
similarity index 53%
rename from include/i18n/en_US/help/tips/manage.addnew_filter.yaml
rename to include/i18n/en_US/help/tips/manage.filter.yaml
index 7e1f60edd19e66be458b63a6ae5f1392f7c27459..3b1da4336e7eb2ac5b46ffcf0b69a9da842d182e 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
+++ b/include/i18n/en_US/help/tips/manage.filter.yaml
@@ -1,5 +1,5 @@
#
-# This is popup help messages for the Admin Panel -> Manage -> Add New Filter
+# This is popup help messages for the Admin Panel -> Manage -> Filter
#
# Fields:
# title - Shown in bold at the top of the popover window
@@ -13,39 +13,29 @@
# must match the HTML #ids put into the page template.
#
---
-filter_name:
- title: Filter Name
- content: >
execution_order:
title: Execution Order
content: >
- Choose a number that controls the priority of the filter being created. The
+ Enter a number that controls the priority of the filter. The
lower the number, the higher the priority this filter will have in being
- executed over against another filter that might have an identical match.
- A match is found according to the filter rules set below. If you want this
- filter to be the last filter applied to a match, enable <span
+ executed over against another filter that might have higher order of execution.
+ <br><br>
+ If you want this filter to be the last filter applied on a match, enable <span
class="doc-desc-title">Stop Processing Further On Match</span>.
-filter_status:
- title: Filter Status
- content: >
-
-target:
- title: Target
+target_channel:
+ title: Channel
content: >
- Choose the <span class="doc-desc-title">Target</span> for your <span
+ Choose the target <span class="doc-desc-title">Channel</span> for your <span
class="doc-desc-title">ticket Filter</span>. The <span
- class="doc-desc-title">Target</span> is the source that created the ticket.
- So, for example, if you choose <span class="doc-desc-opt">Web Forms</span>,
+ class="doc-desc-title">Channel</span> is the source through which the ticket arrived into the system.
+ <br><br>
+ For example, if you choose <span class="doc-desc-opt">Web Forms</span>,
you are saying that you want to apply the <span
class="doc-desc-title">ticket Filter</span> to those tickets that
originated from the Client Portal's webform.
-filter_rules:
- title: Filter Rules
- content: >
-
rules_matching_criteria:
title: Rules Matching Criteria
content: >
@@ -58,55 +48,42 @@ rules_matching_criteria:
Filter</span> to be matched, choose <span class="doc-desc-opt">Match
All</span>.
-basic_fields_criterion:
- title: Basic Fields Criterion
- content: >
- The selectable options below this header are those elements which can be
- found in any standard ticket. Note: the Email option here indicates from
- whom the Email was sent.
-
-criterion_operator:
- title: Criterion Operator
- content: >
- Choose an operator to control what kind of test is performed against the
- chosen field on the left with the value entered in the text field on the
- right.
-
-filter_actions:
- title: Filter Actions
- content: >
-
reject_ticket:
title: Reject Ticket
content: >
- If this is enabled, all other choices of action below will be ignored.
+ If this is enabled, further processing is stopped and all other choices of action below will be ignored on match.
reply_to_email:
title: Reply-To Email
content: >
- Enable this if you want your Help Desk to honor a Client's email
- application's <span class="doc-desc-title">Reply To</span> data. This field
- is only relevant if the <span class="doc-desc-title">Target</span> above is
- an <span class="doc-desc-opt">Email Address</span>.
+ Enable this if you want your Help Desk to honor a User's email
+ application's <span class="doc-desc-title">Reply To</span> header.
+ This field is only relevant if the <span
+ class="doc-desc-title">Channel</span> above includes <span
+ class="doc-desc-opt">Email</span>.
ticket_auto_response:
- title: ticket Auto-Response
+ title: Disable Ticket Auto-Response
content: >
<em>Note: This will override any <span
- class="doc-desc-title">Department</span> settings.</em>
+ class="doc-desc-title">Department</span> or <span class="doc-desc-title">Autoresponder settings</span>.</em>
canned_response:
- title: Canned Response
- content: >
- Choose the <span class="doc-desc-title">Canned Response</span> you want included in the email to go out from the Default Email Address of the <span class="doc-desc-title">Help Desk</span> or <span class="doc-desc-title">Department</span> (if enabled). The <span class="doc-desc-title">New ticket Auto-Reply</span> template in an <span class="doc-desc-title">Email Template Set</span> will control how the <span class="doc-desc-title">Canned Response</span> is included in that email. What <span class="doc-desc-title">Email Template Set</span> is used depends on what template set is assigned as default, or to a matching ticket's <span class="doc-desc-title">Department</span>.
+ title: Canned Auto-Reply
+ content: >
+ Choose a <span class="doc-desc-title">Canned Response</span> you
+ want to be emailed to the user on <span
+ class="doc-desc-title">Ticket Filter</span> match. The <span
+ class="doc-desc-title">New Ticket Auto-Reply</span> template used
+ depends on what <span class="doc-desc-title">template set</span> is
+ assigned as default, or to a matching ticket's <span
+ class="doc-desc-title">Department</span>.
links:
- title: Manage Canned Responses
href: /scp/canned.php
- - title: Manage Departments
- href: /scp/departments.php
- title: Manage Template Sets
href: /scp/templates.php
- - title: Edit the Default New Ticket Auto-Reply Template
+ - title: New Ticket Auto-Reply Template
href: /scp/templates.php?id=2&a=manage
department:
@@ -115,6 +92,9 @@ department:
Choose what <span class="doc-desc-title">Department</span> you want the
matches of the <span class="doc-desc-title">Ticket Filter</span> to be
assigned.
+ links:
+ - title: Manage Departments
+ href: /scp/canned.php
priority:
title: Priority
@@ -123,8 +103,8 @@ priority:
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.<br />
<br />
- <em>Note: This will override any <span
- class="doc-desc-title">Department</span> settings.</em>
+ <em>Note: This will override <span
+ class="doc-desc-title">Department</span> or <span class="doc-desc-title"> Help Topic</span> settings.</em>
sla_plan:
title: SLA Plan
@@ -132,12 +112,20 @@ sla_plan:
Choose the <span class="doc-desc-title">SLA Plan</span> you want to
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.
+ links:
+ - title: Manage SLA Plans
+ href: /scp/slaplan.php
-auto_assign_to:
- title: Auto-Assign to…
+auto_assign:
+ title: Auto-Assign
content: >
- Choose the Agent to whom you want the matches of the <span
+ Choose an Agent or a Team to whom you want the matches of the <span
class="doc-desc-title">Ticket Filter</span> to be assigned.
+ links:
+ - title: Manage Agents
+ href: /scp/staff.php
+ - title: Manage Teams
+ href: /scp/teams.php
help_topic:
title: Help Topic
@@ -145,6 +133,9 @@ help_topic:
Choose the <span class="doc-desc-title">Help Topic</span> you want to
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.
+ links:
+ - title: Manage Help Topics
+ href: /scp/helptopics.php
admin_notes:
title: Admin Notes
diff --git a/include/i18n/en_US/help/tips/manage.help_topics.yaml b/include/i18n/en_US/help/tips/manage.help_topics.yaml
deleted file mode 100644
index 519a870091d62d1c4ad09038682a5de1ad4b0850..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.help_topics.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Help Topics
-#
-# 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.
-#
----
-help_topics:
- title: Help Topics
- content: >
- Your Help Topics help guide what information is gathered from a Client and
- how that Client is handled by your Company. The Help Topics are specific to
- a Department and can include Custom Forms.
diff --git a/include/i18n/en_US/help/tips/manage.helptopic.yaml b/include/i18n/en_US/help/tips/manage.helptopic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d2179170cea229fe773d361c85080c4e15c73188
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.helptopic.yaml
@@ -0,0 +1,114 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Help Topic
+#
+# 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.
+#
+---
+help_topic_information:
+ title: Help Topic Information
+ content: >
+ <span class="doc-desc-title">Help Topics</span> guide what
+ information is gathered from Users and how tickets are routed or
+ assigned.
+topic:
+ title: Topic Name
+ content: >
+ Unique Help Topic name.
+
+status:
+ title: Status
+ content: >
+ If disabled, this <span class="doc-desc-title">Help Topic</span>
+ will not be available.
+
+type:
+ title: Type
+ content: >
+ If a <span class="doc-desc-title">Help Topic</span> is labeled as
+ Private, it will only be available for Agents to choose when an
+ Agent opens a new Ticket under the Staff Panel.
+
+parent_topic:
+ title: Parent Topic
+ content: >
+ Select the Parent Topic to which this <span
+ class="doc-desc-title">Help Topic</span> will belong. The Parent
+ Topic will appear first in the listing with this <span
+ class="doc-desc-title">Help Topic</span> listed behind the parent.
+
+custom_form:
+ title: Custom Form
+ content: >
+ Custom Forms will help you acquire more specific information from
+ Users that are relevant to this <span class="doc-desc-title">Help
+ Topic</span>.
+ links:
+ - title: Manage Custom Forms
+ href: /scp/forms.php
+
+priority:
+ title: Priority
+ content: >
+ Select the Priority assigned to new tickets related to this <span
+ class="doc-desc-title">Help Topic</span>.
+ <br><br>
+ Ticket Filters can override new ticket Priority.
+
+department:
+ title: Department
+ content: >
+ Choose Department to which new tickets under this Help Topic will be routed.
+ links:
+ - title: Manage Departments
+ href: /scp/departments.php
+sla_plan:
+ title: SLA Plan
+ content: >
+ Choose SLA plan associated with this <span class="doc-desc-title">Help Topic</span>.
+ <br><br>
+ This selection will override any selected Department's SLA plan
+ links:
+ - title: Manage SLA Plans
+ href: /scp/slas.php
+
+thank_you_page:
+ title: Thank-You Page
+ content: >
+ Choose the Thank-You Page to which a User is directed after opening a
+ Ticket under this <span class="doc-desc-title">Help Topic</span>.
+ links:
+ - title: Manage Thank-You Pages
+ href: /scp/pages.php
+
+auto_assign_to:
+ title: Auto-assign New Tickets
+ content: >
+ Optionally choose an Agent or Team to auto-assign tickets opened
+ with this <span class="doc-desc-title">Help Topic</span>
+ <br><br>
+ Ticket Filters can override assignment.
+ links:
+ - title: Manage Staff and Teams
+ href: /scp/staff.php
+
+ticket_auto_response:
+ title: Ticket Auto-response
+ content: >
+ If checked, the setting will disable new ticket auto-responses for
+ this <span class="doc-desc-title">Help Topic</span>.
+ <br><br>
+ This overrides the autoresponder setting for the <span
+ class="doc-desc-title">Department</span> as well as global <span
+ class="doc-desc-title">Autoresponder settings</span>.
+ links:
+ - title: Autoresponder Settings
+ href: /scp/settings.php?t=autoresp
diff --git a/include/i18n/en_US/help/tips/manage.pages.yaml b/include/i18n/en_US/help/tips/manage.pages.yaml
index 3a21cb377663df34c3e58123c4066d4454aa1da4..842e1519cb8059882b6d1360c268b8f45e23301c 100644
--- a/include/i18n/en_US/help/tips/manage.pages.yaml
+++ b/include/i18n/en_US/help/tips/manage.pages.yaml
@@ -13,22 +13,23 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_page:
- title: Add New Page
- content: >
-
site_pages:
title: Site Pages
content: >
-
-name:
- title: Name
- content: >
+ Site pages can serve as a mini Content Management System (CMS). You
+ can define multiple landing, offline, and thank-you pages and
+ configure them in the company settings and help topics.
+ links:
+ - title: Company Settings
+ href: /scp/settings?t=pages
type:
title: Type
content: >
-
-status:
- title: Status
- content: >
+ <span class="doc-desc-opt">Offline</span> pages are displayed on the
+ client portal if your help desk is disabled. <span
+ class="doc-desc-opt">Landing</span> pages are displayed on the home
+ page of your client portal. <span class="doc-desc-opt">Thank
+ You</span> pages are displayed after a user submits a ticket. <span
+ class="doc-desc-opt">Other</span> pages can be used as a simple
+ content management system (CMS).
diff --git a/include/i18n/en_US/help/tips/manage.sla.yaml b/include/i18n/en_US/help/tips/manage.sla.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c1153378659b515125dfd7630610be69a3a37bb5
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.sla.yaml
@@ -0,0 +1,36 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> SLA Plan
+#
+# 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.
+#
+---
+name:
+ title: Name
+ content: >
+ Choose a discriptive name for this <span class="doc-desc-title">SLA Plan</span>
+ that will reflect its purpose.
+
+grace_period:
+ title: Grace Period
+ content: >
+ Determine the number of hours after a ticket is created that it will
+ be automatically marked as overdue.
+ <br><br>
+ <em>Hours are counted from ticket create time.</em>
+
+transient:
+ title: Transient
+ content: >
+ Transient SLAs are considered temporary and can be overridden by
+ a non-transient SLA on <span class="doc-desc-opt">Department</span>
+ transfer or when its <span class="doc-desc-title">Help Topic</span>
+ is changed.
diff --git a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
deleted file mode 100644
index 92bf291040388a744695bb2b35efd06fa033c28d..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Ticket Filters
-#
-# 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.
-#
----
-ticket_filters:
- title: Ticket Filters
- content: >
-
-name:
- title: Name
- content: >
-
-status:
- title: Status
- content: >
-
-order:
- title: Order
- content: >
-
-rules:
- title: Rules
- content: >
-
-target:
- title: Target
- content: >
diff --git a/include/i18n/en_US/help/tips/settings.access.yaml b/include/i18n/en_US/help/tips/settings.access.yaml
index 53c6be38bf73ab28370bc1f1a6220caa18ebd1e7..17a86118687abd1f9aa2b2b67b88103a5680aff3 100644
--- a/include/i18n/en_US/help/tips/settings.access.yaml
+++ b/include/i18n/en_US/help/tips/settings.access.yaml
@@ -31,41 +31,44 @@ password_expiration_policy:
allow_password_resets:
title: Allow Password Resets
content: >
- Enable this feature if you would like to display the
+ Enable this feature if you would like to display the
<span class="doc-desc-title">Forgot My Password</span> link on the
<span class="doc-desc-title">Staff Log In Panel</span>
- after 2 failed log in attempts.
+ after a failed log in attempt.
reset_token_expiration:
title: Password Reset Window
content: >
Choose the duration (in minutes) for which the <span class="doc-desc-title">
- Password Reset Token</span> will be valid. When an Agent requests a <span
+ Password Reset Tokens</span> will be valid. When an Agent requests a <span
class="doc-desc-title">Password Reset</span>, they are emailed a token that
- will permit the reset to take place. This token however must have an
- expiration.
+ will permit the reset to take place.
staff_session_timeout:
title: Staff Session Timeout
content: >
Choose the maximum idle time (in minutes) before an Agent is required to
- log in again. If you would like to disable <span
- class="doc-desc-title">Staff Session Timeouts</span>,
- enter 0 to <span class="doc-desc-opt">disable</span>.
+ log in again.
+ <br><br>
+ If you would like to disable <span class="doc-desc-title">Staff
+ Session Timeouts</span>, enter 0.
client_session_timeout:
- title: Client Session Timeout
+ title: User Session Timeout
content: >
- Choose the maximum idle time (in minutes) before a Client is required to
- log in again. If you would like to disable <span
- class="doc-desc-title">Client</span> <span class="doc-desc-title">Session
- Timeouts,</span> enter 0 to <span class="doc-desc-opt">disable</span>.
+ Choose the maximum idle time (in minutes) before a User is required to
+ log in again.
+ <br><br>
+ If you would like to disable <span
+ class="doc-desc-title">User Session Timeouts,</span> enter 0.
bind_staff_session_to_ip:
title: Bind Staff Session to IP
content: >
- Enable this if you want the Agent to be remembered by their current IP
- at the time of Log In.
+ Enable this if you want Agent to be remembered by their current IP
+ upon Log In.
+ <br><br>
+ This setting is not recommened for users assigned IP addreses dynamically.
registration_method:
title: Registration Options
@@ -89,7 +92,7 @@ registration_method:
<td>Anyone can create a ticket, but only agents
can register accounts</td></tr>
<tr><td>Yes</td><td>Private</td>
- <td>Client access is by invitation only</td></tr>
+ <td>User access is by invitation only</td></tr>
<tr><td>No</td><td>Disabled</td>
<td>No one can register for an account, but anyone can
create a ticket. <em>This was how osTicket functioned
diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml
index d13a702e51d84ad887c7ff2a99fb38b1eb777729..3dab4c81af1ffd97a4bf58d4f1e9bb1969d862cd 100644
--- a/include/i18n/en_US/help/tips/settings.alerts.yaml
+++ b/include/i18n/en_US/help/tips/settings.alerts.yaml
@@ -16,194 +16,78 @@
page_title:
title: Alerts and Notices
content: >
- Alerts and Notices are automated messages sent to staff members
- related to ticket events. The following table allows you to
- configure which events should trigger automated notifications, and,
- for those which are enabled, which staff members should be included
- on the automated notifications.
+ Alerts and Notices are automated email notifications sent to Agents
+ when various ticket events are triggered.
-new_ticket_alert:
+ticket_alert:
title: New Ticket Alert
content: >
<p>
- Pertains to alerts that are sent out when new tickets are created.
+ Alert sent out to Agents when a new ticket is created.
</p><p class="info-banner">
<i class="icon-info-sign"></i>
- Staff members (department members) are not
- notified with this alert if the ticket is automatically assigned.
+ This alert is not sent out if the ticket is auto-assigned via Ticket Filter or a Help Topic section.
</p>
links:
- title: Default New Ticket Alert Template
href: /scp/templates.php?default_for=ticket.alert
-status:
- title: Status
- content: >
- You may choose to disable whether any notice of New Tickets are sent out at
- all.
-
-new_message_alert:
+message_alert:
title: New Message Alert
content: >
- Alert sent out when a New Message from the Client is appended to an
- existing ticket.
+ Alert sent out to Agents when a new message from the User is
+ appended to an existing ticket.
links:
- title: Default New Message Alert Template
href: /scp/templates.php?default_for=message.alert
-status_2:
- title: Status
- content: >
- You may disable this Alert.
-
-last_respondent:
- title: Last Respondent
- content: >
- Choose whether you would like the last Agent to have communicated with the
- Client to be Alerted of the Client’s reply.
-
-assigned_staff:
- title: Assigned Staff
- content: >
- Choose whether you would like the Assigned Agent to receive an Alert of a
- Client’s reply.
-
-department_manager:
- title: Department Manager
- content: >
- If enabled, the Department Manager’s Inbox could be flooded unnecessarily
- with Email Alerts.
-
-new_internal_note_alert:
+internal_note_alert:
title: New Internal Note Alert
content: >
- Pertains to alerts that are sent out when a new <span
- class="doc-desc-title">Internal Note</span> is recorded.
+ Alert sent out to Agents when a new <span
+ class="doc-desc-title">Internal Note</span> is appended to a ticket.
links:
- title: Default Ticket Activity Template
href: /scp/templates.php?default_for=note.alert
-last_respondent_2:
- title: Last Respondent
- content: >
- If enabled, the last Agent to have communicated with the Client will
- receive an Alert that an Agent has recorded a new Internal Note on a Ticket
- with which they have been involved.
-
-assigned_staff_2:
- title: Assigned Staff
- content: >
- If enabled, the last Agent assigned to the Ticket will receive an Alert
- that an Agent has recorded a new Internal Note.
-
-department_manager_2:
- title: Department Manager
- content: >
- If enabled, the Department Manager’s Inbox could be flooded unnecessarily
- with Email Alerts.
-
-ticket_assignment_alert:
+assignment_alert:
title: Ticket Assignment Alert
content: >
- Pertains to alerts that are sent out to Agents when a ticket is assigned.
+ Alert sent out to Agents on ticket assignment.
links:
- title: Default Ticket Assignment Alert Template
href: /scp/templates.php?default_for=assigned.alert
-assigned_staff_3:
- title: Assigned Staff
- content: >
- If enabled, the Agent being assigned to a Ticket will receive an Alert
- notifying them of such.
-
-team_lead:
- title: Team Lead
- content: >
- If enabled, if a Ticket is assigned to a Team, the Team Lead will be
- alerted of the new Assigned Ticket. (To manage your Teams, see Admin Panel
- -> Agent (Staff) Members -> Teams).
-
-team_members:
- title: Team Members
- content: >
- If enabled, if a Ticket is assigned to a Team, the entire Team will be
- alerted of the new Assigned Ticket. This may cause an unnecessary amount of
- Email traffic and should be used with caution. (To manage your Teams, see
- Admin Panel -> Agent (Staff) Members -> Teams).
-
-ticket_transfer_alert:
+transfer_alert:
title: Ticket Transfer Alert
content: >
- Pertains to alerts that are sent out to the target <span
- class="doc-desc-title">department</span> when a ticket is transferred.
+ Alert sent out to Agents on ticket transfer between Departments.
links:
- title: Default Ticket Transfer Alert Template
href: /scp/templates.php?default_for=transfer.alert
-assigned_staff_team:
- title: Assigned Staff/Team
- content: >
- If enabled, the new Agent/Team of the targeted Department will be alerted
- of such.
-
-department_manager_3:
- title: Department Manager
- content: >
- If enabled, when a Ticket is transferred to a new Department, the Manager
- of the targeted Department will be alerted of such.
-
-department_members:
- title: Department Members
- content: >
- If enabled, the every member of the Targeted Department will receive an
- Alert of the Ticket Transfer. This may cause an unnecessary amount of Email
- traffic and should be used with caution.
-
-overdue_ticket_alert:
+overdue_alert:
title: Overdue Ticket Alert
content: >
- Pertains to alerts that are sent out when a ticket becomes overdue. The
- <span class="doc-desc-title">Administrator</span> receives an alert by
- default.
+ Alert sent out to Agents when a ticket becomes overdue based on SLA
+ or Due Date.
links:
- title: Default Stale Ticket Alert Template
href: /scp/templates.php?default_for=ticket.overdue
-assigned_staff_team_2:
- title: Assigned Staff/Team
- content: >
- The Agent or Team that is assigned to the Ticket entering an Overdue status
- will be alerted of such.
-
-department_manager_4:
- title: Department Manager
- content: >
- The Manager of the Department whose Ticket enters an Overdue status will be
- alerted.
-
-department_members_2:
- title: Department Members
- content: >
- If enabled, every member of the <span class="doc-desc-title">Department</span> will receive an Alert of the
- Overdue status of the ticket. This may cause an unnecessary amount of Email
- traffic and should be used with caution.
+ - title: Manage SLAs
+ href: /scp/slas.php
system_alerts:
title: System Alerts
content: >
- Pertains to alerts that are sent out when a <span
- class="doc-desc-title">System Error</span> occurs. This is enabled by
- default. Errors are sent to the system <span
- class="doc-desc-title">Administrator</span> (%{config.admin_email}).
-
-system_errors:
- title: System Errors
- content: >
- This is enabled by default. Alerts of System Errors are sent to the System
- Administrator’s Email.
+ Significant system events that are sent out to the Administrator
+ (%{config.admin_email}). Depending on the configured <span
+ class="doc-desc-title">Log Level</span>, the events are also made
+ available in the <span class="doc-desc-title">System Logs</span>
+ links:
+ - title: View System Logs
+ href: /scp/logs.php
-excessive_login_attempts:
- title: Excessive Login Attempts
- content: >
- If enabled, the System Administrator will be alerted when a Client or Agent
- undergoes excessive failed login attempts.
+ - title: Change Admin Email
+ href: /scp/settings.php?t=emails
diff --git a/include/i18n/en_US/help/tips/settings.autoresponder.yaml b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
index e67db2f5e1e3f48d3e1ddad28e0863577c8f24d0..35faf7ae2f1558dd8b193c207fd56c41b2bf5a8f 100644
--- a/include/i18n/en_US/help/tips/settings.autoresponder.yaml
+++ b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
@@ -16,47 +16,45 @@
new_ticket:
title: New Ticket
content: >
- Enable this if you want a confirmation message sent to the Client
- that the Help Desk has received their new ticket. The message sent to
- the Client is customizable.
+ Enable this if you want an autoresponse to be sent to the User on new ticket.
links:
- - title: Default New Ticket Autoresponse Template
+ - title: New Ticket Autoresponse Template
href: /scp/templates.php?default_for=ticket.autoresp
new_ticket_by_staff:
title: New Ticket by Staff
content: >
- Notice sent when staff creates a ticket on behalf of the user. <em>Staff
+ Notice sent when an Agent creates a ticket on behalf of the User. <em>Agent
can override this when creating new tickets.</em>
links:
- - title: Default New Ticket by Staff Autoresponse Template
+ - title: New Ticket Notice Template
href: /scp/templates.php?default_for=ticket.notice
new_message_for_submitter:
- title: New Message for Submitter
+ title: New Message Confirmation
content: >
Confirmation notice sent when a new message is appended to an existing
ticket.
links:
- - title: Default New Message Confirmation Template
+ - title: New Message Confirmation Template
href: /scp/templates.php?default_for=message.autoresp
new_message_for_participants:
- title: New Message for Participants
+ title: New Message Notice
content: >
Broadcast messages received from message submitter to all other
participants on the ticket.
links:
- - title: Default New Activity Template
+ - title: New Activity Notice Template
href: /scp/templates.php?default_for=ticket.activity.notice
overlimit_notice:
title: Overlimit Notice
content: >
- Send ticket denied notice sent to user on limit violation. Admin gets
- alerts on <em>all</em> denials by default.
+ Ticket denied notice sent to User on <span
+ class="doc-desc-title">Maximum Open Tickets</span> violation.
links:
- - title: Default Overlimit Notice Template
+ - title: Overlimit Notice Template
href: /scp/templates.php?default_for=ticket.overlimit
- title: Set <em>Maximum Open Tickets</em>
diff --git a/include/i18n/en_US/help/tips/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index de1a41d4acf0ba110b875a67f1db1ba25ad35247..ddad061bf26697b757e4fea6c797b1fd0782a45a 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -14,109 +14,112 @@
#
---
default_email_templates:
- title: Default Email Templates
+ title: Default Email Template Set
content: >
- <span class="doc-desc-title">Templates</span> are used as <span
- class="doc-desc-title">Auto-Responses</span> for various actions that can
- take place during a Ticket’s lifetime. <span
- class="doc-desc-title">Alerts</span> are sent to Agents as assigned by
- <span class="doc-desc-title">Department</span>, <span
- class="doc-desc-title">Team</span>, <span class="doc-desc-title">Help
- Topic</span> or <span class="doc-desc-title">Group</span>. Responses or
- Replies are intended for the Client who created the Ticket.
+ Select <span class="doc-desc-title">Email Template Set</span> used to send <span
+ class="doc-desc-title">Auto-Responses</span> and <span class="doc-desc-title">Alerts</span> for various actions that can
+ take place during a Ticket’s lifetime.
+ <br><br>
+ Departments can be assigned a specific Email Template Set.
+ links:
+ - title: Manage Email Template Sets
+ href: /scp/templates.php
default_system_email:
- title: Default System Email
+ title: Default Outgoing Email
content: >
- Choose an Email Address from which <span
- class="doc-desc-title">Auto-Responses</span> are sent to Clients. Note,
- however, that if the Department to which a Ticket is assigned sets its own
- Default Email Address, that Department Address will override what is set
- here.
+ Choose an email address from which outgoing emails are sent.
+ <br><br>
+ <span class="doc-desc-title">Department</span> can set its own <span
+ class="doc-desc-title">email address</span> which will override what is set here.
+ links:
+ - title: Manage Email Addresses
+ href: /scp/emails.php
default_alert_email:
title: Default Alert Email
content: >
- Choose an Email Address from which Agents are sent <span class="doc-desc-title">Alerts &
- Notices</span>. Note, however, that if the <span
- class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span> sets its own <span
- class="doc-desc-title">Default Email Address</span>, that <span
- class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span> setting will override what is set
- here.
+ Choose an email address from which <span class="doc-desc-title">Alerts &
+ Notices</span> are sent to Agents.
+ links:
+ - title: Manage Email Addresses
+ href: /scp/emails.php
admins_email_address:
title: Admin’s Email Address
content: >
- Choose an Email Address from which notices of the <span
- class="doc-desc-title">System Error Log</span> and <span
- class="doc-desc-title">New Ticket Alerts</span> (if enabled) are sent to
- the Helpdesk Administrator.
+ Enter an adminstrator's email address to which <span
+ class="doc-desc-title">System Errors</span> and <span
+ class="doc-desc-title">New Ticket Alerts</span> (if enabled) are sent.
+ links:
+ - title: Manage Alerts & Notices
+ href: /scp/settings.php?t=alerts
-incoming_emails:
- title: Incoming Emails
+email_fetching:
+ title: Email Fetching
content: >
- Allow IMAP/POP polling once you have set up the information in emails
- section of Admin Panel. You can also edit the reply separator text.
-
+ Allow IMAP/POP polling for configured and enabled <span class="doc-desc-title">Mail Boxes</span>.
+ links:
+ - title: Manage Mail Boxes
+ href: /scp/emails.php
-email_polling:
- title: Email Polling
+enable_autocron_fetch:
+ title: Fetch Emails using Auto-cron
content: >
- Allow IMAP/POP polling once you have set up the information in emails
- section of Admin Panel. You can also edit the reply separator text.
+ Enables periodic email fetching using an internal task manager
+ triggered by Agents' activity. <br><br> Please note that emails will not be
+ fetched if no one is logged in to Staff Control Panel. External task scheduler
+ is highly recommended for predictable fetch intervals.
+ links:
+ - title: Using External Task Scheduler
+ href: http://osticket.com/wiki/POP3/IMAP_Setting_Guide#Schedule_Polling
strip_quoted_reply:
title: Strip Quoted Reply
content: >
- If enabled, this will remove any preceding correspondences duplicated
- between response communication. Thereby, the Agent & Client, when viewing
- the Ticket, will not see any one preceding message duplicated. <br /><br />
- <strong>Note:</strong> this will not actually delete preceding communication; it will only hide it from
- the Agent & Client. Furthermore, this feature is relationally dependent
- on the <span class="doc-desc-title">Reply Separator Tag</span> below.
+ If enabled, this will remove preceding correspondence between email communications.
+ <br><br>
+ This feature is relationally dependent on the <span
+ class="doc-desc-title">Reply Separator Tag</span> below.
reply_separator_tag:
title: Reply Separator Tag
content: >
- This is the string that will tell the engine that anything below this line
- is old correspondence. This way the engine knows to remove it from the
- Client or Agent’s sight. <br /><br />
+ This is a token indicating to the User to reply above the line.
+ <br><br>
<strong>Note:</strong> this is only relevant if <span
class="doc-desc-title">Strip Quoted Reply</span> is enabled above.
emailed_tickets_priority:
title: Emailed Tickets Priority
content: >
- Choose whether you would like the priority option of the email service
- (e.g., Yahoo, Gmail, etc.) to dictate the new ticket’s priority status. This
- setting can be overridden by a <span class="doc-desc-title">Ticket
- Filter</span>.
+ Choose whether you would like the priority/importance option of the
+ User's email (e.g. OutLook) to dictate the new ticket’s priority.
+ <br><br>
+ This setting can be overridden by a <span
+ class="doc-desc-title">Ticket Filter</span>.
links:
- title: Create & Manage Ticket Filters
href: /scp/filters.php
+accept_all_emails:
+ title: Accept All Emails
+ content: >
+ Accept emails from unknown Users.
+ <br><br>
+ Unchecking this setting will result in tickets getting rejected.
+
accept_email_collaborators:
title: Accept Email Collaborators
content: >
- Add participants included in the <code><strong>To</strong></code>
- and <code><strong>CC</strong></code> fields of email as ticket
- collaborators.<br /><br />
- <em>Collaborators can always be added manually by staff members when
+ Add email participants included in the <code><strong>To</strong></code>
+ and <code><strong>CC</strong></code> fields as ticket collaborators.
+ <br /><br />
+ <em>Collaborators can always be added manually by Agents when
viewing a ticket.</em>
-default_outgoing_email:
- title: Default Outgoing Email
- content: >
- <span class="doc-desc-title">Default Outgoing Email</span> only applies to
- outgoing emails without SMTP setting.
-
-enable_autocron_poll:
- title: Poll Email using Auto-cron
+default_mta:
+ title: Default MTA
content: >
- <em><b>Not Recommended</b></em><br/><br/>
- Enables fetching email periodically using the automatic cron system.
- As admin and staff members interact with the system, the system will
- periodically run cleanup routines called the auto-cron. This setting
- enables fetching email during this cleanup.
+ <span class="doc-desc-title">Default MTA</span> takes care of
+ email delivery process for outgoing emails without SMTP setting.
diff --git a/include/i18n/en_US/help/tips/settings.kb.yaml b/include/i18n/en_US/help/tips/settings.kb.yaml
index fd0c3a91a51216cea73a2f90710f6de51bc90d2a..ea3cb117e1cfeba21b81b6a88df49b034138ff83 100644
--- a/include/i18n/en_US/help/tips/settings.kb.yaml
+++ b/include/i18n/en_US/help/tips/settings.kb.yaml
@@ -20,18 +20,20 @@ knowledge_base_settings:
knowledge_base_status:
title: Knowledge Base Status
content: >
- Enable this setting to allow your clients self-service access to
+ Enable this setting to allow your users self-service access to
your public knowledge base articles.
+ <br><br>
+ Knowledge base categories and FAQs can be made internal (viewable only by Agents.)
links:
- - title: View and edit the content of your Knowledge Base
+ - title: Manage Knowledge Base
href: /scp/kb.php
canned_responses:
title: Canned Responses
content: >
- Enable this setting to allow agents to configure and use <span
+ Enable this setting to allow Agents to use <span
class="doc-desc-title">Canned Responses</span> when replying to
tickets.
links:
- - title: Manage Canned Responses for Agents
+ - title: Manage Canned Responses
href: /scp/canned.php
diff --git a/include/i18n/en_US/help/tips/settings.pages.yaml b/include/i18n/en_US/help/tips/settings.pages.yaml
index 45b2e60912b707ca8d7c5b20bf96a0612ff6b5a7..a506e338509ad0a6d0970f127f4e282af5cf15c0 100644
--- a/include/i18n/en_US/help/tips/settings.pages.yaml
+++ b/include/i18n/en_US/help/tips/settings.pages.yaml
@@ -24,24 +24,18 @@ company_information:
- title: Company Information Form
href: /scp/forms.php?type=C
-site_pages:
- title: Site Pages
- content: >
- To manage your customize pages, see Admin Panel -> Manage -> Pages.
-
landing_page:
title: Landing Page
content: >
- What page would you like your clients to see when they first “land†on your
- support site (i.e., your installation of osTicket)?
+ The <span class="doc-desc-title">Landing Page</span> is displayed on
+ the front page of your your support site.
offline_page:
title: Offline Page
content: >
- What page would you like your clients to see when the system is either
- being updated or maintained? To activate the <span
- class="doc-desc-title">Offline Page</span>, see Admin Panel -> Setting ->
- System -> Helpdesk Status.
+ The <span class="doc-desc-title">Offline Page</span> is displayed in
+ the support site when the help desk is offline, see Admin Panel
+ -> Setting -> System -> Helpdesk Status.
default_thank_you_page:
title: Default Thank-You Page
@@ -49,6 +43,9 @@ default_thank_you_page:
The <span class="doc-desc-title">thank-you page</span> is displayed to the
customer when a <span class="doc-desc-title">Client</span> submits a new
ticket.
+ <br/><br/>
+ <span class="doc-desc-title">Thank you</span> pages can be
+ associated with help topics.
logos:
title: Logos
@@ -60,6 +57,6 @@ upload_a_new_logo:
title: Upload a new logo
content: >
Choose an image in the .gif, .jpg or .png formats. We will proportionally
- resize the display of your image. We will not however resize the image’s
+ resize the display of your image. We will not, however, resize the image’s
data. Therefore, to speed load times, it is recommended that you keep your
- image close to the default image (817x170).
+ image close to the default image size (817px × 170px).
diff --git a/include/i18n/en_US/help/tips/settings.system.yaml b/include/i18n/en_US/help/tips/settings.system.yaml
index 826d8de46223f5a30b1ad45626a3e5f6de1f454b..fd89cbaea2e01ad4c824537b56e47d4d92caaff9 100644
--- a/include/i18n/en_US/help/tips/settings.system.yaml
+++ b/include/i18n/en_US/help/tips/settings.system.yaml
@@ -13,18 +13,13 @@
# must match the HTML #ids put into the page template.
#
---
-general_settings:
- title: General Settings
- content: >
- Offline mode will disable client interface and only allow admins to login to
- Staff Control Panel.
-
helpdesk_status:
title: Helpdesk Status
content: >
- If the status is changed to Offline, the client interface will be disabled.
- This does not however affect any normal Agent interaction with the Agent
- Panel.
+ If the status is changed to <span
+ class="doc-desc-opt">Offline</span>, the client interface will be
+ disabled. This does not however affect any normal Agent interaction
+ with the Agent Panel.
helpdesk_url:
title: Helpdesk URL
@@ -35,63 +30,61 @@ helpdesk_url:
helpdesk_name_title:
title: Helpdesk Name/Title
content: >
- This appears in the browser tab when a <span class="doc-desc-title">client
- </span> goes to your help desk. If your help desk page is bookmarked (i.e.,
- in your favorites), this will be the title/name of the site page.
+ This is the title that appears in the browser tab. If your help desk
+ page is bookmarked, this will be the title/name of the site page.
default_department:
title: Default Department
content: >
- Determines the default <span class="doc-desc-title">department</span> for
- tickets submitted that do not have a department auto-assigned by help topic
- or incoming email.
+ Choose a default <span class="doc-desc-title">department</span>
+ for tickets that are not automatically routed to a department.
+ <br/><br/>
+ Ticket can be routed base on help topic, incoming email and ticket
+ filter settings.
default_page_size:
title: Default Page Size
content: >
- How many Tickets would you like to see per page in the Ticket Tables in the
- Staff Panel? Each Agent can also customize this number for their own
+ Choose the number of items shown per page in the Ticket Queues in the
+ Staff Panel. Each Agent can also customize this number for their own
account under <span class="doc-desc-title">My Preferences</span>.
default_log_level:
title: Default Log Level
content: >
- Determines to what minimum level of issues that will be recorded in the
+ Determine the minimum level of issues which will be recorded in the
<span class="doc-desc-title">system log</span>. <span
class="doc-desc-opt">Debug</span> represents the least severity, and <span
- class="doc-desc-opt">Error</span> represents the greatest severity. So, if
- you want to see all issues in the <span class="doc-desc-title">System
- Logs</span>, choose <span class="doc-desc-opt">Debug</span>.
+ class="doc-desc-opt">Error</span> represents the greatest severity.
+ For example, if you want to see all issues in the <span
+ class="doc-desc-title">System Logs</span>, choose <span
+ class="doc-desc-opt">Debug</span>.
purge_logs:
title: Purge Logs
content: >
- How long would you like to store the <span class="doc-desc-title">System
- Logs</span> until they are deleted? You may also choose to <span
- class="doc-desc-opt">Never Purge Logs</span>.
+ Determine how long you would like to keep <span
+ class="doc-desc-title">System Logs</span> before they are deleted.
default_name_formatting:
title: Default Name Formatting
content: >
- Formatting technique used to format names throughout the system.
- Email templates will use the format for names if no other format is
- specified in the place holder.
+ Choose a format for names throughout the system. Email templates
+ will use it for names if no other format is specified in the
+ variable.
-# Date and time options
-date_and_time:
- title: Localized Date Formats
- You may choose from various formats in which names throughout the system
- will be displayed. This is also the format that will be used by Emails if
- no other format is established in the <span class="doc-desc-title">Email
- Template</span>.
+ links:
+ - title: Supported Email Template Variables
+ href: http://osticket.com/wiki/Email_templates
+# Date and time options
date_time_options:
title: Date & Time Options
content: >
- The following settings will alter the Date & Time settings Clients. You can
- change how these appear by following the PHP date format characters. The
- following examples are not realtime; they simply display the format for the
- values in the text input fields to their left.
+ The following settings define the Date & Time settings for
+ Clients. You can change how these appear by following the PHP date
+ format characters. The dates shown below simply illustrate the
+ result of their corresponding values.
links:
- title: See the PHP Date Formatting Table
href: http://www.php.net/manual/en/function.date.php
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index b47755b4e4dcd878981cb13761d468586f42d66d..50693c2a370d1c4b061c96f58e4bab9d271eebe7 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -13,26 +13,10 @@
# must match the HTML #ids put into the page template.
#
---
-global_ticket_settings_options:
- title: Global Ticket Settings & Options
- content: >
- These settings are <span class="doc-desc-title">global,</span> in that they
- apply until they are overridden by other possible system settings (e.g., a
- <span class="doc-desc-title">Department’s SLA Plan</span> overrides the
- <span class="doc-desc-title">Global Default SLA Plan</span> set below).
- links:
- - title: Select a Department to edit its Default SLA Plan
- href: /scp/departments.php
-
-ticket_ids:
- title: Ticket IDs
- content: >
- Choose between Random (Recommended) or Sequential numbers for tickets.
-
default_sla:
title: Default SLA
content: >
- Choose the default Service Level Agreement to manage how long a Ticket
+ Choose the default Service Level Agreement to manage how long a ticket
can remain Open before it is rendered Overdue.
links:
- title: Create more SLA Plans
@@ -41,26 +25,27 @@ default_sla:
default_priority:
title: Default Priority
content: >
- Choose between Low, Normal, High & Emergency for all tickets not
- auto-assigned to a Help Topic or Department.
+ Choose a default <span class="doc-desc-title">priority</span> for
+ tickets not assigned a priority automatically.
+ <br/><br/>
+ Prioriy can be assigned via the help topic, routed department, or
+ ticket filter settings.
maximum_open_tickets:
title: Maximum Open Tickets
content: >
- Enter the maximum <em>number</em> of <span class="doc-desc-title">Open
- Tickets</span> a Client is permitted to have simultaneously. This will help protect
- against spam and enable email flood control. Enter <span class="doc-desc-opt">0
- </span> if you prefer to disable this limitation.
+ Enter the maximum <em>number</em> of tickets a User is permitted to
+ have <strong>open</strong> in your help desk.
+ <br><br>
+ Enter <span class="doc-desc-opt">0 </span> if you prefer to disable this limitation.
agent_collision_avoidance:
title: Agent Collision Avoidance
content: >
- Enter the length of time after an Agent stops ticket-response activity that a
- lockout period takes affect. This lockout prevents other Agents from sending
- a ticket response to the Client. It does not however prevent others from
- composing a draft. If the locking Agent sends their response, then any other
- Agent’s draft will be deleted. Enter <span class="doc-desc-opt">0</span>
- to disable the lockout feature.
+ Enter the maximum length of time an Agent is allowed to hold a lock
+ on a ticket without any activity.
+ <br><br>
+ Enter <span class="doc-desc-opt">0</span> to disable the lockout feature.
email_ticket_priority:
title: Email Ticket Priority
@@ -76,28 +61,31 @@ show_related_tickets:
human_verification:
title: Human Verification
content: >
- Enable CAPTCHA on the Client Portal to verify an incoming ticket is the
+ Enable CAPTCHA on the Client Portal to verify an incoming ticket is the
result of human activity.
+ <br><br>
+ Requires GDLib library
claim_tickets:
- title: Claim Tickets
+ title: Claim Tickets on Response
content: >
- Enable this to auto-assign unassigned tickets to the initially responding Agent.
- Also, reopened tickets are always assigned to the last respondent.
+ Enable this to auto-assign unassigned tickets to the responding Agent.
+ <br><br>
+ Reopened tickets are always assigned to the last respondent.
assigned_tickets:
title: Assigned Tickets
content: >
- Enable this feature to make visible (in the <span class="doc-desc-title">Open
- Queue</span>) Ticket Assignments that do not belong to the current user.
+ Enable this feature to exclude assigned tickets from the <span class="doc-desc-title">Open
+ Tickets Queue</span>.
answered_tickets:
title: Answered Tickets
content: >
- Show tickets that have been answered by an Agent in the
- <span class="doc-desc-title">Open Queue</span>. If this is not enabled,
- answered tickets will be display in the <span class="doc-desc-title">Answered
- Tickets Queue</span>.
+ Enable this feature to show answered tickets in the <span
+ class="doc-desc-title">Answered Tickets Queue</span>. Otherwise, it
+ will be included in the <span class="doc-desc-title">Open Tickets
+ Queue</span>.
staff_identity_masking:
title: Staff Identity Masking
@@ -109,7 +97,7 @@ enable_html_ticket_thread:
title: Enable HTML Ticket Thread
content: >
If enabled, this will permit the use of rich text formatting between
- Clients and Agents and Auto-Response emails.
+ Clients and Agents.
attachments:
title: Attachments
@@ -142,8 +130,8 @@ maximum_file_size:
ticket_response_files:
title: Ticket Response Files
content: >
- If enabled, any attachments an Agent may attach to a Ticket response will
- be also included in the Client’s email.
+ If enabled, any attachments an Agent may attach to a ticket response will
+ be also included in the email to the User.
accepted_file_types:
title: Accepted File Types
diff --git a/include/i18n/en_US/help/tips/staff.addnew_department.yaml b/include/i18n/en_US/help/tips/staff.addnew_department.yaml
deleted file mode 100644
index 18f7d39d0a431985ac00afd0b4c8ac5e358a208e..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.addnew_department.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Add New Department -> Department 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_department:
- title: Add New Department
- content: >
-
-department_information:
- title: Department Information
- content: >
-
-name:
- title: Name
- content: >
-
-type:
- title: Type
- content: >
- Select Private if the Department will only be pertinent to matters among
- other Agents. Additionally, when labelled as Private, the Email Signature
- will not display in replies.
-
-email:
- title: Email
- content: >
- Email Address assigned to this Department. When Tickets are assigned to
- this Department, for example, it is this Email Address from whom the Client
- will receive an Auto-Response Email.
-
-template:
- title: Template
- content: >
- Template Set used for Auto-Responses, Alerts & Notices for all Tickets
- associated with this Department.
-
-sla:
- title: SLA
- content: >
- Service Level Agreement for all tickets transferred to Department or
- auto-assigned by Help Topic. (To create or edit a SLA Plan, see Admin Panel
- -> Manage -> SLA Plans).
-
-group_membership:
- title: Group Membership
- content: >
- You may optionally choose to extend membership access to Groups (to whom
- Alerts and Notices will be sent). (To edit Groups, see Admin Panel ->
- Agents (Staff) -> Groups).
-
-auto_response_settings:
- title: Auto-Response Settings
- content: >
- This allows you to disable New Ticket Auto-Response to Clients and/or New
- Message Auto-Response to users when creating a ticket in this department.
-
-new_ticket:
- title: New Ticket
- content: >
- Click the checkbox if do not want an Email automatically sent to the Client
- when a New Ticket is Opened.
-
-new_message:
- title: New Message
- content: >
- Click the checkbox if do not want an Email automatically sent when a New
- Message is received.
-
-auto_response_email:
- title: Auto Response Email
- content: >
- If you would like Department Email to send Auto-Responses from a different
- Address from that noted above, then choose the differing Email Address
- here.
-
-department_access:
- title: Department Access
- content: >
- Department Manager and Primary Members will always have access independent
- of group selection or assignment. To commission an Agent as a Department
- Manager, you must first add that Agent to the Department by editing that
- Agent’s Account. (To edit an Agent’s Account, see Admin Panel -> Agent
- (Staff) Members -> Choose the Agent to Edit).
-
-department_signature:
- title: Department Signature
- content: >
- Signature is made available as a choice, for Public Departments, on Ticket
- Reply. What you create here will be an optional Signature that perhaps
- appears at the end of the Agent’s Ticket Responses. Whether this signature
- appears or not depends on the Email Template that will be used in a Ticket
- Response. (To create email templates, see Admin Panel -> Emails ->
- Templates ).
diff --git a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
deleted file mode 100644
index d42727d734ce46cff43b23ae49d6a82498e339b7..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Add New Group -> User Group 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_group:
- title: Add New Group
- content: >
-
-group_information:
- title: Group Information
- content: >
-
-name:
- title: Name
- content: >
-
-status:
- title: Status
- content: >
-
-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: >
-
-department_access:
- title: Department Access
- content: >
-
-support:
- title: Support
- content: >
diff --git a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml b/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
deleted file mode 100644
index 95f51242de9f16c5c2c3f0f91cbc84e4a2cedae4..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Add Staff 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_agent:
- title: Add New Agent
- content: >
-
-agent_staff_information:
- title: Agent (Staff) Information
- content: >
-
-username:
- title: Username
- content: >
- Please choose an <span class="doc-desc-title">Agent</span> <span
- class="doc-desc-title">username</span> that is unique to your <span
- class="doc-desc-title">Help Desk</span>.
-
-first_name:
- title: First Name
- content: >
- The full name will generally be visible to any Agent/administrator you create on your <span class="doc-desc-title">Help Desk</span>. However, you can choose to hide all Agent names inside of ticket responses in <span class="doc-desc-title">Ticket Settings</span>.
- links:
- - title: Hide Agent Names in Ticket Responses
- href: /scp/settings.php?t=tickets
-
-last_name:
- title: Last Name
- content: >
- The full name will generally be visible to any Agent/administrator you create on your <span class="doc-desc-title">Help Desk</span>. However, you can choose to hide all Agent names inside of ticket responses in <span class="doc-desc-title">Ticket Settings</span>.
- links:
- - title: Hide Agent Names in Ticket Responses
- href: /scp/settings.php?t=tickets
-
-email_address:
- title: Email Address
- content: >
- This is the Agent’s email that will receive <span
- class="doc-desc-title">Alerts</span> from the <span
- class="doc-desc-title">Help Desk</span>.
-
-phone_number_mobile_number:
- title: Phone Number/Mobile Number
- content: >
-
-mobile_number:
- title: Mobile Number
- content: >
-
-welcome_email:
- title: Welcome Email
- content: >
- Enable this to send the new Agent an email with an account access
- link. By following the link, the Agent will then be able to set
- their own password. Disable this if you would like to choose a
- password for them now.
-
-account_password:
- title: Account Password
- content: >
- You, as an <span class="doc-desc-title">administrator</span>, may
- change an Agent’s password. You may optionally require the Agent to
- set their own password on next login.
-
-password:
- title: Password
- content: >
-
-confirm_password:
- title: Confirm Password
- content: >
-
-forced_password_change:
- title: Forced Password Change
- content: >
- Enable this if you would like to force the new Agent to create
- their own password. <em>Recommended</em>
-
-agents_signature:
- title: Agent’s Signature
- content: >
- Create an optional signature that perhaps appears at
- the end of the Agent’s ticket responses. Whether this signature appears or not depends on the <span class="doc-desc-title">email template</span> that will be used in a ticket response.
- links:
- - title: Manage Email Templates
- href: /scp/templates.php
-
-account_status:
- title: Account Status
- content: >
- If you change the Agent's status to <span
- class="doc-desc-opt">Locked</span>, then he/she will not be able to
- log in. If you change the Agent’s status to <span
- class="doc-desc-opt">Vacation Mode</span>, the Agent will be able
- to log in, but will not receive any of his normal <span
- class="doc-desc-title">Alerts</span> or have any tickets assigned.
-
-assigned_group:
- title: Assigned Group
- content: >
- The <span class="doc-desc-title">Group</span> that you choose for
- this Agent to belong will decide what permissions the Agent has
- within the <span class="doc-desc-title">Help Desk</span>. The
- difference between <span class="doc-desc-title">Teams</span> and
- <span class="doc-desc-title">Groups</span> is that a <span
- class="doc-desc-title">Group</span> decides permissions for its
- Agents, and a <span class="doc-desc-title">Team</span> is simply a
- collection of Agents with a common purpose.
- links:
- - title: Manage Groups
- href: /scp/groups.php
- - title: Manage Teams
- href: /scp/teams.php
-
-primary_department:
- title: Primary Department
- content: >
- Choose the <span class="doc-desc-title">department</span> in which you would like this Agent to be primarily
- active. This is necessary if you wish to commission this <span
- class="doc-desc-title">Agent</span> as the <span
- class="doc-desc-title">Department Manager</span>.
- links:
- - title: Manage Departments
- href: /scp/departments.php
-
-time_zone:
- title: Time Zone
- content: >
-
-daylight_saving:
- title: Daylight Saving
- content: >
- Enable this feature if you would like Daylight Saving to automatically
- come into play for this Agent’s timestamp.
-
-limited_access:
- title: Limited Access
- content: >
- Would you like to limit this Agent’s access to only those tickets which he/she is assigned?
-
-directory_listing:
- title: Directory Listing
- content: >
- Enable this if you would like to list this Agent in the <span
- class="doc-desc-title">Staff Directory</span>.
- links:
- - title: Visit the Staff Directory
- href: /scp/directory.php
-
-vacation_mode:
- title: Vacation Mode
- content: >
- Change the Agent's status to <span class="doc-desc-opt">Vacation Mode</span> if you would like to temporarily suspend any reception of <span class="doc-desc-title">Alerts</span> and ticket assignments.
diff --git a/include/i18n/en_US/help/tips/staff.agent.yaml b/include/i18n/en_US/help/tips/staff.agent.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..37fbe68478d27ac6bdd1ad380f16317404f2e346
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.agent.yaml
@@ -0,0 +1,117 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Add Staff 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_agent:
+ title: Add New Agent
+ content: >
+
+agent_staff_information:
+ title: Agent (Staff) Information
+ content: >
+
+username:
+ title: Username
+ content: >
+ Please choose an Agent <span class="doc-desc-title">username</span>
+ that is unique to your <span class="doc-desc-title">Help
+ Desk</span>.
+
+email_address:
+ title: Email Address
+ content: >
+ Enter Agent's email that will receive <span
+ class="doc-desc-title">Alerts & Notices</span> from the <span
+ class="doc-desc-title">Help Desk</span>.
+ <br><br>
+ Staff can sign in into the staff control panel with either username or email address.
+
+welcome_email:
+ title: Welcome Email
+ content: >
+ Send the new Agent an account access link from which the Agent will
+ be able to set thier own password. If unchecked, you will need to set password
+ and communicate the log-in information to the new staff.
+
+account_password:
+ title: Account Password
+ content: >
+ As an <span class="doc-desc-title">administrator</span>, you may
+ change an Agent’s password.
+
+forced_password_change:
+ title: Forced Password Change
+ content: >
+ Enable this if you would like to force the new Agent to change
+ their own password upon next log-in.
+
+agents_signature:
+ title: Agent’s Signature
+ content: >
+ Create a signature for the Agent which can be selected when replying to a ticket.
+
+account_status:
+ title: Account Status
+ content: >
+ If the Agent's status is <span
+ class="doc-desc-opt">Locked</span>, they will not be able to
+ sign in to the help desk.
+
+assigned_group:
+ title: Assigned Group
+ content: >
+ The <span class="doc-desc-title">Group</span> that you choose for
+ this Agent to belong will determine what permissions the Agent has
+ within the <span class="doc-desc-title">Help Desk</span>.
+ links:
+ - title: Manage Groups
+ href: /scp/groups.php
+
+primary_department:
+ title: Primary Department
+ content: >
+ Choose the primary <span class="doc-desc-title">department</span> to which this Agent belongs.
+
+ links:
+ - title: Manage Departments
+ href: /scp/departments.php
+
+daylight_saving:
+ title: Daylight Saving
+ content: >
+ Enable this feature if you would like Daylight Saving to automatically
+ come into play for this Agent’s time zone.
+
+limited_access:
+ title: Limited Access
+ content: >
+ If enabled, the Agent will only have access to tickets assigned directly or via the Team.
+
+directory_listing:
+ title: Directory Listing
+ content: >
+ Enable this if you would like to list this Agent in the <span
+ class="doc-desc-title">Staff Directory</span>.
+ links:
+ - title: Visit the Staff Directory
+ href: /scp/directory.php
+
+vacation_mode:
+ title: Vacation Mode
+ content: >
+ If you change the Agent’s status to <span
+ class="doc-desc-opt">Vacation Mode</span>, the Agent will not
+ receive any <span class="doc-desc-title">Alerts & Notices</span>
+ nor be available for tickets assignment.
+
diff --git a/include/i18n/en_US/help/tips/staff.department.yaml b/include/i18n/en_US/help/tips/staff.department.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2d91cb5383194e81be920c328837ef031b6709cc
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.department.yaml
@@ -0,0 +1,114 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Add New Department -> Department 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.
+#
+---
+type:
+ title: Type
+ content: >
+ Select <span class="doc-desc-opt">Private</span> if you wish to mask
+ assignments to this Department in the Client Portal. Additionally,
+ when labeled as <span class="doc-desc-opt">Private</span>, the <span
+ class="doc-desc-title">Department Signature</span> will not be
+ displayed in email replies.
+ <br/><br/>
+ At least one department must be <span
+ class="doc-desc-opt">Public</span>
+
+email:
+ title: Email
+ content: >
+ Email Address used when responses are sent to Users when Agents post
+ Responses to Tickets.
+
+template:
+ title: Template Set
+ content: >
+ Email <span class="doc-desc-title">Template Set</span> used for
+ Auto-Responses and Alerts & Notices for tickets routed to this
+ Department.
+ links:
+ - title: Manage Templates
+ href: /scp/templates.php
+
+sla:
+ title: SLA
+ content: >
+ Service Level Agreement for tickets routed to this Department.
+ links:
+ - title: Manage SLA Plans
+ href: /scp/slaplans.php
+
+manager:
+ title: Department Manager
+ content: >
+ Select a <span class="doc-desc-title">Manager</span> for this department.
+ <br/><br/>
+ Managers can be configured to receive special alerts and
+ also have the right to unassign tickets.
+ links:
+ - title: Manage Alerts & Notices
+ href: /scp/settings.php?t=alerts
+
+group_membership:
+ title: Alerts & Notices Recipients
+ content: >
+ Select the recipients of configured <span
+ class="doc-desc-title">Alerts & Notices</span>.
+ links:
+ - title: Configure Alerts & Notices
+ href: /scp/settings.php?t=alerts
+
+sandboxing:
+ title: Ticket Assignment Restrictions
+ content: >
+ Enable this to restrict ticket assignement to only include members
+ of this Department. Department access can be extended to
+ Groups, if <span class="doc-desc-title">Group Membership</span> is
+ also enabled.
+
+auto_response_settings:
+ title: Autoresponder Settings
+ content: >
+ This allows you to override the global Autoresponder settings for
+ this Department.
+
+new_ticket:
+ title: New Ticket Auto-Response
+ content: >
+ You may disable the Auto-Response sent to the User when a new ticket
+ is created and routed to this Department.
+
+new_message:
+ title: New Message Auto-Response
+ content: >
+ You may disable the Auto-Response sent to the User to confirm
+ a newly posted message for tickets in this Department.
+
+auto_response_email:
+ title: Auto Response Email
+ content: >
+ Select an email address from which Auto-Responses are sent for this
+ Department.
+
+department_access:
+ title: Group Access
+ content: >
+ Allow Agents of other Departments access to this Deparmtent's
+ tickets.
+
+department_signature:
+ title: Department Signature
+ content: >
+ Signature is made available as a choice, for <span
+ class="doc-desc-opt">Public</span> Departments, on Agent Responses.
diff --git a/include/i18n/en_US/help/tips/staff.departments.yaml b/include/i18n/en_US/help/tips/staff.departments.yaml
index ca5936104f23c00ac5b1547e0a600036c2aff9fc..782aa58ec5a0c44d6054c37b4c7b5f16109744d5 100644
--- a/include/i18n/en_US/help/tips/staff.departments.yaml
+++ b/include/i18n/en_US/help/tips/staff.departments.yaml
@@ -24,8 +24,7 @@ name:
type:
title: Type
content: >
- If the Department’s Type is Private, then that Department only handles
- matters pertinent among other Agents.
+ If the Department’s Type is Private, then the Department Signature will not be available on response nor will the department assignment show from the Client Portal.
users:
title: Users
@@ -36,11 +35,7 @@ email_address:
content: >
dept_manager:
- title: Dept. Manager
+ title: Department Manager
content: >
- You may commission an Agent as a Department Manager by first adding that
- Agent to the Department, and then choose that Agent as Manager by editing
- the Department. (To add an Agent to a Department, see Admin Panel -> Staff
- -> Staff Members; Select the Agent whose account you would like to edit. To
- commission an Agent as a Department Manager, simply click the Department
- name below that you would like to edit).
+ You may choose an Agent as a Department Manager to receive Alerts & Notices for tickets in departments.
+ Agents do not have to be members of the Department to be the Manager of the Department
diff --git a/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml b/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
deleted file mode 100644
index 83b5f1130588dab7997457223fe10324e2aae7b6..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Edit Staff Account 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.
-#
----
-update_staff:
- title: Update Staff
- content: >
- This form is accessed by clicking the Username of an agent in the Agent
- (Staff) Members Table (To get here, see Admin Panel -> Staff -> Staff
- Members).
-
-assigned_teams:
- title: Assigned Teams
- content: >
- Assign agent to as many teams as necessary.
-
diff --git a/include/i18n/en_US/help/tips/staff.groups.yaml b/include/i18n/en_US/help/tips/staff.groups.yaml
index 89c9018cfe0cad1d9edd45c39afcca094f026e12..0b194fdaf624b157be589feb8ef9cdef77f82365 100644
--- a/include/i18n/en_US/help/tips/staff.groups.yaml
+++ b/include/i18n/en_US/help/tips/staff.groups.yaml
@@ -1,5 +1,5 @@
#
-# This is popup help messages for the Admin Panel -> Staff -> Groups
+# This is popup help messages for the Admin Panel -> Staff -> Add New Group -> User Group Form
#
# Fields:
# title - Shown in bold at the top of the popover window
@@ -13,34 +13,21 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_group:
- title: Add New Group
- content: >
-
-user_groups:
- title: User Groups
- content: >
-
-group_name:
- title: Group 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: >
+ If <span class="doc-desc-opt">Disabled</span>, Agents assigned to
+ this Group cannot sign in and will not receive Department Alerts
+ & Notices.
-members:
- title: Members
- content: >
-
-departments:
- title: Departments
- content: >
-
-created_on:
- title: Created On
- content: >
-
-last_updated:
- title: Last Updated
+department_access:
+ title: Department Access
content: >
+ Check all departments to which the Group members are allowed access.
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 07b028eeef76e9c50eafcd9d065953f50fcbeba2..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.team_form.yaml
+++ /dev/null
@@ -1,38 +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: >
-
-status:
- title: Status
- content: >
-
-team_lead:
- title: Team Lead
- content: >
-
-assignment_alerts:
- title: Assignment Alerts
- content: >
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/i18n/en_US/help/tips/tickets.new_ticket.yaml b/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
deleted file mode 100644
index 23457785d3fd41b197a173b2273fafd20bceff0d..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> New Ticket
-#
-# 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.
-#
----
-new_ticket:
- title: New Ticket
- content: >
-
-user_information:
- title: User Information
- content: >
-
-email_address:
- title: Email Address
- content: >
-
-full_name:
- title: Full Name
- content: >
-
-ticket_notice:
- title: Ticket Notice
- content: >
-
-ticket_information_options:
- title: Ticket Information & Options
- content: >
-
-ticket_source:
- title: Ticket Source
- content: >
-
-help_topic:
- title: Help Topic
- content: >
-
-department:
- title: Department
- content: >
-
-sla_plan:
- title: SLA Plan
- content: >
-
-due_date:
- title: Due Date
- content: >
-
-assign_to:
- title: Assign To
- content: >
-
-ticket_details:
- title: Ticket Details
- content: >
-
-issue_summary:
- title: Issue Summary
- content: >
-
-issue_details:
- title: Issue Details
- content: >
-
-priority_level:
- title: Priority Level
- content: >
-
-response:
- title: Response
- content: >
-
-canned_response:
- title: Canned Response
- content: >
- Include comments about the Append checkbox here too
-
-initial_response_for_the_ticket:
- title: Initial Response for the Ticket
- content: >
-
-attachments:
- title: Attachments
- content: >
-
-ticket_status:
- title: Ticket Status
- content: >
-
-signature:
- title: Signature
- content: >
-
-response:
- title: Response
- content: >
-
-internal_note:
- title: Internal Note
- content: >
diff --git a/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml b/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
deleted file mode 100644
index a028351f226c1c7410a2010182aaa537409634fb..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> User Look Up (Prompt)
-#
-# 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.
-#
----
-search_by_email_phone_or_name:
- title: Search by email, phone or name
- content: >
-
-create_new_user:
- title: Create New User
- content: >
diff --git a/include/staff/apikey.inc.php b/include/staff/apikey.inc.php
index b559678c222787695b5f62287863d7fc5d1c8892..9de6a2f75cb2675ff7c3b75f619f5b4f7e0522dc 100644
--- a/include/staff/apikey.inc.php
+++ b/include/staff/apikey.inc.php
@@ -22,7 +22,9 @@ $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>API Key</h2>
+ <h2>API Key
+ <i class="help-tip icon-question-sign" href="#api_key"></i>
+ </h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
@@ -49,7 +51,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
IP Address:
</td>
<td>
+ <span>
<?php echo $api->getIPAddr(); ?>
+ <i class="help-tip icon-question-sign" href="#ip_addr"></i>
+ </span>
</td>
</tr>
<tr>
@@ -64,8 +69,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
IP Address:
</td>
<td>
+ <span>
<input type="text" size="30" name="ipaddr" value="<?php echo $info['ipaddr']; ?>">
<span class="error">* <?php echo $errors['ipaddr']; ?></span>
+ <i class="help-tip icon-question-sign" href="#ip_addr"></i>
+ </span>
</td>
</tr>
<?php } ?>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 9fe6624d38c430ff62d43e841d2763f552ef4114..b059e329683c51456d3b56ec090c39ab902b03ba 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -46,7 +46,9 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
$query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
//echo $query;
?>
-<h2>Banned Email Addresses</h2>
+<h2>Banned Email Addresses
+ <i class="help-tip icon-question-sign" href="#ban_list"></i>
+ </h2>
<div style="width:600; float:left;padding-top:5px;">
<form action="banlist.php" method="GET" name="filter">
<input type="hidden" name="a" value="filter" >
diff --git a/include/staff/banrule.inc.php b/include/staff/banrule.inc.php
index 98771d7372517ef6f5385720ddfd7426e6179428..a1c48f2e3f502015d07206782d60e8954b63a1fa 100644
--- a/include/staff/banrule.inc.php
+++ b/include/staff/banrule.inc.php
@@ -24,7 +24,9 @@ $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>Manage Email Ban List</h2>
+ <h2>Manage Email Ban Rule
+ <i class="help-tip icon-question-sign" href="#ban_list"></i>
+ </h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
@@ -35,12 +37,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
</thead>
<tbody>
- <tr>
- <td width="180" class="required">
- Filter Name:
- </td>
- <td><?php echo $filter->getName(); ?></td>
- </tr>
<tr>
<td width="180" class="required">
Ban Status:
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index 84b4cf4ede75d14b11316cbd8eeb10419e4355a9..b795b55e3d615ea172162a893e52960ce54f73a8 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -57,8 +57,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
<td>
<input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><strong>Public</strong>
+
<input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong>Private</strong> (Internal)
- <span class="error">* </span> <i class="help-tip icon-question-sign" href="#type"></i>
+ <i class="help-tip icon-question-sign" href="#type"></i>
</td>
</tr>
<tr>
@@ -77,7 +78,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error">* <?php echo $errors['sla_id']; ?></span> <i class="help-tip icon-question-sign" href="#sla"></i>
+ <span class="error"><?php echo $errors['sla_id']; ?></span> <i class="help-tip icon-question-sign" href="#sla"></i>
</td>
</tr>
<tr>
@@ -85,6 +86,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Manager:
</td>
<td>
+ <span>
<select name="manager_id">
<option value="0">— None —</option>
<?php
@@ -99,26 +101,20 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['manager_id']; ?></span>
- </td>
- </tr>
- <tr>
- <td width="180">
- Group Membership:
- </td>
- <td>
- <input type="checkbox" name="group_membership" value="0" <?php echo $info['group_membership']?'checked="checked"':''; ?> >
- Extend membership to groups with access. <i>(Alerts and notices will include groups)</i> <i class="help-tip icon-question-sign" href="#group_membership"></i>
+ <span class="error"><?php echo $errors['manager_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#manager"></i>
+ </span>
</td>
</tr>
<tr>
<td>Ticket Assignment:</td>
<td>
+ <span>
<input type="checkbox" name="assign_members_only" <?php echo
$info['assign_members_only']?'checked="checked"':''; ?>>
- Limit ticket assignment to department members
- <!-- Help Tip:
- Tickets can ONLY be assigned to department members (+ group members)-->
+ Restrict ticket assignment to department members
+ <i class="help-tip icon-question-sign" href="#sandboxing"></i>
+ </span>
</td>
</tr>
<tr>
@@ -170,7 +166,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Autoresponder Settings</strong>: Override global auto-response settings for tickets routed to the department.
+ <em><strong>Autoresponder Settings</strong>:
<i class="help-tip icon-question-sign" href="#auto_response_settings"></i></em>
</th>
</tr>
@@ -179,9 +175,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
New Ticket:
</td>
<td>
+ <span>
<input type="checkbox" name="ticket_auto_response" value="0" <?php echo !$info['ticket_auto_response']?'checked="checked"':''; ?> >
- <strong>Disable</strong> new ticket auto-response for this Dept. <i class="help-tip icon-question-sign" href="#new_ticket"></i>
+ <strong>Disable</strong> for this Department <i class="help-tip icon-question-sign" href="#new_ticket"></i>
+ </span>
</td>
</tr>
<tr>
@@ -189,8 +187,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
New Message:
</td>
<td>
+ <span>
<input type="checkbox" name="message_auto_response" value="0" <?php echo !$info['message_auto_response']?'checked="checked"':''; ?> >
- <strong>Disable</strong> new message auto-response for this Dept. <i class="help-tip icon-question-sign" href="#new_message"></i>
+ <strong>Disable</strong> for this Department <i class="help-tip icon-question-sign" href="#new_message"></i>
+ </span>
</td>
</tr>
<tr>
@@ -198,6 +198,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Auto-Response Email:
</td>
<td>
+ <span>
<select name="autoresp_email_id">
<option value="0" selected="selected">— Department Email —</option>
<?php
@@ -214,15 +215,39 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['autoresp_email_id']; ?></span> <i class="help-tip icon-question-sign" href="#auto_response_email"></i>
+ <span class="error"><?php echo $errors['autoresp_email_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#auto_response_email"></i>
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <th colspan="2">
+ <em><strong>Alerts & Notices:</strong> <i class="help-tip icon-question-sign" href="#group_membership"></i></em>
+ </th>
+ </tr>
+ <tr>
+ <td width="180">
+ Recipients:
+ </td>
+ <td>
+ <span>
+ <select name="group_membership">
+ <option value="2" <?php echo $info['group_membership'] == 2 ?'selected="selected"':'';
+ ?>>No one (disable Alerts & Notices)</option>
+ <option value="0" <?php echo $info['group_membership'] == 0 ?'selected="selected"':'';
+ ?>>Department members only</option>
+ <option value="1" <?php echo $info['group_membership'] == 1 ?'selected="selected"':'';
+ ?>>Department and Group members</option>
+ </select>
+ <i class="help-tip icon-question-sign" href="#group_membership"></i>
+ </span>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>Department Access</strong>: Check all groups allowed to access this department. <i class="help-tip icon-question-sign" href="#department_access"></i></em>
+ <em><strong>Group Access</strong>: Check all groups allowed to access this department. <i class="help-tip icon-question-sign" href="#department_access"></i></em>
</th>
</tr>
- <tr><td colspan=2><em>Department manager and primary members will always have access independent of group selection or assignment.</em></td></tr>
<?php
$sql='SELECT group_id, group_name, count(staff.staff_id) as members '
.' FROM '.GROUP_TABLE.' grp '
@@ -242,19 +267,18 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
<tr>
<th colspan="2">
- <em><strong>Department Signature</strong>: Optional signature used on outgoing emails. <span class="error"> <?php echo $errors['signature']; ?></span> <i class="help-tip icon-question-sign" href="#department_signature"></i></em>
+ <em><strong>Department Signature</strong>: <span class="error"> <?php echo $errors['signature']; ?></span> <i class="help-tip icon-question-sign" href="#department_signature"></i></em>
</th>
</tr>
<tr>
<td colspan=2>
<textarea class="richtext no-bar" name="signature" cols="21"
rows="5" style="width: 60%;"><?php echo $info['signature']; ?></textarea>
- <br><em>Signature is made available as a choice, for public departments, on ticket reply.</em>
</td>
</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="departments.php"'>
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index 6f9079c0963a9f6d925b70b42c27d0f3cf8063a7..e8d3a430e74c3f66a40dc374c1974b2dd3a9fa6d 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -25,6 +25,12 @@ if($email && $_REQUEST['a']!='add'){
$info['ispublic']=isset($info['ispublic'])?$info['ispublic']:1;
$info['ticket_auto_response']=isset($info['ticket_auto_response'])?$info['ticket_auto_response']:1;
$info['message_auto_response']=isset($info['message_auto_response'])?$info['message_auto_response']:1;
+ if (!$info['mail_fetchfreq'])
+ $info['mail_fetchfreq'] = 5;
+ if (!$info['mail_fetchmax'])
+ $info['mail_fetchmax'] = 10;
+ if (!isset($info['smtp_auth']))
+ $info['smtp_auth'] = 1;
$qstr.='&a='.$_REQUEST['a'];
}
$info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
@@ -63,64 +69,80 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<span class="error">* <?php echo $errors['name']; ?> </span>
</td>
</tr>
+ <tr>
+ <th colspan="2">
+ <em><strong>New Ticket Settings</strong></em>
+ </th>
+ </tr>
<tr>
<td width="180">
- New Ticket Help Topic
+ Department
</td>
<td>
- <select name="topic_id">
- <option value="0" selected="selected">— Empty —</option>
- <?php
- $sql='SELECT topic_id, topic FROM '.TOPIC_TABLE.' T ORDER by topic';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['topic_id'] && $id==$info['topic_id'])?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['topic_id']; ?></span>
+ <span>
+ <select name="dept_id">
+ <option value="0" selected="selected">— System Default —</option>
+ <?php
+ $sql='SELECT dept_id, dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
+ if(($res=db_query($sql)) && db_num_rows($res)){
+ while(list($id,$name)=db_fetch_row($res)){
+ $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
+ echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+ }
+ }
+ ?>
+ </select>
+ <i class="help-tip icon-question-sign" href="#new_ticket_department"></i>
+ </span>
+ <span class="error"><?php echo $errors['dept_id']; ?></span>
</td>
</tr>
<tr>
<td width="180">
- New Ticket Priority
+ Priority
</td>
<td>
- <select name="priority_id">
- <option value="0" selected="selected">— System Default —</option>
- <?php
- $sql='SELECT priority_id, priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['priority_id']; ?></span>
+ <span>
+ <select name="priority_id">
+ <option value="0" selected="selected">— System Default —</option>
+ <?php
+ $sql='SELECT priority_id, priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
+ if(($res=db_query($sql)) && db_num_rows($res)){
+ while(list($id,$name)=db_fetch_row($res)){
+ $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
+ echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+ }
+ }
+ ?>
+ </select>
+ <i class="help-tip icon-question-sign" href="#new_ticket_priority"></i>
+ </span>
+ <span class="error"><?php echo $errors['priority_id']; ?></span>
</td>
</tr>
<tr>
<td width="180">
- New Ticket Dept.
+ Help Topic
</td>
<td>
- <select name="dept_id">
- <option value="0" selected="selected">— System Default —</option>
- <?php
- $sql='SELECT dept_id, dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['dept_id']; ?></span>
+ <span>
+ <select name="topic_id">
+ <option value="0" selected="selected">— None —</option>
+ <?php
+ $sql='SELECT topic_id, topic FROM '.TOPIC_TABLE.' T ORDER by topic';
+ if(($res=db_query($sql)) && db_num_rows($res)){
+ while(list($id,$name)=db_fetch_row($res)){
+ $selected=($info['topic_id'] && $id==$info['topic_id'])?'selected="selected"':'';
+ echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+ }
+ }
+ ?>
+ </select>
+ <i class="help-tip icon-question-sign" href="#new_ticket_help_topic"></i>
+ </span>
+ <span class="error">
+ <?php echo $errors['topic_id']; ?>
+ </span>
</td>
</tr>
<tr>
@@ -129,13 +151,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
<td>
<label><input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
- <strong>Disable</strong> new ticket auto-response for this
- email. Override global and dept. settings.</label>
+ <strong>Disable</strong> for this Email Address
+ </label>
+ <i class="help-tip icon-question-sign" href="#auto_response"></i>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>Login Information</strong> <i class="help-tip icon-question-sign" href="#login_information"></i></em>
+ <em><strong>Email Login Information</strong> <i class="help-tip icon-question-sign" href="#login_information"></i></em>
</th>
</tr>
<tr>
@@ -161,10 +184,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Mail Account</strong> <i class="help-tip icon-question-sign" href="#mail_account"></i> <font class="error"> <?php echo $errors['mail']; ?></font></em>
+ <em><strong>Fetching Email via IMAP or POP</strong> <i class="help-tip icon-question-sign" href="#mail_account"></i> <font class="error"> <?php echo $errors['mail']; ?></font></em>
</th>
</tr>
- <tr><td>Status</td>
+ <tr>
+ <td>Status</td>
<td>
<label><input type="radio" name="mail_active" value="1" <?php echo $info['mail_active']?'checked="checked"':''; ?> /> Enable</label>
@@ -172,65 +196,78 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<font class="error"> <?php echo $errors['mail_active']; ?></font>
</td>
</tr>
- <tr><td>Host</td>
- <td><input type="text" name="mail_host" size=35 value="<?php echo $info['mail_host']; ?>">
- <font class="error"> <?php echo $errors['mail_host']; ?></font>
+ <tr><td>Hostname</td>
+ <td>
+ <span>
+ <input type="text" name="mail_host" size=35 value="<?php echo $info['mail_host']; ?>">
+ <font class="error"> <?php echo $errors['mail_host']; ?></font>
+ <i class="help-tip icon-question-sign" href="#host_and_port"></i>
+ </span>
</td>
</tr>
- <tr><td>Port</td>
+ <tr><td>Port Number</td>
<td><input type="text" name="mail_port" size=6 value="<?php echo $info['mail_port']?$info['mail_port']:''; ?>">
- <font class="error"> <?php echo $errors['mail_port']; ?></font>
+ <span>
+ <font class="error"> <?php echo $errors['mail_port']; ?></font>
+ <i class="help-tip icon-question-sign" href="#host_and_port"></i>
+ </span>
</td>
</tr>
- <tr><td>Protocol</td>
+ <tr><td>Mail Box Protocol</td>
<td>
- <select name="mail_protocol">
- <option value='POP'>— Select Mail Protocol —</option>
- <option value='POP' <?php echo ($info['mail_protocol']=='POP')?'selected="selected"':''; ?> >POP</option>
- <option value='IMAP' <?php echo ($info['mail_protocol']=='IMAP')?'selected="selected"':''; ?> >IMAP</option>
- </select>
- <font class="error"> <?php echo $errors['mail_protocol']; ?></font>
+ <span>
+ <select name="mail_proto">
+ <option value=''>— Select Protocol —</option>
+<?php
+ foreach (MailFetcher::getSupportedProtos() as $proto=>$desc) { ?>
+ <option value="<?php echo $proto; ?>" <?php
+ if ($info['mail_proto'] == $proto) echo 'selected="selected"';
+ ?>><?php echo $desc; ?></option>
+<?php } ?>
+ </select>
+ <font class="error"> <?php echo $errors['mail_protocol']; ?></font>
+ <i class="help-tip icon-question-sign" href="#protocol"></i>
+ </span>
</td>
</tr>
- <tr><td>Encryption</td>
- <td>
- <select name="mail_encryption">
- <option value='NONE'>None</option>
- <option value='SSL' <?php echo ($info['mail_encryption']=='SSL')?'selected="selected"':''; ?> >SSL</option>
- </select>
- <font class="error"> <?php echo $errors['mail_encryption']; ?></font>
- </td>
- </tr>
<tr><td>Fetch Frequency</td>
<td>
- <input type="text" name="mail_fetchfreq" size=4 value="<?php echo $info['mail_fetchfreq']?$info['mail_fetchfreq']:''; ?>"> Delay intervals in minutes
- <font class="error"> <?php echo $errors['mail_fetchfreq']; ?></font>
+ <span>
+ <input type="text" name="mail_fetchfreq" size=4 value="<?php echo $info['mail_fetchfreq']?$info['mail_fetchfreq']:''; ?>"> minutes
+ <i class="help-tip icon-question-sign" href="#fetch_frequency"></i>
+ <font class="error"> <?php echo $errors['mail_fetchfreq']; ?></font>
+ </span>
</td>
</tr>
<tr><td>Emails Per Fetch</td>
<td>
- <input type="text" name="mail_fetchmax" size=4 value="<?php echo $info['mail_fetchmax']?$info['mail_fetchmax']:''; ?>"> Maximum emails to process per fetch.
- <font class="error"> <?php echo $errors['mail_fetchmax']; ?></font>
+ <span>
+ <input type="text" name="mail_fetchmax" size=4 value="<?php echo $info['mail_fetchmax']?$info['mail_fetchmax']:''; ?>"> emails
+ <i class="help-tip icon-question-sign" href="#emails_per_fetch"></i>
+ <font class="error"> <?php echo $errors['mail_fetchmax']; ?></font>
+ </span>
</td>
</tr>
<tr><td valign="top">Fetched Emails</td>
<td>
<label><input type="radio" name="postfetch" value="archive" <?php echo ($info['postfetch']=='archive')? 'checked="checked"': ''; ?> >
- Move to: <input type="text" name="mail_archivefolder" size="20" value="<?php echo $info['mail_archivefolder']; ?>"/> folder.</label>
- <font class="error"> <?php echo $errors['mail_folder']; ?></font>
+ Move to folder: <input type="text" name="mail_archivefolder" size="20" value="<?php echo $info['mail_archivefolder']; ?>"/></label>
+ <font class="error"><?php echo $errors['mail_folder']; ?></font>
+ <i class="help-tip icon-question-sign" href="#fetched_emails"></i>
+ <br/>
<label><input type="radio" name="postfetch" value="delete" <?php echo ($info['postfetch']=='delete')? 'checked="checked"': ''; ?> >
- Delete fetched emails </label>
-
+ Delete emails</label>
+ <br/>
<label><input type="radio" name="postfetch" value="" <?php echo (isset($info['postfetch']) && !$info['postfetch'])? 'checked="checked"': ''; ?> >
- Do nothing (Not recommended) </label>
- <br /><em>Moving fetched emails to a backup folder is highly recommended.</em> <font class="error"><?php echo $errors['postfetch']; ?></font>
+ Do nothing <em>(not recommended)</em></label>
+ <br /><font class="error"><?php echo $errors['postfetch']; ?></font>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>SMTP Settings</strong> <i class="help-tip icon-question-sign" href="#smtp_settings"></i> <font class="error"> <?php echo $errors['smtp']; ?></font></em>
+ <em><strong>Sending Email via SMTP</strong> <i class="help-tip icon-question-sign" href="#smtp_settings"></i> <font class="error"> <?php echo $errors['smtp']; ?></font></em>
</th>
</tr>
<tr><td>Status</td>
@@ -241,32 +278,35 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<font class="error"> <?php echo $errors['smtp_active']; ?></font>
</td>
</tr>
- <tr><td>SMTP Host</td>
+ <tr><td>Hostname</td>
<td><input type="text" name="smtp_host" size=35 value="<?php echo $info['smtp_host']; ?>">
- <font class="error"> <?php echo $errors['smtp_host']; ?></font>
+ <font class="error"><?php echo $errors['smtp_host']; ?></font>
+ <i class="help-tip icon-question-sign" href="#host_and_port"></i>
</td>
</tr>
- <tr><td>SMTP Port</td>
+ <tr><td>Port Number</td>
<td><input type="text" name="smtp_port" size=6 value="<?php echo $info['smtp_port']?$info['smtp_port']:''; ?>">
- <font class="error"> <?php echo $errors['smtp_port']; ?></font>
+ <font class="error"><?php echo $errors['smtp_port']; ?></font>
+ <i class="help-tip icon-question-sign" href="#host_and_port"></i>
</td>
</tr>
<tr><td>Authentication Required</td>
<td>
<label><input type="radio" name="smtp_auth" value="1"
- <?php echo $info['smtp_auth']?'checked':''; ?> /> Yes</label>
+ <?php echo $info['smtp_auth']?'checked':''; ?> /> Yes</label>
<label><input type="radio" name="smtp_auth" value="0"
- <?php echo !$info['smtp_auth']?'checked':''; ?> /> No</label>
+ <?php echo !$info['smtp_auth']?'checked':''; ?> /> No</label>
<font class="error"> <?php echo $errors['smtp_auth']; ?></font>
</td>
</tr>
<tr>
- <td>Allow Header Spoofing</td>
+ <td>Header Spoofing</td>
<td>
<label><input type="checkbox" name="smtp_spoofing" value="1" <?php echo $info['smtp_spoofing'] ?'checked="checked"':''; ?>>
- Allow email header spoofing <em>(only applies to emails being sent through this account)</em></label>
+ Allow for this Email Address</label>
+ <i class="help-tip icon-question-sign" href="#header_spoofing"></i>
</td>
</tr>
<tr>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index dce774dca55109b58de4616b7f83abc28ca24a2d..f2339c537e5ca048f894589a67d869899050f806 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -65,18 +65,19 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Filter Status:
</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"':''; ?>>Disabled
+ <input type="radio" name="isactive" value="1" <?php echo
+ $info['isactive']?'checked="checked"':''; ?>> Active
+ <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>> Disabled
<span class="error">* </span>
</td>
</tr>
<tr>
<td width="180" class="required">
- Target:
+ Target Channel:
</td>
<td>
<select name="target">
- <option value="">— Select a Target ‐</option>
+ <option value="">— Select a Channel ‐</option>
<?php
foreach(Filter::getTargets() as $k => $v) {
echo sprintf('<option value="%s" %s>%s</option>',
@@ -96,12 +97,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
- <span class="error">* <?php echo $errors['target']; ?></span> <i class="help-tip icon-question-sign" href="#target"></i>
+ <span class="error">* <?php echo $errors['target']; ?></span>
+ <i class="help-tip icon-question-sign" href="#target_channel"></i>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>Filter Rules</strong>: Rules are applied based on the criteria. <span class="error">* <?php echo $errors['rules']; ?></span> <i class="help-tip icon-question-sign" href="#basic_fields_criterion"></i></em>
+ <em><strong>Filter Rules</strong>: Rules are applied based on the criteria. <span class="error">* <?php echo
+ $errors['rules']; ?></span></em>
</th>
</tr>
<tr>
@@ -142,7 +145,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
echo sprintf('<option value="%s" %s>%s</option>',$k,$sel,$v);
}
?>
- </select> <i class="help-tip icon-question-sign" href="#criterion_operator"></i>
+ </select>
<input type="text" size="60" name="rule_v<?php echo $i; ?>" value="<?php echo $info["rule_v$i"]; ?>">
<span class="error"> <?php echo $errors["rule_$i"]; ?></span>
<?php
@@ -313,7 +316,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['assign']; ?></span><i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
+ <span class="error"> <?php echo
+ $errors['assign']; ?></span><i class="help-tip icon-question-sign" href="#auto_assign"></i>
</td>
</tr>
<tr>
@@ -338,7 +342,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Admin Notes</strong>: Internal notes. <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes</strong>: Internal notes.</em>
</th>
</tr>
<tr>
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 190a15c5b7dec1b322c9d8849fb493581abd9c2b..5e90c32052bb001d00ecd4de6d4d3217ff1453f8 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -5,6 +5,7 @@ $qstr='';
$sql='SELECT filter.*,count(rule.id) as rules '.
'FROM '.FILTER_TABLE.' filter '.
'LEFT JOIN '.FILTER_RULE_TABLE.' rule ON(rule.filter_id=filter.id) '.
+ "WHERE filter.`name` <> 'SYSTEM BAN LIST' ".
'GROUP BY filter.id';
$sortOptions=array('name'=>'filter.name','status'=>'filter.isactive','order'=>'filter.execorder','rules'=>'rules',
'target'=>'filter.target', 'created'=>'filter.created','updated'=>'filter.updated');
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 258ca652379f8a10ccb7f20a553fd701fcef6409..5ba2fa6acb3a4a4da71db71b48017a050503965f 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>
+
+ <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>Disabled
<span class="error">* <?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. <a id="selectAll" href="#deptckb">Select All</a> <a id="selectNone" href="#deptckb">Select None</a> </em>
+ <em><strong>Department Access</strong>:
+ <i class="help-tip icon-question-sign" href="#department_access"></i>
+ <a id="selectAll" href="#deptckb">Select All</a>
+
+ <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 e81bfef806286f8c13d691b34b96aca8e859a0bb..69a18e90d0e79d75c6dbf168ac1eeeb255f24a26 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>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 44de81e20e739a1a8ee868d6e7b4a811d12b7c5e..6e4317cb15d890de7732766139f9673f87cd0c9e 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -83,13 +83,13 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
}
?>
- </select> (<em>optional</em>) <i class="help-tip icon-question-sign" href="#parent_topic"></i>
+ </select> <i class="help-tip icon-question-sign" href="#parent_topic"></i>
<span class="error"> <?php echo $errors['pid']; ?></span>
</td>
</tr>
<tr><th colspan="2"><em>New ticket options</em></th></tr>
- <tr>
+ <tr>
<td><strong>Custom Form</strong>:</td>
<td><select name="form_id">
<option value="0">— No Extra Fields —</option>
@@ -101,48 +101,50 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</option>
<?php } ?>
</select>
- <em>Extra information for tickets associated with this help topic</em>
- <span class="error"> <?php echo $errors['form_id']; ?></span> <i class="help-tip icon-question-sign" href="#custom_form"></i>
+ <span class="error"> <?php echo $errors['form_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#custom_form"></i>
</td>
- </tr>
+ </tr>
<tr>
- <td width="180">
- Priority:
+ <td width="180" class="required">
+ Department:
</td>
<td>
- <select name="priority_id">
- <option value="">— System Default —</option>
+ <select name="dept_id">
+ <option value="0">— System Default —</option>
<?php
- $sql='SELECT priority_id,priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
+ $sql='SELECT dept_id,dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
if(($res=db_query($sql)) && db_num_rows($res)){
while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
+ $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
}
}
?>
</select>
- <span class="error"> <?php echo $errors['priority_id']; ?></span><i class="help-tip icon-question-sign" href="#priority"></i>
+ <span class="error"> <?php echo $errors['dept_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#department"></i>
</td>
</tr>
<tr>
- <td width="180" class="required">
- Department:
+ <td width="180">
+ Priority:
</td>
<td>
- <select name="dept_id">
- <option value="">— Select Department —</option>
+ <select name="priority_id">
+ <option value="">— System Default —</option>
<?php
- $sql='SELECT dept_id,dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
+ $sql='SELECT priority_id,priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
if(($res=db_query($sql)) && db_num_rows($res)){
while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
+ $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
}
}
?>
</select>
- <span class="error">* <?php echo $errors['dept_id']; ?></span> <i class="help-tip icon-question-sign" href="#department"></i>
+ <span class="error"> <?php echo $errors['priority_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#priority"></i>
</td>
</tr>
<tr>
@@ -162,7 +164,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
<span class="error"> <?php echo $errors['sla_id']; ?></span>
- <em>(Overrides department's SLA)</em> <i class="help-tip icon-question-sign" href="#sla_plan"></i>
+ <i class="help-tip icon-question-sign" href="#sla_plan"></i>
</td>
</tr>
<tr>
@@ -182,7 +184,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select> <font class="error"><?php echo $errors['page_id']; ?></font>
- <em>(Overrides global setting. Applies to web tickets only.)</em> <i class="help-tip icon-question-sign" href="#thank_you_page"></i>
+ <i class="help-tip icon-question-sign" href="#thank_you_page"></i>
</td>
</tr>
<tr>
@@ -223,22 +225,23 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['assign']; ?></span> <i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
+ <span class="error"> <?php echo $errors['assign']; ?></span>
+ <i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
</td>
</tr>
<tr>
<td width="180">
- Ticket auto-response:
+ Auto-response:
</td>
<td>
<input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
- <strong>Disable</strong> new ticket auto-response for
- this topic (Overrides Dept. settings). <i class="help-tip icon-question-sign" href="#ticket_auto_response"></i>
+ <strong>Disable</strong> new ticket auto-response
+ <i class="help-tip icon-question-sign" href="#ticket_auto_response"></i>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>Admin Notes</strong>: Internal notes about the help topic. <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes</strong>: Internal notes about the help topic.</em>
</th>
</tr>
<tr>
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index 90eb45b453aaa200b8a4d7c37584fae8a3a9ea21..8395a29e3d723ed881405cfb8d06f96bbad728bc 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -61,7 +61,7 @@ else
<caption><?php echo $showing; ?></caption>
<thead>
<tr>
- <th width="7"> </th>
+ <th width="7"> </th>
<th width="320"><a <?php echo $name_sort; ?> href="helptopics.php?<?php echo $qstr; ?>&sort=name">Help Topic</a></th>
<th width="80"><a <?php echo $status_sort; ?> href="helptopics.php?<?php echo $qstr; ?>&sort=status">Status</a></th>
<th width="100"><a <?php echo $type_sort; ?> href="helptopics.php?<?php echo $qstr; ?>&sort=type">Type</a></th>
@@ -75,14 +75,25 @@ else
$total=0;
$ids=($errors && is_array($_POST['ids']))?$_POST['ids']:null;
if($res && db_num_rows($res)):
+ $defaultDept = $cfg->getDefaultDept();
+ $defaultPriority = $cfg->getDefaultPriority();
while ($row = db_fetch_array($res)) {
$sel=false;
if($ids && in_array($row['topic_id'],$ids))
$sel=true;
+
+ if (!$row['dept_id'] && $defaultDept) {
+ $row['dept_id'] = $defaultDept->getId();
+ $row['department'] = (string) $defaultDept;
+ }
+
+ if (!$row['priority'] && $defaultPriority)
+ $row['priority'] = (string) $defaultPriority;
+
?>
<tr id="<?php echo $row['topic_id']; ?>">
<td width=7px>
- <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['topic_id']; ?>"
+ <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['topic_id']; ?>"
<?php echo $sel?'checked="checked"':''; ?>>
</td>
<td><a href="helptopics.php?id=<?php echo $row['topic_id']; ?>"><?php echo $row['name']; ?></a> </td>
diff --git a/include/staff/page.inc.php b/include/staff/page.inc.php
index 4cbe67ce8e0836ea8ee3134ac0e856a6a57fff7f..e4304c38b249c440d324d21c29fb0205790ad93e 100644
--- a/include/staff/page.inc.php
+++ b/include/staff/page.inc.php
@@ -31,7 +31,9 @@ $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>Site Pages</h2>
+ <h2>Site Pages
+ <i class="help-tip icon-question-sign" href="#site_pages"></i>
+ </h2>
<table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr><td></td><td></td></tr> <!-- For fixed table layout -->
@@ -57,8 +59,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Type:
</td>
<td>
+ <span>
<select name="type">
- <option value="" selected="selected">Select Page Type</option>
+ <option value="" selected="selected">— Select Page Type —</option>
<?php
foreach($pageTypes as $k => $v)
echo sprintf('<option value="%s" %s>%s</option>',
@@ -66,6 +69,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
<span class="error">* <?php echo $errors['type']; ?></span>
+ <i class="help-tip icon-question-sign" href="#type"></i>
+ </span>
</td>
</tr>
<?php if ($info['name'] && $info['type'] == 'other') { ?>
@@ -103,7 +108,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Admin Notes</strong>: Internal notes. <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes</strong>: Internal notes. </em>
</th>
</tr>
<tr>
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index 5dff4eced87e1d141ff292cff029cd46b6a94119..1f395a59b86f078d6c386fe140cb47eb355e4f91 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -49,7 +49,9 @@ else
?>
<div style="width:700px;padding-top:5px; float:left;">
- <h2>Site Pages</h2>
+ <h2>Site Pages
+ <i class="help-tip icon-question-sign" href="#site_pages"></i>
+ </h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
<b><a href="pages.php?a=add" class="Icon newPage">Add New Page</a></b></div>
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index b6e8ad9faa2f6b28cb9840b43d549f87c8871ee0..29e2fc212e7abdd7e5240752e2044006acc00a46 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -129,7 +129,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<tr><td>User Session Timeout:</td>
<td>
<input type="text" name="client_session_timeout" size=6 value="<?php echo $config['client_session_timeout']; ?>">
- Maximum idle time in minutes before a user must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
+ <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 4613a0bf2837e4f379f3966846cb283ec374cb5f..992845d4d4808a17b5e007bbc3a6cfdaec82d747 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -1,4 +1,5 @@
-<h2>Alerts and Notices</h2>
+<h2>Alerts and Notices
+ <i class="help-tip icon-question-sign" href="#page_title"></i></h2>
<form action="settings.php?t=alerts" method="post" id="save">
<?php csrf_token(); ?>
<input type="hidden" name="t" value="alerts" >
@@ -12,13 +13,15 @@
</thead>
<tbody>
<tr><th><em><b>New Ticket Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_ticket_alert"></i>
+ <i class="help-tip icon-question-sign" href="#ticket_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="ticket_alert_active" value="1" <?php echo $config['ticket_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="ticket_alert_active" value="0" <?php echo !$config['ticket_alert_active']?'checked':''; ?> />Disable
- <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em> <i class="help-tip icon-question-sign" href="#status"></i>
+ <input type="radio" name="ticket_alert_active" value="1"
+ <?php echo $config['ticket_alert_active']?'checked':''; ?>
+ /> Enable
+ <input type="radio" name="ticket_alert_active" value="0" <?php echo !$config['ticket_alert_active']?'checked':''; ?> /> Disable
+ <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em>
</td>
</tr>
<tr>
@@ -26,14 +29,14 @@
<input type="checkbox" name="ticket_alert_admin" <?php echo $config['ticket_alert_admin']?'checked':''; ?>> Admin Email <em>(<?php echo $cfg->getAdminEmail(); ?>)</em>
</td>
</tr>
- <tr>
+ <tr>
<td>
<input type="checkbox" name="ticket_alert_dept_manager" <?php echo $config['ticket_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+ <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members
</td>
</tr>
<tr>
@@ -42,28 +45,34 @@
</td>
</tr>
<tr><th><em><b>New Message Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_message_alert"></i>
+ <i class="help-tip icon-question-sign" href="#message_alert"></i>
</em></th></tr>
<tr>
- <td><em><b>Status:</b></em>
- <input type="radio" name="message_alert_active" value="1" <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
+ <td><em><b>Status:</b></em>
+ <input type="radio" name="message_alert_active" value="1"
+ <?php echo $config['message_alert_active']?'checked':''; ?>
+ /> Enable
- <input type="radio" name="message_alert_active" value="0" <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="message_alert_active" value="0" <?php echo !$config['message_alert_active']?'checked':''; ?> /> Disable
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent"></i>
+ <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff"></i>
+ <input type="checkbox" name="message_alert_assigned" <?php
+ echo $config['message_alert_assigned']?'checked':''; ?>>
+ Assigned Staff
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager"></i>
+ <input type="checkbox" name="message_alert_dept_manager" <?php
+ echo $config['message_alert_dept_manager']?'checked':''; ?>>
+ Department Manager
</td>
</tr>
<tr>
@@ -72,127 +81,135 @@
</td>
</tr>
<tr><th><em><b>New Internal Note Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_internal_note_alert"></i>
+ <i class="help-tip icon-question-sign" href="#internal_note_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="note_alert_active" value="1" <?php echo $config['note_alert_active']?'checked':''; ?> />Enable
+ <input type="radio" name="note_alert_active" value="1" <?php echo $config['note_alert_active']?'checked':''; ?> /> Enable
- <input type="radio" name="note_alert_active" value="0" <?php echo !$config['note_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="note_alert_active" value="0" <?php echo !$config['note_alert_active']?'checked':''; ?> /> Disable
<font class="error"> <?php echo $errors['note_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_laststaff" <?php echo $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent_2"></i>
+ <input type="checkbox" name="note_alert_laststaff" <?php echo
+ $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff / Team Members<i class="help-tip icon-question-sign" href="#assigned_staff_2"></i>
+ <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager_2"></i>
+ <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr><th><em><b>Ticket Assignment Alert</b>:
- <i class="help-tip icon-question-sign" href="#ticket_assignment_alert"></i>
+ <i class="help-tip icon-question-sign" href="#assignment_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status: </b></em>
<input name="assigned_alert_active" value="1" type="radio"
- <?php echo $config['assigned_alert_active']?'checked="checked"':''; ?>>Enable
+ <?php echo $config['assigned_alert_active']?'checked="checked"':''; ?>> Enable
<input name="assigned_alert_active" value="0" type="radio"
- <?php echo !$config['assigned_alert_active']?'checked="checked"':''; ?>>Disable
+ <?php echo !$config['assigned_alert_active']?'checked="checked"':''; ?>> Disable
<font class="error"> <?php echo $errors['assigned_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff_3"></i>
+ <input type="checkbox" name="assigned_alert_staff" <?php echo
+ $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff
</td>
</tr>
<tr>
<td>
- <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em> <i class="help-tip icon-question-sign" href="#team_lead"></i>
+ <input type="checkbox"name="assigned_alert_team_lead" <?php
+ echo $config['assigned_alert_team_lead']?'checked':''; ?>> Team Lead
</td>
</tr>
<tr>
<td>
<input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
- Team Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#team_members"></i>
+ Team Members
</td>
</tr>
<tr><th><em><b>Ticket Transfer Alert</b>:
- <i class="help-tip icon-question-sign" href="#ticket_transfer_alert"></i>
+ <i class="help-tip icon-question-sign" href="#transfer_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="transfer_alert_active" value="1" <?php echo $config['transfer_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="transfer_alert_active" value="0" <?php echo !$config['transfer_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="transfer_alert_active" value="1" <?php echo $config['transfer_alert_active']?'checked':''; ?> /> Enable
+ <input type="radio" name="transfer_alert_active" value="0" <?php echo !$config['transfer_alert_active']?'checked':''; ?> /> Disable
<font class="error"> <?php echo $errors['alert_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team"></i>
+ <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_3"></i>
+ <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
<input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>>
- Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members"></i>
+ Department Members
</td>
</tr>
<tr><th><em><b>Overdue Ticket Alert</b>:
- <i class="help-tip icon-question-sign" href="#overdue_ticket_alert"></i>
+ <i class="help-tip icon-question-sign" href="#overdue_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="overdue_alert_active" value="1" <?php echo $config['overdue_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="overdue_alert_active" value="0" <?php echo !$config['overdue_alert_active']?'checked':''; ?> />Disable
- <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font>
+ <input type="radio" name="overdue_alert_active" value="1"
+ <?php echo $config['overdue_alert_active']?'checked':''; ?> /> Enable
+ <input type="radio" name="overdue_alert_active" value="0"
+ <?php echo !$config['overdue_alert_active']?'checked':''; ?> /> Disable
+ <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team_2"></i>
+ <input type="checkbox" name="overdue_alert_assigned" <?php
+ echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_4"></i>
+ <input type="checkbox" name="overdue_alert_dept_manager" <?php
+ echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members_2"></i>
+ <input type="checkbox" name="overdue_alert_dept_members" <?php
+ echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members
</td>
</tr>
- <tr><th><em><b>System Alerts</b>:
- <i class="help-tip icon-question-sign" href="#system_alerts"></i>
- </em></th></tr>
+ <tr><th>
+ <em><b>System Alerts</b>: <i class="help-tip icon-question-sign" href="#system_alerts"></i></em></th></tr>
<tr>
<td>
- <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors <i class="help-tip icon-question-sign" href="#system_errors"></i>
+ <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled"> System Errors
+ <em>(enabled by default)</em>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>>SQL errors
+ <input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>> SQL errors
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts <i class="help-tip icon-question-sign" href="#excessive_login_attempts"></i>
+ <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>> Excessive failed login attempts
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index a904af89caf0558201c1dcb5571802bafd056687..61535604a7ce198eb1d722ff83c98fc39ebb2535 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -16,12 +16,13 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</thead>
<tbody>
<tr>
- <td width="180" class="required">Default Email Templates:</td>
+ <td width="180" class="required">Default Template Set:</td>
<td>
<select name="default_template_id">
- <option value="">— Select Default Template —</option>
+ <option value="">— Select Default Email Template Set —</option>
<?php
- $sql='SELECT tpl_id,name FROM '.EMAIL_TEMPLATE_GRP_TABLE.' WHERE isactive=1 ORDER BY name';
+ $sql='SELECT tpl_id, name FROM '.EMAIL_TEMPLATE_GRP_TABLE
+ .' WHERE isactive =1 ORDER BY name';
if(($res=db_query($sql)) && db_num_rows($res)){
while (list($id, $name) = db_fetch_row($res)){
$selected = ($config['default_template_id']==$id)?'selected="selected"':''; ?>
@@ -82,24 +83,22 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</td>
</tr>
<tr><th colspan=2><em><strong>Incoming Emails:</strong>
- <i class="help-tip icon-question-sign" href="#incoming_emails"></i>
</em></th>
<tr>
- <td width="180">Email Polling:</td>
- <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?> > Enable POP/IMAP polling
-
- <i class="help-tip icon-question-sign" href="#email_polling"></i>
+ <td width="180">Email Fetching:</td>
+ <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?> > Enable
+ <i class="help-tip icon-question-sign" href="#email_fetching"></i>
<input type="checkbox" name="enable_auto_cron" <?php echo $config['enable_auto_cron']?'checked="checked"':''; ?>>
- Poll on auto-cron
- <i class="help-tip icon-question-sign" href="#enable_autocron_poll"></i>
+ Fetch on auto-cron
+ <i class="help-tip icon-question-sign" href="#enable_autocron_fetch"></i>
</td>
</tr>
<tr>
<td width="180">Strip Quoted Reply:</td>
<td>
<input type="checkbox" name="strip_quoted_reply" <?php echo $config['strip_quoted_reply'] ? 'checked="checked"':''; ?>>
- Enable <i class="help-tip icon-question-sign" href="#strip_quoted_reply"></i>
+ Enable <i class="help-tip icon-question-sign" href="#strip_quoted_reply"></i>
<font class="error"> <?php echo $errors['strip_quoted_reply']; ?></font>
</td>
</tr>
@@ -119,8 +118,10 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<tr>
<td width="180">Accept All Emails:</td>
<td><input type="checkbox" name="accept_unregistered_email" <?php
- echo $config['accept_unregistered_email'] ? 'checked="checked"' : ''; ?>/>
- Accept email from unknown Clients
+ echo $config['accept_unregistered_email'] ? 'checked="checked"' : ''; ?>/>
+ Accept email from unknown Users
+ <i class="help-tip icon-question-sign" href="#accept_all_emails"></i>
+ </td>
</tr>
<tr>
<td width="180">Accept Email Collaborators:</td>
@@ -130,22 +131,23 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<i class="help-tip icon-question-sign" href="#accept_email_collaborators"></i>
</tr>
<tr><th colspan=2><em><strong>Outgoing Emails</strong>: Default email only applies to outgoing emails without SMTP setting.</em></th></tr>
- <tr><td width="180">Default Outgoing Email:</td>
+ <tr><td width="180">Default MTA:</td>
<td>
<select name="default_smtp_id">
<option value=0 selected="selected">None: Use PHP mail function</option>
<?php
- $sql='SELECT email_id,email,name,smtp_host FROM '.EMAIL_TABLE.' WHERE smtp_active=1';
-
+ $sql=' SELECT email_id, email, name, smtp_host '
+ .' FROM '.EMAIL_TABLE.' WHERE smtp_active = 1';
if(($res=db_query($sql)) && db_num_rows($res)) {
- while (list($id,$email,$name,$host) = db_fetch_row($res)){
+ while (list($id, $email, $name, $host) = db_fetch_row($res)){
$email=$name?"$name <$email>":$email;
?>
<option value="<?php echo $id; ?>"<?php echo ($config['default_smtp_id']==$id)?'selected="selected"':''; ?>><?php echo $email; ?></option>
<?php
}
} ?>
- </select> <font class="error"> <?php echo $errors['default_smtp_id']; ?></font>
+ </select> <font class="error"> <?php echo $errors['default_smtp_id']; ?></font>
+ <i class="help-tip icon-question-sign" href="#default_mta"></i>
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index ed1a3b8d5ed473244104a9df1d06547fd863342b..9f120a814aa493978b90709b4357c54451c124ba 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -16,10 +16,10 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</thead>
<tbody>
<tr>
- <td width="180">Knowledge base status:</td>
+ <td width="180">Knowledge Base Status:</td>
<td>
<input type="checkbox" name="enable_kb" value="1" <?php echo $config['enable_kb']?'checked="checked"':''; ?>>
- Enable Knowledge base <em>(Client interface)</em>
+ Enable Knowledge Base
<font class="error"> <?php echo $errors['enable_kb']; ?></font> <i class="help-tip icon-question-sign" href="#knowledge_base_status"></i>
</td>
</tr>
@@ -27,7 +27,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<td width="180">Canned Responses:</td>
<td>
<input type="checkbox" name="enable_premade" value="1" <?php echo $config['enable_premade']?'checked="checked"':''; ?> >
- Enable canned responses <em>(Available on ticket reply)</em>
+ Enable Canned Responses
<font class="error"> <?php echo $errors['enable_premade']; ?></font> <i class="help-tip icon-question-sign" href="#canned_responses"></i>
</td>
</tr>
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index bef09743f1ea2c45e9238f6e874645d07161b0f6..c92f441442823cfd279a4b21909d9267b44a3f91 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -32,6 +32,7 @@ $pages = Page::getPages();
<tr>
<td width="220" class="required">Landing Page:</td>
<td>
+ <span>
<select name="landing_page_id">
<option value="">— Select Landing Page —</option>
<?php
@@ -43,11 +44,14 @@ $pages = Page::getPages();
$page->getName());
} ?>
</select> <font class="error">* <?php echo $errors['landing_page_id']; ?></font>
+ <i class="help-tip icon-question-sign" href="#landing_page"></i>
+ </span>
</td>
</tr>
<tr>
<td width="220" class="required">Offline Page:</td>
<td>
+ <span>
<select name="offline_page_id">
<option value="">— Select Offline Page —</option>
<?php
@@ -59,11 +63,14 @@ $pages = Page::getPages();
$page->getName());
} ?>
</select> <font class="error">* <?php echo $errors['offline_page_id']; ?></font>
+ <i class="help-tip icon-question-sign" href="#offline_page"></i>
+ </span>
</td>
</tr>
<tr>
<td width="220" class="required">Default Thank-You Page:</td>
<td>
+ <span>
<select name="thank-you_page_id">
<option value="">— Select Thank-You Page —</option>
<?php
@@ -75,6 +82,8 @@ $pages = Page::getPages();
$page->getName());
} ?>
</select> <font class="error">* <?php echo $errors['thank-you_page_id']; ?></font>
+ <i class="help-tip icon-question-sign" href="#default_thank_you_page"></i>
+ </span>
</td>
</tr>
</tbody>
@@ -83,7 +92,9 @@ $pages = Page::getPages();
<thead>
<tr>
<th colspan="2">
- <h4>Logos</h4>
+ <h4>Logos
+ <i class="help-tip icon-question-sign" href="#logos"></i>
+ </h4>
<em>System Default Logo</em>
</th>
</tr>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 77c80619b2ab17a9d8ab5b0aea1593c8b342e691..f7eb33822e559e33aad48c87e357f65a041c52f6 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -12,7 +12,7 @@ $gmtime = Misc::gmtime();
<tr>
<th colspan="2">
<h4>System Settings & Preferences</h4>
- <em><b>General Settings</b> <i class="help-tip icon-question-sign" href="#general_settings"></i></em>
+ <em><b>General Settings</b></em>
</th>
</tr>
</thead>
@@ -21,10 +21,12 @@ $gmtime = Misc::gmtime();
<tr>
<td width="220" class="required">Helpdesk Status:</td>
<td>
+ <span>
<label><input type="radio" name="isonline" value="1" <?php echo $config['isonline']?'checked="checked"':''; ?> /> <b>Online</b> </label>
<label><input type="radio" name="isonline" value="0" <?php echo !$config['isonline']?'checked="checked"':''; ?> /> <b>Offline</b></label>
- <font class="error"> <?php echo $config['isoffline']?'osTicket offline':''; ?></font>
+ <font class="error"><?php echo $config['isoffline']?'osTicket offline':''; ?></font>
<i class="help-tip icon-question-sign" href="#helpdesk_status"></i>
+ </span>
</td>
</tr>
<tr>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index d970bc95986088b1093764c2ca1b8188a6e13d8e..37bc2af8561a8e12252dca25e9ef10f1167e3c7e 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -11,8 +11,8 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<thead>
<tr>
<th colspan="2">
- <h4>Ticket Settings</h4>
- <em>Global ticket settings and options. <i class="help-tip icon-question-sign" href="#global_ticket_settings_options"></i></em>
+ <h4>Global Ticket Settings</h4>
+ <em>System-wide default ticket settings and options.</em>
</th>
</tr>
</thead>
@@ -22,7 +22,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<input type="radio" name="random_ticket_ids" value="0" <?php echo !$config['random_ticket_ids']?'checked="checked"':''; ?> />
Sequential
<input type="radio" name="random_ticket_ids" value="1" <?php echo $config['random_ticket_ids']?'checked="checked"':''; ?> />
- Random <em>(highly recommended)</em> <i class="help-tip icon-question-sign" href="#ticket_ids"></i>
+ Random
</td>
</tr>
@@ -31,6 +31,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
Default SLA:
</td>
<td>
+ <span>
<select name="default_sla_id">
<option value="0">— None —</option>
<?php
@@ -45,6 +46,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
?>
</select>
<span class="error">* <?php echo $errors['default_sla_id']; ?></span> <i class="help-tip icon-question-sign" href="#default_sla"></i>
+ </span>
</td>
</tr>
<tr>
@@ -79,11 +81,11 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<td>Human Verification:</td>
<td>
<input type="checkbox" name="enable_captcha" <?php echo $config['enable_captcha']?'checked="checked"':''; ?>>
- Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em> <font class="error"> <?php echo $errors['enable_captcha']; ?></font> <i class="help-tip icon-question-sign" href="#human_verification"></i>
+ Enable CAPTCHA on new web tickets. <font class="error"> <?php echo $errors['enable_captcha']; ?></font> <i class="help-tip icon-question-sign" href="#human_verification"></i>
</td>
</tr>
<tr>
- <td>Claim Tickets:</td>
+ <td>Claim on Response:</td>
<td>
<input type="checkbox" name="auto_claim_tickets" <?php echo $config['auto_claim_tickets']?'checked="checked"':''; ?>>
Enable <i class="help-tip icon-question-sign" href="#claim_tickets"></i>
@@ -92,15 +94,17 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td>Assigned Tickets:</td>
<td>
- <input type="checkbox" name="show_assigned_tickets" <?php echo $config['show_assigned_tickets']?'checked="checked"':''; ?>>
- Show assigned tickets on open queue. <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
+ <input type="checkbox" name="show_assigned_tickets" <?php
+ echo !$config['show_assigned_tickets']?'checked="checked"':''; ?>>
+ Exclude assigned tickets from open queue. <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
</td>
</tr>
<tr>
<td>Answered Tickets:</td>
<td>
- <input type="checkbox" name="show_answered_tickets" <?php echo $config['show_answered_tickets']?'checked="checked"':''; ?>>
- Show answered tickets on open queue. <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
+ <input type="checkbox" name="show_answered_tickets" <?php
+ echo !$config['show_answered_tickets']?'checked="checked"':''; ?>>
+ Exclude answered tickets from open queue. <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
</td>
</tr>
<tr>
@@ -134,7 +138,8 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td width="180">Allow Attachments:</td>
<td>
- <input type="checkbox" name="allow_attachments" <?php echo $config['allow_attachments']?'checked="checked"':''; ?>><b>Allow Attachments</b>
+ <input type="checkbox" name="allow_attachments" <?php echo
+ $config['allow_attachments']?'checked="checked"':''; ?>> <b>Allow Attachments</b>
<em>(Global Setting)</em>
<font class="error"> <?php echo $errors['allow_attachments']; ?></font>
</td>
@@ -228,7 +233,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td width="180">Ticket Response Files:</td>
<td>
- <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> >Email attachments to the user <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
+ <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> > Email attachments to the user <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
</td>
</tr>
<?php if (($bks = FileStorageBackend::allRegistered())
diff --git a/include/staff/staff.inc.php b/include/staff/staff.inc.php
index 7591904973d21dca94c00562a399c108e0c849fa..13fd759eff5f45e6fdf023f3edca71ded1557731 100644
--- a/include/staff/staff.inc.php
+++ b/include/staff/staff.inc.php
@@ -65,7 +65,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<td>
<input type="text" size="30" name="firstname" class="auto first"
value="<?php echo $info['firstname']; ?>">
- <span class="error">* <?php echo $errors['firstname']; ?></span> <i class="help-tip icon-question-sign" href="#first_name"></i>
+ <span class="error">* <?php echo $errors['firstname']; ?></span>
</td>
</tr>
<tr>
@@ -75,7 +75,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<td>
<input type="text" size="30" name="lastname" class="auto last"
value="<?php echo $info['lastname']; ?>">
- <span class="error">* <?php echo $errors['lastname']; ?></span> <i class="help-tip icon-question-sign" href="#last_name"></i>
+ <span class="error">* <?php echo $errors['lastname']; ?></span>
</td>
</tr>
<tr>
@@ -122,6 +122,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
else if (sbk.val() == '' || sbk.val() == 'local')
$('#password-fields').show();
" />
+ Send sign in information
<i class="help-tip icon-question-sign" href="#welcome_email"></i>
</td>
</tr>
@@ -336,7 +337,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
} ?>
<tr>
<th colspan="2">
- <em><strong>Admin Notes</strong> <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes</strong></em>
</th>
</tr>
<tr>
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/include/staff/template.inc.php b/include/staff/template.inc.php
index 41a7c1b90c140bea8edf4706f629391c4d6c17ac..6eefe948edb971c701744af16da066083e0a103d 100644
--- a/include/staff/template.inc.php
+++ b/include/staff/template.inc.php
@@ -50,10 +50,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Status:
</td>
<td>
- <label><input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong> Active</strong></label>
+ <span>
+ <label><input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong> Enabled</strong></label>
<label><input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>> Disabled</label>
<span class="error">* <?php echo $errors['isactive']; ?></span> <i class="help-tip icon-question-sign" href="#status"></i>
+ </span>
</td>
</tr>
<?php
@@ -62,15 +64,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<td width="180" class="required">
Language:
</td>
- <td>
- <?php
- $langs = Internationalization::availableLanguages();
- $lang = strtolower($info['lang']);
- if (isset($langs[$lang]))
- echo $langs[$lang]['desc'];
- else
- echo $info['lang']; ?>
- </td>
+ <td><?php
+ echo Internationalization::getLanguageDescription($info['lang']);
+ ?></td>
</tr>
<?php
$current_group = false;
@@ -109,28 +105,16 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
} else { ?>
<tr>
<td width="180" class="required">
- Language:
- </td>
- <td>
- <?php
- $langs = Internationalization::availableLanguages(); ?>
- <select name="lang_id">
-<?php foreach($langs as $l) {
- $selected = ($info['lang_id'] == $l['code']) ? 'selected="selected"' : ''; ?>
- <option value="<?php echo $l['code']; ?>" <?php echo $selected;
- ?>><?php echo $l['desc']; ?></option>
-<?php } ?>
- </select>
- <span class="error">* <?php echo $errors['lang_id']; ?></span>
- </td>
- </tr>
- <tr>
- <td width="180" class="required">
- Template To Clone:
+ Template Set To Clone:
</td>
<td>
- <select name="tpl_id">
- <option value="0">— Select One ‐</option>
+ <select name="tpl_id" onchange="javascript:
+ if ($(this).val() == 0)
+ $('#language').show();
+ else
+ $('#language').hide();
+">
+ <option value="0">— Stock Templates ‐</option>
<?php
$sql='SELECT tpl_id,name FROM '.EMAIL_TEMPLATE_GRP_TABLE.' ORDER by name';
if(($res=db_query($sql)) && db_num_rows($res)){
@@ -142,13 +126,34 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
<span class="error">* <?php echo $errors['tpl_id']; ?></span><i class="help-tip icon-question-sign" href="#template_to_clone"></i>
- <em>Select an existing template to copy and edit thereafter.</em>
</td>
</tr>
+</tbody>
+<tbody id="language">
+ <tr>
+ <td width="180" class="required">
+ Language:
+ </td>
+ <td>
+ <?php
+ $langs = Internationalization::availableLanguages(); ?>
+ <select name="lang_id">
+<?php foreach($langs as $l) {
+ $selected = ($info['lang_id'] == $l['code']) ? 'selected="selected"' : ''; ?>
+ <option value="<?php echo $l['code']; ?>" <?php echo $selected;
+ ?>><?php echo $l['desc']; ?></option>
+<?php } ?>
+ </select>
+ <span class="error">* <?php echo $errors['lang_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#language"></i>
+ </td>
+ </tr>
+</tbody>
+<tbody>
<?php } ?>
<tr>
<th colspan="2">
- <em><strong>Admin Notes </strong>: Internal notes. <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes </strong>: Internal notes.</em>
</th>
</tr>
<tr>
@@ -159,7 +164,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="templates.php"'>
diff --git a/include/staff/tpl.inc.php b/include/staff/tpl.inc.php
index 650b70ad36d1789cbd4ad8f5cdf372ccf001cd06..4c518ba5d51b8f6ca3be8de18ce97b4b80a002d0 100644
--- a/include/staff/tpl.inc.php
+++ b/include/staff/tpl.inc.php
@@ -34,12 +34,12 @@ if (is_a($template, EmailTemplateGroup)) {
$tpl=$msgtemplates[$selected];
?>
-<h2>Email Template Message - <span><?php echo $name; ?></span></h2>
-<div style="padding-top:10px;padding-bottom:5px;">
- <form method="get" action="templates.php?">
+<form method="get" action="templates.php?">
+<h2><span>Email Template Set / <span><a href="templates.php?tpl_id=<?php echo $tpl_id; ?>"><?php echo $name; ?></a>
<input type="hidden" name="a" value="manage">
<input type="hidden" name="tpl_id" value="<?php echo $tpl_id; ?>">
- Message Template:
+<div class="pull-right">
+ <span style="font-size:10pt">Viewing:</span>
<select id="tpl_options" name="id" style="width:300px;">
<option value="">— Select Setting Group —</option>
<?php
@@ -70,9 +70,10 @@ $tpl=$msgtemplates[$selected];
?>
</select>
<input type="submit" value="Go">
- <font color="red"><?php echo $errors['tpl']; ?></font>
- </form>
-</div>
+ </div>
+</h2>
+</form>
+<hr/>
<form action="templates.php?id=<?php echo $id; ?>&a=manage" method="post" id="save">
<?php csrf_token(); ?>
<?php foreach ($extras as $k=>$v) { ?>
@@ -82,36 +83,36 @@ $tpl=$msgtemplates[$selected];
<input type="hidden" name="a" value="manage">
<input type="hidden" name="do" value="<?php echo $action; ?>">
-<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
- <thead>
- <tr>
- <th colspan="2">
- <h4><?php echo Format::htmlchars($desc['desc']); ?></h4>
- <em>Subject and body required. <a class="tip" href="#ticket_variables.txt">Supported Variables</a>.</em>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan=2>
- <strong>Message Subject:</strong> <em>Email message subject</em> <font class="error">* <?php echo $errors['subject']; ?></font><br>
- <input type="text" name="subject" size="60" value="<?php echo $info['subject']; ?>" >
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <div style="margin-bottom:0.5em;margin-top:0.5em">
- <strong>Message Body:</strong> <em>Email message body.</em> <font class="error">* <?php echo $errors['body']; ?></font>
- </div>
- <input type="hidden" name="draft_id" value=""/>
- <textarea name="body" cols="21" rows="16" style="width:98%;" wrap="soft"
- class="richtext draft" data-draft-namespace="tpl.<?php echo $selected; ?>"
- data-draft-object-id="<?php echo $tpl_id; ?>"><?php echo $info['body']; ?></textarea>
- </td>
- </tr>
- </tbody>
-</table>
-<p style="padding-left:210px;">
+<div style="border:1px solid #ccc;background:#f0f0f0;padding:5px 10px;
+ margin:10px 0;">
+<h3 style="font-size:12pt;margin:0"><?php echo $desc['name']; ?>
+ <i class="help-tip icon-question-sign"
+ data-content="<?php echo Format::htmlchars($desc['desc']); ?>"
+ data-title="<?php echo Format::htmlchars($desc['name']); ?>"></i>
+ <a style="font-size:10pt" class="tip pull-right" href="#ticket_variables.txt">
+ <i class="icon-tags"></i>
+ Supported Variables</a>
+ </h3>
+<?php if ($errors) { ?>
+ <font class="error"><?php echo $errors['subject']; ?> <?php echo $errors['body']; ?></font>
+<?php } ?>
+</div>
+
+<div style="padding-bottom:3px;" class="faded"><strong>Email Subject and Body:</strong></div>
+<div id="toolbar"></div>
+<div style="padding-top:5px;">
+ <input type="text" name="subject" size="65" value="<?php echo $info['subject']; ?>"
+ style="font-size:14pt;width:100%;box-sizing:border-box">
+ <div style="margin-bottom:0.5em;margin-top:0.5em">
+ </div>
+ <input type="hidden" name="draft_id" value=""/>
+ <textarea name="body" cols="21" rows="16" style="width:98%;" wrap="soft"
+ data-toolbar-external="#toolbar"
+ class="richtext draft" data-draft-namespace="tpl.<?php echo $selected; ?>"
+ data-draft-object-id="<?php echo $tpl_id; ?>"><?php echo $info['body']; ?></textarea>
+</div>
+
+<p style="text-align:center">
<input class="button" type="submit" name="submit" value="Save Changes">
<input class="button" type="reset" name="reset" value="Reset Changes" onclick="javascript:
setTimeout('location.reload()', 25);" />
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index a0225e94099f7c6bf0728e95f7ac8565fe159986..53e99b393192f3309c472417fc3b19ac2ead3d80 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -4,8 +4,8 @@ if (typeof RedactorPlugins === 'undefined') var RedactorPlugins = {};
* automatically, along with draft autosave, and image uploading.
*
* Configuration:
- * draft_namespace: namespace for the draft retrieval
- * draft_object_id: extension to the namespace for draft retrieval
+ * draftNamespace: namespace for the draft retrieval
+ * draftObjectId: extension to the namespace for draft retrieval
*
* Caveats:
* Login (staff only currently) is required server-side for drafts and image
@@ -14,17 +14,32 @@ if (typeof RedactorPlugins === 'undefined') var RedactorPlugins = {};
*/
RedactorPlugins.draft = {
init: function() {
- if (!this.opts.draft_namespace)
+ if (!this.opts.draftNamespace)
return;
this.opts.changeCallback = this.hideDraftSaved;
- var autosave_url = 'ajax.php/draft/' + this.opts.draft_namespace;
- if (this.opts.draft_object_id)
- autosave_url += '.' + this.opts.draft_object_id;
+ var autosave_url = 'ajax.php/draft/' + this.opts.draftNamespace;
+ if (this.opts.draftObjectId)
+ autosave_url += '.' + this.opts.draftObjectId;
this.opts.autosave = autosave_url;
this.opts.autosaveInterval = 10;
this.opts.autosaveCallback = this.setupDraftUpdate;
this.opts.initCallback = this.recoverDraft;
+
+ this.$draft_saved = $('<span>')
+ .addClass("pull-right draft-saved")
+ .css({'position':'absolute','top':'3em','right':'0.5em'})
+ .hide()
+ .append($('<span>')
+ .text('Draft Saved'));
+ // Float the [Draft Saved] box with the toolbar
+ this.$toolbar.append(this.$draft_saved);
+ if (this.opts.draftDelete) {
+ var trash = this.buttonAdd('deleteDraft', 'Delete Draft', this.deleteDraft);
+ this.buttonAwesome('deleteDraft', 'icon-trash');
+ trash.parent().addClass('pull-right');
+ trash.addClass('delete-draft');
+ }
},
recoverDraft: function() {
var self = this;
@@ -62,11 +77,11 @@ RedactorPlugins.draft = {
});
},
setupDraftUpdate: function(data) {
- this.$box.parent().find('.draft-saved').show();
+ this.$draft_saved.show().delay(5000).fadeOut();
// Slight workaround. Signal the 'keyup' event normally signaled
// from typing in the <textarea>
- if ($.autoLock && this.opts.draft_namespace == 'ticket.response')
+ if ($.autoLock && this.opts.draftNamespace == 'ticket.response')
if (this.get())
$.autoLock.handleEvent();
@@ -102,7 +117,7 @@ RedactorPlugins.draft = {
},
hideDraftSaved: function() {
- this.$box.parent().find('.draft-saved').hide();
+ this.$draft_saved.hide();
},
deleteDraft: function() {
@@ -238,33 +253,9 @@ $(function() {
});
}
if (el.hasClass('draft')) {
- var draft_saved = $('<span>')
- .addClass("pull-right draft-saved faded")
- .css({'position':'absolute','top':'0.2em','right':'1em'})
- .hide()
- .append($('<span>')
- .css({'position':'relative', 'top':'0.17em'})
- .text('Draft Saved'));
el.closest('form').append($('<input type="hidden" name="draft_id"/>'));
- if (el.hasClass('draft-delete')) {
- draft_saved.append($('<span>')
- .addClass('action-button')
- .click(function() {
- el.redactor('deleteDraft');
- return false;
- })
- .append($('<i>')
- .addClass('icon-trash')
- )
- );
- }
- el.parent().css('position', 'relative');
- draft_saved.insertBefore(el);
options['plugins'].push('draft');
- if (el.data('draftNamespace'))
- options['draft_namespace'] = el.data('draftNamespace');
- if (el.data('draftObjectId'))
- options['draft_object_id'] = el.data('draftObjectId');
+ options.draftDelete = el.hasClass('draft-delete');
}
el.redactor(options);
},
diff --git a/scp/apikeys.php b/scp/apikeys.php
index 9f511ecda98a261651a7a2695382138357cdbef1..529b67a8af1195e18f606f8f1aef37446b2d0c6a 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -96,10 +96,8 @@ if($_POST){
$page='apikeys.inc.php';
$tip_namespace = 'manage.api_keys';
-if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
+if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page = 'apikey.inc.php';
- $tip_namespace = 'manage.addnew_api';
-}
$nav->setTabActive('manage');
$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
diff --git a/scp/banlist.php b/scp/banlist.php
index dc6f25fe2c163897fecf0c941881d8d544a5cd5c..4ef80f44d90d73c4dbc43b87f90061c2cfb63699 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -123,7 +123,6 @@ $page='banlist.inc.php';
$tip_namespace = 'emails.banlist';
if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))) {
$page='banrule.inc.php';
- $tip_namespace = 'emails.manage_banlist';
}
$nav->setTabActive('emails');
diff --git a/scp/canned.php b/scp/canned.php
index b567b0ea6f9790cb106a2a1de5c5225219046af4..ef9fc922f1fee99c536608b5d79aeeb57f8dfea3 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -147,10 +147,9 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
}
$page='cannedresponses.inc.php';
-$tip_namespace = 'knowledgebase.canned_responses';
+$tip_namespace = 'knowledgebase.canned_response';
if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='cannedresponse.inc.php';
- $tip_namespace = 'knowledgebase.addnew_canned_response';
}
$nav->setTabActive('kbase');
diff --git a/scp/categories.php b/scp/categories.php
index d6b66f485b91feb7cf5c3273a7e6d8566e23fe5d..d707c864bc3f3e577f484bdd7691c0a78ea34c5d 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -104,10 +104,9 @@ if($_POST){
}
$page='categories.inc.php';
-$tip_namespace = 'knowledgebase.categories';
+$tip_namespace = 'knowledgebase.category';
if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='category.inc.php';
- $tip_namespace = 'knowledgebase.addnew_category';
}
$nav->setTabActive('kbase');
diff --git a/scp/css/scp.css b/scp/css/scp.css
index dd3f9a092ffa9774856d1860843e335baef57d06..676449d0733c52a02ba6edf1ad9d7fe978e43be3 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1153,6 +1153,9 @@ h2 > i.help-tip {
vertical-align: baseline;
font-size: 11pt;
}
+.form_table th h4 i.help-tip {
+ color: white;
+}
/* Knowledgebase */
/* Knowledgebase */
@@ -1814,3 +1817,16 @@ table.custom-info td {
.ui-datepicker {
z-index: 100 !important;
}
+.draft-saved {
+ background-color: black;
+ background-color: rgba(0, 0, 0, 0.7);
+ color: white;
+ padding: 4px 8px 6px;
+ border-radius: 3px;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ line-height: 14px;
+}
+
+.delete-draft:hover {
+ background-color: #fc9f41 !important;
+}
diff --git a/scp/departments.php b/scp/departments.php
index b1b4dbdce637a6e5bab4b8511dd8538448cae4a4..abb9574902a050c4aa12d3b5e1bc74e8647b281f 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -103,10 +103,9 @@ if($_POST){
}
$page='departments.inc.php';
-$tip_namespace = 'staff.departments';
+$tip_namespace = 'staff.department';
if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='department.inc.php';
- $tip_namespace = 'staff.addnew_department';
}
$nav->setTabActive('staff');
diff --git a/scp/emails.php b/scp/emails.php
index e577044217e385e8a64c5d4b8630286c8697b329..8c688fcb99a50f2640ee0e20a60d149f69274f31 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -78,10 +78,9 @@ if($_POST){
}
$page='emails.inc.php';
-$tip_namespace = 'emails.emails';
+$tip_namespace = 'emails.email';
if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='email.inc.php';
- $tip_namespace = 'emails.addnew_email';
}
$nav->setTabActive('emails');
diff --git a/scp/faq.php b/scp/faq.php
index 8adbe88370f8b9ccc000507779ae9c6cab436694..602b4a33e2eca89b7529715ddd2a58b1001c1569 100644
--- a/scp/faq.php
+++ b/scp/faq.php
@@ -94,13 +94,12 @@ if($faq) {
$inc='faq-view.inc.php';
if($_REQUEST['a']=='edit' && $thisstaff->canManageFAQ())
$inc='faq.inc.php';
- $tip_namespace = 'knowledgebase.addnew_faq';
}elseif($_REQUEST['a']=='add' && $thisstaff->canManageFAQ()) {
$inc='faq.inc.php';
- $tip_namespace = 'knowledgebase.addnew_faq';
} elseif($category && $_REQUEST['a']!='search') {
$inc='faq-category.inc.php';
}
+$tip_namespace = 'knowledgebase.faq';
$nav->setTabActive('kbase');
$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
"$('#content').data('tipNamespace', '".$tip_namespace."');");
diff --git a/scp/filters.php b/scp/filters.php
index 8a5209016505c7e0dde9da23f2dc357f5fd09ca9..99d1f13e71d68d358890f52af3b6081fd284d7cb 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -99,10 +99,9 @@ if($_POST){
}
$page='filters.inc.php';
-$tip_namespace = 'manage.ticket_filters';
+$tip_namespace = 'manage.filter';
if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='filter.inc.php';
- $tip_namespace = 'manage.addnew_filter';
}
$nav->setTabActive('manage');
diff --git a/scp/groups.php b/scp/groups.php
index a2730a58d638e556806208a71913954d110143c3..b2cbd0466dac6fcf166d049367974f1428a713a6 100644
--- a/scp/groups.php
+++ b/scp/groups.php
@@ -98,7 +98,6 @@ $page='groups.inc.php';
$tip_namespace = 'staff.groups';
if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='group.inc.php';
- $tip_namespace = 'staff.addnew_groups';
}
$nav->setTabActive('staff');
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 228ddff21f88f1d3ec79e6e394a6607c4d903341..0847257cfc0d3da5c7d95a79773f0d34062c0b33 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -102,10 +102,9 @@ if($_POST){
}
$page='helptopics.inc.php';
-$tip_namespace = 'manage.help_topics';
+$tip_namespace = 'manage.helptopic';
if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='helptopic.inc.php';
- $tip_namespace = 'manage.addnew_help_topic';
}
$nav->setTabActive('manage');
diff --git a/scp/js/tips.js b/scp/js/tips.js
index ee7764f8097b5b5a1512cc9e98d521cfc3f8c494..9bdd5144db1b88c2faa8711fb065d38a7b955c07 100644
--- a/scp/js/tips.js
+++ b/scp/js/tips.js
@@ -3,16 +3,22 @@ jQuery(function() {
var pos = elem.offset();
var y_pos = pos.top - 12;
- var x_pos = pos.left + (xoffset || ((elem.width()/2) + 20));
+ var x_pos = pos.left + (xoffset || (elem.width() + 16));
var tip_arrow = $('<img>').attr('src', './images/tip_arrow.png').addClass('tip_arrow');
var tip_box = $('<div>').addClass('tip_box');
var tip_shadow = $('<div>').addClass('tip_shadow');
var tip_content = $('<div>').addClass('tip_content').load(url, function() {
- tip_content.prepend('<a href="#" class="tip_close"><i class="icon-remove-circle"></i></a>');
+ tip_content.prepend('<a href="#" class="tip_close"><i class="icon-remove-circle"></i></a>').append(tip_arrow);
+ if ($(window).width() < tip_content.outerWidth() + the_tip.position().left) {
+ console.log(x_pos, tip_content.outerWidth(), elem.width());
+ the_tip.css({'left':x_pos-tip_content.outerWidth()-elem.width()-32+'px'});
+ tip_box.addClass('right');
+ tip_arrow.addClass('flip-x');
+ }
});
- var the_tip = tip_box.append(tip_arrow).append(tip_content).prepend(tip_shadow);
+ var the_tip = tip_box.append(tip_content).prepend(tip_shadow);
the_tip.css({
"top":y_pos + "px",
"left":x_pos + "px"
@@ -111,8 +117,14 @@ jQuery(function() {
});
getHelpTips().then(function(tips) {
- var section = tips[elem.attr('href').substr(1)];
- if (!section) {
+ var href = elem.attr('href');
+ if (href) {
+ section = tips[elem.attr('href').substr(1)];
+ }
+ else if (elem.data('content')) {
+ section = {title: elem.data('title'), content: elem.data('content')};
+ }
+ else {
elem.remove();
clearTimeout(tip_timer);
return;
diff --git a/scp/lists.php b/scp/lists.php
index 479ea804620e0495897ac4cfb67a3eb59a2a5164..66801deee614ad2d8ef82b8534be2eec2a4fa3f8 100644
--- a/scp/lists.php
+++ b/scp/lists.php
@@ -181,8 +181,8 @@ if($_POST) {
$page='dynamic-lists.inc.php';
if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='dynamic-list.inc.php';
- $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_custom_list" />',
- "$('#content').data('tipNamespace', 'manage.addnew_custom_list');");
+ $ost->addExtraHeader('<meta name="tip-namespace" content="manage.custom_list" />',
+ "$('#content').data('tipNamespace', 'manage.custom_list');");
}
$nav->setTabActive('manage');
diff --git a/scp/pages.php b/scp/pages.php
index 91bd9173304010e68f0214869f0f2314bcd7bb91..5f3747b5e1c789db43e2db2c3e77bd3e2b39102c 100644
--- a/scp/pages.php
+++ b/scp/pages.php
@@ -117,7 +117,6 @@ $inc='pages.inc.php';
$tip_namespace = 'manage.pages';
if($page || $_REQUEST['a']=='add') {
$inc='page.inc.php';
- $tip_namespace = 'manage.addnew_page';
}
$nav->setTabActive('manage');
diff --git a/scp/slas.php b/scp/slas.php
index 7003be1c9d86ce5e70fa7eddf04dcb8a8fcfef0d..e4434da4668a3eabc440f069eaa51df6980c8d28 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -100,8 +100,8 @@ if($_POST){
$page='slaplans.inc.php';
if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='slaplan.inc.php';
- $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_sla_plan" />',
- "$('#content').data('tipNamespace', 'manage.addnew_sla_plan');");
+ $ost->addExtraHeader('<meta name="tip-namespace" content="manage.sla" />',
+ "$('#content').data('tipNamespace', 'manage.sla');");
}
$nav->setTabActive('manage');
diff --git a/scp/staff.php b/scp/staff.php
index ae2f8e24053a417b413e43fe4ffefd7f3ecbaffd..e66054b84485ffc0b6112d5f701b9787449bd90b 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -97,10 +97,9 @@ if($_POST){
}
$page='staffmembers.inc.php';
-$tip_namespace = 'staff.agents';
+$tip_namespace = 'staff.agent';
if($staff || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='staff.inc.php';
- $tip_namespace = 'staff.addnew_staff';
}
$nav->setTabActive('staff');
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');
diff --git a/scp/templates.php b/scp/templates.php
index 79b0a01e6ac818e22ea3b3215e55c4f68b5f04f7..809e425618314c6f9568c9c41e3a253ac648f431 100644
--- a/scp/templates.php
+++ b/scp/templates.php
@@ -132,14 +132,13 @@ if($_POST){
}
$page='templates.inc.php';
-$tip_namespace = 'email.templates';
+$tip_namespace = 'emails.template';
if($template && !strcasecmp($_REQUEST['a'],'manage')){
$page='tpl.inc.php';
}elseif($template && !strcasecmp($_REQUEST['a'],'implement')){
$page='tpl.inc.php';
}elseif($template || !strcasecmp($_REQUEST['a'],'add')){
$page='template.inc.php';
- $tip_namespace = 'emails.email_template_form';
}
$nav->setTabActive('emails');