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.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/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index 28f90442e401b368754734b5abd9e42f946bab24..ddad061bf26697b757e4fea6c797b1fd0782a45a 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -20,7 +20,7 @@ default_email_templates:
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 specific set of Email Template.
+ Departments can be assigned a specific Email Template Set.
links:
- title: Manage Email Template Sets
href: /scp/templates.php
diff --git a/include/staff/template.inc.php b/include/staff/template.inc.php
index 41a7c1b90c140bea8edf4706f629391c4d6c17ac..d168869b94884133347db5109b8c86ce959786fe 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
@@ -109,28 +111,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 +132,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 +170,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/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');