Merge branch 'settings' into dev

Author: xaviqv

src/Controllers/ConfigurationsController.php

@@ -21,18 +21,14 @@ public function index()
 	{
 		$configurations = Configuration::all();
 		$configurations_by_sections = ['init' => [], 'table' => [], 'features' => [], 'email' => [], 'tickets' => [], 'perms' => [], 'editor' => [], 'other' => []];
-		$init_section = ['main_route', 'main_route_path', 'admin_route', 'admin_route_path', 'master_template', 'member_model_class', 'routes', 'include_font_awesome', 'user_route', 'admin_button_text'];
+		$init_section = ['main_route', 'main_route_path', 'admin_route', 'admin_route_path', 'master_template', 'member_model_class', 'user_route', 'admin_button_text'];
         $table_section = ['subject_content_column', 'list_text_max_length', 'check_last_update_seconds', 'length_menu', 'max_agent_buttons', 'calendar_month_filter', 'paginate_items'];
         $features_section = ['departments_feature', 'departments_notices_feature', 'ticket_attachments_feature'];
         $email_section = ['status_notification', 'comment_notification', 'queue_emails', 'assigned_notification',
-		'list_owner_notification', 'status_owner_notification',
-		'email.template', 'email.owner.newticket.template', 'email.header', 'email.signoff', 'email.signature', 'email.dashboard',
-		'email.google_plus_link', 'email.facebook_link', 'email.twitter_link', 'email.footer', 'email.footer_link',
-		'email.color_body_bg', 'email.color_header_bg', 'email.color_content_bg', 'email.color_footer_bg',
-		'email.color_button_bg', 'email.account.name', 'email.account.mailbox', 'custom_recipients' ];
+		'list_owner_notification', 'status_owner_notification', 'email.template', 'email.owner.newticket.template', 'email.account.name', 'email.account.mailbox', 'custom_recipients' ];
 		$tickets_section = ['default_priority_id', 'default_status_id', 'default_close_status_id', 'default_reopen_status_id',
             'attachments_ticket_max_size', 'attachments_ticket_max_files_num', 'attachments_mimes',
-            'attachments_path', 'thumbnails_path', 'oldest_year', 'html_replacements', 'use_default_status_id', 'delete_modal_type', 'new_ticket_autoassign'];
+            'attachments_path', 'thumbnails_path', 'oldest_year', 'html_replacements', 'use_default_status_id', 'delete_modal_type'];
 		$perms_section = ['agent_restrict', 'close_ticket_perm', 'reopen_ticket_perm'];
 		$editor_section = ['editor_enabled', 'editor_html_highlighter', 'codemirror_theme',
 			'summernote_locale', 'summernote_options_json_file', 'summernote_options_user', 'purifier_config', ];

src/Seeds/SettingsTableSeeder.php

@@ -123,22 +123,6 @@ public function getDefaults()
              */
             'email.template' => 'panichd::emails.templates.panichd',
 			'email.owner.newticket.template' => 'panichd::emails.templates.simple',
