From 47be047072ce93197abd9e70b0380f65eea4a48e Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 29 Aug 2014 16:57:24 -0500
Subject: [PATCH] doc: Add help tips for new attachment settings
---
.../i18n/en_US/help/tips/settings.ticket.yaml | 37 +++++--------------
include/staff/settings-tickets.inc.php | 5 ++-
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index 5baf7e720..d3c1da5cb 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -128,40 +128,23 @@ enable_html_ticket_thread:
If enabled, this will permit the use of rich text formatting between
Clients and Agents.
-attachments:
- title: Attachments
+ticket_attachment_settings:
+ title: Ticket Thread Attachments
content: >
+ Configure settings for files attached to the <span
+ class="doc-desc-title">issue details</span> field. These settings
+ are used for all new tickets and new messages regardless of the
+ source channel (web portal, email, api, etc.).
-allow_attachments:
- title: Allow Attachments
- content: >
-
-emailed_api_attachments:
- title: Emailed/API Attachments
- content: >
-
-online_web_attachments:
- title: Online/Web Attachments
- content: >
-
-max_user_file_uploads:
- title: Max. User File Uploads
- content: >
-
-max_staff_file_uploads:
- title: Max. Staff File Uploads
- content: >
-
-maximum_file_size:
+max_file_size:
title: Maximum File Size
content: >
+ Choose a maximum file size for attachments uploaded by agents. This
+ includes canned attachments, knowledge base articles, and
+ attachments to ticket replies.
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 email to the User.
-
-accepted_file_types:
- title: Accepted File Types
- content: >
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index a9ede1b5d..eea65c8bb 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -227,7 +227,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
$.dialog($(this).attr('href').substr(1), [201]);
return false;
"><i class="icon-edit"></i> <?php echo __('Config'); ?></a>
- <i class="help-tip icon-question-sign" href="#attachment_settings"></i>
+ <i class="help-tip icon-question-sign" href="#ticket_attachment_settings"></i>
</td>
</tr>
<tr>
@@ -264,7 +264,8 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
}
?>
</select>
- <font class="error"> <?php echo $errors['max_file_size']; ?></font>
+ <i class="help-tip icon-question-sign" href="#max_file_size"></i>
+ <div class="error"><?php echo $errors['max_file_size']; ?></div>
</td>
</tr>
<tr>
--
GitLab