-            // resources/views/emails/templates/ticketit.blade.php
-            'email.header'           => 'Ticket Update',
-            'email.signoff'          => 'Thank you for your patience!',
-            'email.signature'        => 'Your friends',
-            'email.dashboard'        => 'My Dashboard',
-            'email.google_plus_link' => '#', // Toogle icon link: false or string
-            'email.facebook_link'    => '#', // Toogle icon link: false or string
-            'email.twitter_link'     => '#', // Toogle icon link: false or string
-            'email.footer'           => 'Powered by Ticketit',
-            'email.footer_link'      => 'https://github.com/panichelpdesk/panichd',
-            'email.color_body_bg'    => '#FFFFFF',
-            'email.color_header_bg'  => '#44B7B7',
-            'email.color_content_bg' => '#F46B45',
-            'email.color_footer_bg'  => '#414141',
-            'email.color_button_bg'  => '#AC4D2F',
-
 
 			/**
 			 * Configurable notifications.

src/Translations/ca/settings.php

@@ -10,125 +10,80 @@
 $summernoteVersion = PanicHD\PanicHD\Helpers\Cdn::Summernote;
 
 return [
-
-    'main_route' => '<p><b>Panic Help Desk main route</b>: Where to load the ticket system (ex. <code>http://url/tickets</code>)</p>', 'admin_route' => '<p><b>Panic Help Desk admin route</b>: Where to load the ticket administration dashboard (ex. <code>http://url/panichd</code>)</p>', 'master_template' => '<p><b>Template adherence</b>: The master blade template to be extended</p>', 'email.template' => '<p><b>Template adherence</b>: The email blade template to be extended</p>', 'email.header' => '<p><img src="http://i.imgur.com/5aJjuZL.jpg"/></p>', 'email.signoff' => '<p><img src="http://i.imgur.com/jONMwgF.jpg"/></p>', 'email.signature' => '<p><img src="http://i.imgur.com/coi3R63.jpg"/></p>', 'email.dashboard' => '<p><img src="http://i.imgur.com/qzNzJD4.jpg"/></p>', 'email.google_plus_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/fzyxfSg.jpg"/></p>', 'email.facebook_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/FQQzr98.jpg"/></p>', 'email.twitter_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/5JmkrF1.jpg"/></p>', 'email.footer' => '', 'email.footer_link' => '', 'email.color_body_bg' => '<p><img src="http://i.imgur.com/KTF7rEJ.jpg"/></p>', 'email.color_header_bg' => '<p><img src="http://i.imgur.com/wenw5H5.jpg"/></p>', 'email.color_content_bg' => '<p><img src="http://i.imgur.com/7r8dAFj.jpg"/></p>', 'email.color_footer_bg' => '<p><img src="http://i.imgur.com/KTjkdSN.jpg"/></p>', 'email.color_button_bg' => '<p><img src="http://i.imgur.com/0TbGIyt.jpg"/></p>', 'default_status_id' => '<p>The default status for new created tickets</p>', 'default_close_status_id' => '<p>The default closing status</p>', 'default_reopen_status_id' => '<p>The default reopening status</p>', 'paginate_items' => '<p><b>Pagination length</b>: For standard pagination.</p>', 'length_menu' => '<p><b>Pagination length</b>: For tickets table</p>', 'status_notification' => <<<'ENDHTML'
+	// init
+	'main_route' => 'PanicHD prefix used in Laravel route names (ex. route(\'<code>tickets</code>.index\'))',
+	'main_route_path' => 'URL prefix to see tickets (ex. http://hostname/<code>tickets</code>/)',
+	'admin_route' => 'PanicHD configuration menues prefix for Laravel route names (ex. route(\'<code>panichd</code>.status.index\')). Dashboard doesn\'t use it because it has it\'ts own route name "dashboard"',
+	'admin_route_path' => 'URL prefix for PanicHD dashboard and configuration menues (ex. http://url/<code>panichd</code>/priority)',
+	'master_template' => 'The blade template that all PanicHD views will extend',
+	'user_route' => 'Route name for Member pages. If configured, any Member name within a view will have a link to it\'s own page',
+	'member_model_class' => 'PanicHD "Member" model <b>full</b> namespace. Default is <code>PanicHD\PanicHD\Models\Member</code> and it\'s loaded as <code>\PanicHDMember</code>',
+	'admin_button_text' => 'PanicHD cofiguration nav menu name',
+
+	// features
+	'departments_feature' => 'View Member department related information. This feature is under development <a href="https://github.com/panichelpdesk/panichd/wiki/Under-development">as described in our wiki</a><br /><code>0</code>: disabled<br /><code>1</code>: enabled',
+	'departments_notices_feature' => 'Ability to link specific Members to a noticed department. If a ticket is created with any of these special users as an owner, all related department members will see that ticket as a Notice. This feature is under development <a href="https://github.com/panichelpdesk/panichd/wiki/Under-development">as described in our wiki</a><br /><code>0</code>: disabled<br /><code>1</code>: enabled', 
+	'ticket_attachments_feature' => 'Ability to attach files to tickets and/or comments. <br /><code>0</code>: disabled<br /><code>1</code>: enabled',
+	
+	// table
+	'paginate_items' => 'Default table row number',
+	'length_menu' => 'Options for table pagination menu',
+	'max_agent_buttons' => 'Max agent number that will be shown as separate butttons in filter panel. If there are more agents available, they will be shown as a select list',
+	'subject_content_column' => 'Group subject and content column in table<br /><code>0</code>: disabled<br /><code>1</code>: enabled',
+	'calendar_month_filter' => 'View calendar filter available options by calendar periods (week, month).<br /><code>0</code>: View options by day counts (7 dies, 14 dies)<br /><code>1</code>: View options by calendar periods (week, month)',
+	'list_text_max_length' => 'Max visible length for description and intervention fields. If any of these is bigger than this setting, the text will be cutted to this length and a button to view full text will be shown<br /><code>0</code>: Disable',
+	'check_last_update_seconds' => 'Interval in seconds in which an AJAX last updated ticket check will be done to trigger data reload',
+
+	// tickets
+	'default_status_id' => 'The default status for new tickets',
+	'default_close_status_id' => 'The default ticket closing status',
+	'default_reopen_status_id' => 'The default ticket reopening status',
+	'delete_modal_type' => 'Choose which confirmation message type to use when confirming a deleting<br /><code>builtin</code>: javascript confirmation<br /><code>modal</code>: jquery modal message',
+	'attachments_path' => 'Subfolder inside <b>storage</b> where to save attached files',
+	'attachments_ticket_max_size' => 'Max size in <b>MB</b> for all attachments in a single ticket, including comments',
+	'attachments_ticket_max_files_num' => 'Max number of attachments in a single ticket including comments',
+	'attachments_mimes' => 'List of allowed attachment file extensions separated by comma',
+	'thumbnails_path' => 'Subfolder within "storage\\app\\public" where to save attached images thumbnails',
+	'oldest_year' => 'Allowed oldest year for ticket start date or limit date',
+	'html_replacements' => 'Automatic string replacements for content and intervention HTML fields',
+	'default_priority_id' => 'The default priority for new tickets',
+	'use_default_status_id' => 'Whether to allow or not the default_status_id to be assignable in any ticket',
+
+	// notifications
+	'email.template' => 'The email blade template that all notifications extend',
+	'comment_notification' => 'Send notification when new comment is posted<br /><code>1</code>: Send notification<br /><code>0</code>: Do not send notification',
+	'queue_emails' => 'Use Queue method when sending emails (Mail::queue).<br /><code>0</code>: Notificate via Mail::send<br /><code>1</code>: Notificate via Laravel Mail::queue. Note that it requires to be configured <a target="_blank" href="http://laravel.com/docs/master/queues">in Laravel</a>.',
+	'assigned_notification' => 'Send notification to any newly assigned agent<br /><code>0</code>: Don\'t send notification<br /><code>1</code>: Send notification',
+	'email.account.name' => 'The email sender name for all PanicHD notifications<br /><code>default</code>: Use Laravel defaults',
+	'email.account.mailbox' => 'The email address for all PanicHD notifications<br /><code>default</code>: Use Laravel defaults',
+	'list_owner_notification' => 'Notify owner when ticket list changes from active to complete or vice versa<br /><code>0</code>: disabled<br /><code>1</code>: enabled',
+	'status_owner_notification' => 'Notify owner when ticket status changes<br /><code>0</code>: disabled<br /><code>1</code>: enabled. Requires <b>status_notification</b> setting to be enabled too',
+	'custom_recipients' => 'Show option in a comment form to select one or many custom recipients for it',
+	'status_notification' => 'Send email notification to ticket owner/agent when ticket status is changed<br /><code>1</code>: Send notification<br /><code>0</code>: Do not send notification',
+	'email.owner.newticket.template' => 'Notice notification to ticket owner uses the email blade template specified here',
+
+	// TODO: Delete deprecated settings email.*
+	'email.header' => '<p><img src="http://i.imgur.com/5aJjuZL.jpg"/></p>', 'email.signoff' => '<p><img src="http://i.imgur.com/jONMwgF.jpg"/></p>', 'email.signature' => '<p><img src="http://i.imgur.com/coi3R63.jpg"/></p>', 'email.dashboard' => '<p><img src="http://i.imgur.com/qzNzJD4.jpg"/></p>', 'email.google_plus_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/fzyxfSg.jpg"/></p>', 'email.facebook_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/FQQzr98.jpg"/></p>', 'email.twitter_link' => '<p><b>Toogle icon link</b>: empty or string</p><p><img src="http://i.imgur.com/5JmkrF1.jpg"/></p>', 'email.footer' => '', 'email.footer_link' => '', 'email.color_body_bg' => '<p><img src="http://i.imgur.com/KTF7rEJ.jpg"/></p>', 'email.color_header_bg' => '<p><img src="http://i.imgur.com/wenw5H5.jpg"/></p>', 'email.color_content_bg' => '<p><img src="http://i.imgur.com/7r8dAFj.jpg"/></p>', 'email.color_footer_bg' => '<p><img src="http://i.imgur.com/KTjkdSN.jpg"/></p>', 'email.color_button_bg' => '<p><img src="http://i.imgur.com/0TbGIyt.jpg"/></p>',
+	
+	// permissions
+	'agent_restrict' => 'Restrict agents access to only their assigned tickets<br /><code>0</code>: disabled<br /><code>1</code>: enable restricted access',
+	'close_ticket_perm' => 'Array specifying which member types may <b>close</b> a ticket',
+	'reopen_ticket_perm' => 'Array specifying which member types may <b>reopen</b> a ticket',
+
+	// editor
+	'editor_enabled' => 'Enable summernote editor on textareas',
+	'summernote_locale' => 'Which language should summernote js texteditor use. If value is <code>laravel</code>, locale set in <code>config/app.php</code> will be used<br /><br />Example: <code>hu-HU</code> for Hungarian. <a target="_blank" href="https://github.com/summernote/summernote/tree/master/lang">See available language codes</a>',
+    'editor_html_highlighter' => 'Whether include <a target="_blank" href="http://summernote.org/examples/#codemirror-as-codeview">codemirror syntax highlighter</a> or not<br /><code>0</code>: Don\'t include<br /><code>1</code>: Include',
+	'codemirror_theme' => '<p>Theme for <b>codemirror</b> syntax highlighter</p><a target="_blank" href="https://cdnjs.com/libraries/codemirror/$codemirrorVersion">View available themes</a>',
+    'summernote_options_json_file' => 'App relative path for file that contains init values for summernote in JSON. <a target="_blank" href="http://summernote.org/deep-dive/#initialization-options">See avaiable options</a><br /><code>default</code>: Use default options',
+    'purifier_config' => <<<'ENDHTML'
+			<p>Set which HTML tags are allowed</p>
 			<p>
-				<b>Status notification</b>: send email notification to ticket owner/agent when ticket status is changed
-			</p>
-
-			<p>
-				Default is send notification: <code>1</code><br>
-				Do not send notification: <code>0</code>
-			</p>
-ENDHTML
-
-    , 'comment_notification' => <<<'ENDHTML'
-			<p>
-				<b>Comment notification</b>: Send notification when new comment is posted
-			</p>
-
-			<p>
-				Default is send notification: <code>1</code><br>
-				Do not send notification: <code>0</code>
-			</p>
-ENDHTML
-
-    , 'queue_emails' => <<<'ENDHTML'
-			<p>
-				Use Queue method when sending emails (Mail::queue instead of Mail::send).
-				Note that Mail::queue needs to be configured first <a target="_blank" href="http://laravel.com/docs/master/queues">http://laravel.com/docs/master/queues</a>
-			</p>
-
-			<p>
-				Default is to not use queue: <code>0</code><br>
-				Use queue: <code>1</code>
-			</p>
-ENDHTML
-
-    , 'assigned_notification' => <<<'ENDHTML'
-			<p><b>Agent notify</b>: To notify assigned agent (either auto or manual assignment) of new assigned or transferred tickets</p>
-
-			<p>
-				Not to notify agent: <code>0</code><br>
-				Notify agent: <code>1</code>
-			</p>
-ENDHTML
-
-    , 'agent_restrict' => <<<'ENDHTML'
-			<p><b>Agent restrict</b>: Restrict agents access to only their assigned tickets</p>
-
-			<p>
-				Agent access only assigned tickets: <code>1</code>
-			</p>
-ENDHTML
-
-    , 'close_ticket_perm' => '<p><b>Close Ticket Perm</b>: Who has a permission to close tickets</p>', 'reopen_ticket_perm' => '<p><b>Reopen Ticket Perm</b>: Who has a permission to reopen tickets</p>', 'delete_modal_type' => <<<'ENDHTML'
-			<p><b>Delete Confirmation</b>: Choose which confirmation message type to use when confirming a deleting</p>
-
-			<p>Options: <code>builtin</code>, <code>modal</code></p>
-ENDHTML
-
-    /* ------------------ JS EDITOR ------------------ */, 'editor_enabled' => <<<'ENDHTML'
-			<p>Enable summernote editor on textareas</p>
-
-			<p>
-				Disable: <code>0</code><br>
-				Enable: <code>1</code>
-			</p>
-ENDHTML
-
-    , 'summernote_locale' => <<<"ENDHTML"
-			<p>
-				Which language should summernote js texteditor use<br>
-				If value is <code>laravel</code>, locale set in <code>config/app.php</code> will be used
-			</p>
-
-			<p>Example: <code>hu-HU</code> for Hungarian</p>
-
-			<p>See available language codes <a target="_blank" href="https://cdnjs.com/libraries/summernote/$summernoteVersion">here</a></p>
-ENDHTML
-
-    , 'editor_html_highlighter' => <<<'ENDHTML'
-			<p>Whether include codemirror sytax highlighter or not</p>
-
-			<p><a target="_blank" href="http://summernote.org/examples/#codemirror-as-codeview">http://summernote.org/examples/#codemirror-as-codeview</a></p>
-
-			<p>
-				Don't include: <code>0</code><br>
-				Include: <code>1</code>
-			</p>
-ENDHTML
-
-    , 'codemirror_theme' => <<<'ENDHTML'
-			<p>Theme for sytax highlighter</p>
-
-			<p>Available themes <a target="_blank" href="https://cdnjs.com/libraries/codemirror/$codemirrorVersion">here</a></p>
-ENDHTML
-
-    , 'summernote_options_json_file' => <<<'ENDHTML'
-			<p>
-				Init values for summernote js texteditor in JSON<br>
-				See avaiable options <a target="_blank" href="http://summernote.org/deep-dive/#initialization-options">here</a>
-			</p>
-
-			<p>This setting stores the path to the json config file, relative to project route</p>
-ENDHTML
-
-    , 'purifier_config' => <<<'ENDHTML'
-			<p>Set which html tags are allowed</p>
-			<p>
-				This overrides the settings part of <a target="_blank" href="https://github.com/mewebstudio/Purifier/blob/master/config/purifier.php">this file</a><br>
+				Configuring this parameter overrides the settings in <a target="_blank" href="https://github.com/mewebstudio/Purifier/blob/master/config/purifier.php">Purifier config file</a><br>
 				The same config can be achived by running <code>php artisan vendor:publish</code> and modifying <code>config/purifier.php</code>
 			</p>
 
-			<p>Full docs: <a target="_blank" href="http://htmlpurifier.org/docs">http://htmlpurifier.org/docs</a></p>
-ENDHTML
-
-    , 'routes' => <<<'ENDHTML'
-			<p>Set custom routes file</p>
-			<p>
-				Useful if you want to replace any of the Panic Help Desk components
-			</p>
+			<p><a target="_blank" href="http://htmlpurifier.org/docs">Purifier documentation</a></p>
 ENDHTML
-
+	, 'summernote_options_user' => 'Member without current permissions uses it\'s own summernote options if specified in this setting<br /><code>default</code>: Summernote default options'
 ];

src/Translations/en/settings.php

@@ -123,12 +123,4 @@
 
 			<p>Full docs: <a target="_blank" href="http://htmlpurifier.org/docs">http://htmlpurifier.org/docs</a></p>
 ENDHTML
-
-    , 'routes' => <<<'ENDHTML'
-			<p>Set custom routes file</p>
-			<p>
-				Useful if you want to replace any of the Panic Help Desk components
-			</p>
-ENDHTML
-
 ];

src/Translations/it/settings.php

@@ -162,13 +162,4 @@
 
 			<p>Документация: <a target="_blank" href="http://htmlpurifier.org/docs">http://htmlpurifier.org/docs</a></p>
 HTML
-    ,
-
-    'routes' => <<<'HTML'
-			<p>Использовать собственный routes-файл вместо поставляемого пакетом</p>
-			<p>
-				Пригодится, если необходимо заменить или исключить некоторые компоненты Panic Help Desk
-			</p>
-HTML
-
 ];