Version 5.0.0

supportpal · Aug 22, 2023 · 7af3dda · 7af3dda
1 parent c98671f
commit 7af3dda
Show file tree

Hide file tree

Showing 130 changed files with 1,275 additions and 1,106 deletions.
diff --git a/core/about.twig b/core/about.twig
@@ -189,7 +189,7 @@
 {% endblock %}
 
 {% block scripts_footer %}
-    <script type="text/javascript">
+    <script>
         $(function () {
             $('#spanLicenseUpdate').on('click', function () {
                 Swal.fire({

diff --git a/core/addons_sidebar.twig b/core/addons_sidebar.twig
@@ -31,6 +31,9 @@
                 <a href="{{ route('core.operator.integration.index') }}">{{ Lang.choice('core.third_party_integrations', 2) }}</a>
             </li>
         {% endif %}
+        <li {% if route starts with 'report.operator.manage' %}class="sp-active"{% endif %}>
+            <a href="{{ route('report.operator.manage.index') }}">{{ Lang.choice('report.report', 2) }}</a>
+        </li>
         <li {% if route starts with 'core.operator.widget' %}class="sp-active"{% endif %}>
             <a href="{{ route('core.operator.widget.index') }}">{{ Lang.choice('core.widget', 2) }}</a>
         </li>

diff --git a/core/api_token.twig b/core/api_token.twig
@@ -53,7 +53,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/brand.twig b/core/brand.twig
@@ -56,7 +56,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $(document.body).on('delete-successful', '.delete-confirm', function() {
                 // Reload page on deleting brand

diff --git a/core/dashboard.twig b/core/dashboard.twig
@@ -35,7 +35,7 @@
 
     <script src="{{ asset_rev('resources/assets/libs/datatables/js/jquery.dataTables.min.js') }}"></script>
 
-    <script type="text/javascript">
+    <script>
         $(function() {
             {% if widgets|default is not empty %}
 

diff --git a/core/email.twig b/core/email.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="{{ get_template_mode() }}">
 
 <head>
     <title>{{ record.subject }}</title>
@@ -9,7 +9,7 @@
     {{ View.fireHook('operator.head') }}
 </head>
 
-<body class="{{ get_template_mode() }} xs:sp-m-6 sp-bg-secondary sp-text-primary print:sp-bg-primary" data-disable-pace>
+<body class="xs:sp-m-6 sp-bg-secondary sp-text-primary print:sp-bg-primary" data-disable-pace>
 
     {{ View.fireHook('operator.body_start') }}
 
@@ -158,7 +158,7 @@
 
     {% include 'operator.' ~ template ~ '.footer_common' %}
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             // Open links in a new window/tab. Needs rel="noopener" due to
             // https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/

diff --git a/core/email_log.twig b/core/email_log.twig
@@ -94,12 +94,12 @@
 {% block scripts_footer %}
     <script src="{{ asset_rev('resources/assets/libs/datatables/js/jquery.dataTables.min.js') }}"></script>
     <script src="{{ asset_rev('resources/assets/libs/daterangepicker/js/daterangepicker.min.js') }}"></script>
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/datefiltering.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/datefiltering.js') }}"></script>
     {{ table.script()|raw }}
 
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function () {
             $(document).on('click', '.retry', function () {
                 var self = this;

diff --git a/core/email_queue.twig b/core/email_queue.twig
@@ -89,11 +89,11 @@
 {% block scripts_footer %}
     <script src="{{ asset_rev('resources/assets/libs/datatables/js/jquery.dataTables.min.js') }}"></script>
     <script src="{{ asset_rev('resources/assets/libs/daterangepicker/js/daterangepicker.min.js') }}"></script>
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/datefiltering.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/datefiltering.js') }}"></script>
     {{ table.script()|raw }}
 
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
-    <script type="text/javascript">
+    <script src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
+    <script>
         $(function () {
             $(document).on('click', '.send-button', function () {
                 $.get('{{ route('core.operator.emailqueue.send') }}', { 'id[]': [ $(this).data('id') ] })

diff --git a/core/email_template.twig b/core/email_template.twig
@@ -57,7 +57,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/feedback_fields.twig b/core/feedback_fields.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="{{ get_template_mode() }}">
 
 <head>
     <title>{{ Lang.get('ticket.view_feedback') }}</title>
@@ -9,7 +9,7 @@
     {{ View.fireHook('operator.head') }}
 </head>
 
-<body class="{{ get_template_mode() }} sp-m-6 sp-bg-secondary sp-text-primary print:sp-bg-primary" data-disable-pace>
+<body class="sp-m-6 sp-bg-secondary sp-text-primary print:sp-bg-primary" data-disable-pace>
 
     {{ View.fireHook('operator.body_start') }}
 
@@ -26,13 +26,7 @@
                     <div class="sp-form-row">
                         <label>{{ Lang.get('ticket.rating') }}</label>
                         <div class="sp-input-container">
-                            {% if record.rating == 0 %}
-                                <strong class="sp-text-red-600">{{ Lang.get('general.bad') }}</strong>
-                            {% elseif record.rating == 1 %}
-                                <strong class="sp-text-green-600">{{ Lang.get('general.good') }}</strong>
-                            {% else %}
-                                <strong class="sp-text-yellow-600">{{ Lang.get('general.neutral') }}</strong>
-                            {% endif %}
+                            <strong class="{{ record.rating.textColour() }}">{{ record.rating.toString() }}</strong>
                         </div>
                     </div>
 
@@ -55,7 +49,7 @@
     {% include 'operator.' ~ template ~ '.footer_common' %}
 
     <!-- General -->
-    <script src="{{ asset_rev('resources/assets/operator/js/main.js') }}" type="text/javascript"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/main.js') }}"></script>
 
     <!-- WYSIWYG Editor -->
     <script src="{{ asset_rev('resources/assets/libs/editor.min.js') }}"></script>
@@ -64,7 +58,7 @@
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             // Disable all inputs.
             $(':input').prop('disabled', true);

diff --git a/core/feedback_form.twig b/core/feedback_form.twig
@@ -61,7 +61,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/forms/api_token.twig b/core/forms/api_token.twig
@@ -66,7 +66,7 @@
         {{ jsValidator|raw }}
     {% endif %}
 
-    <script type="text/javascript">
+    <script>
         function randomString(length) {
             var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!%&#=+?'
             var result = '';

diff --git a/core/forms/brand.twig b/core/forms/brand.twig
@@ -106,11 +106,19 @@
             <div class="sp-form-row">
                 {{ form_label('favicon', Lang.get('core.favicon')) }}
                 <div class="sp-input-container">
-                    {{ form_text('favicon', null, { 'size': 65 }) }}
+                    {{ form_text('favicon', null, {'size': 65}) }}
                     <div class="sp-description">{{ Lang.get('core.favicon_desc') }}</div>
                 </div>
             </div>
 
+            <div class="sp-form-row">
+                {{ form_label('favicon_dark_mode', Lang.get('core.favicon_dark_mode')) }}
+                <div class="sp-input-container">
+                    {{ form_text('favicon_dark_mode', null, {'size': 65}) }}
+                    <div class="sp-description">{{ Lang.get('core.favicon_dark_mode_desc') }}</div>
+                </div>
+            </div>
+
             <hr />
 
             <h3>{{ Lang.get('general.frontend') }}</h3>
@@ -146,14 +154,6 @@
                 </div>
             </div>
 
-            <div class="sp-form-row">
-                {{ form_label('frontend_template_mode', Lang.get('core.template_mode')) }}
-                <div class="sp-input-container">
-                    {{ form_select('frontend_template_mode', {1: Lang.get('core.light_mode'), 2: Lang.get('core.dark_mode')}) }}
-                    <div class="sp-description">{{ Lang.get('core.template_mode_desc') }}</div>
-                </div>
-            </div>
-
             <hr />
 
             <h3>{{ Lang.get('core.operator_panel') }}</h3>
@@ -172,14 +172,6 @@
                     {{ form_select('operator_template', operatorTemplates) }}
                 </div>
             </div>
-
-            <div class="sp-form-row">
-                {{ form_label('operator_template_mode', Lang.get('core.template_mode')) }}
-                <div class="sp-input-container">
-                    {{ form_select('operator_template_mode', {1: Lang.get('core.light_mode'), 2: Lang.get('core.dark_mode')}) }}
-                    <div class="sp-description">{{ Lang.get('core.template_mode_desc') }}</div>
-                </div>
-            </div>
         </div>
 
         <div id="tabEmail" class="sp-tab-content sp-hidden">
@@ -277,11 +269,11 @@
     <script src="{{ asset_rev('resources/assets/general/js/editor_config.js') }}"></script>
 
     <!-- Translatable.js dependencies: Selectize -->
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
 
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/settings.js') }}"></script>
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/oauth.js') }}"></script>
-    <script type="text/javascript">
+    <script src="{{ asset_rev('resources/assets/operator/js/settings.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/oauth.js') }}"></script>
+    <script>
         var sslWarning = new SslWarning({
             route: "{{ mail_route('core.frontend.home', null, record.id) }}"
         });

diff --git a/core/forms/email_template.twig b/core/forms/email_template.twig
@@ -94,14 +94,14 @@
     {% endif %}
 
     <!-- Translatable.js dependencies: Selectize -->
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
 
     <!-- WYSIWYG Editor -->
     <script src="{{ asset_rev('resources/assets/libs/editor.min.js') }}"></script>
     <script src="{{ asset_rev('resources/assets/general/js/editor_config.js') }}"></script>
 
     <script src="{{ asset_rev('resources/assets/operator/js/multidimensionaldata.js') }}"></script>
-    <script type="text/javascript">
+    <script>
         var opts = {
             toolbar: true,
             mergeFields: {

diff --git a/core/forms/feedback_form.twig b/core/forms/feedback_form.twig
@@ -118,10 +118,10 @@
     {% endif %}
 
     <!-- Filtering.js dependencies: Phone numbers -->
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/libs/intltelinput/js/intl-tel-input.min.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/libs/intltelinput/js/intl-tel-input.min.js') }}"></script>
 
     <!-- Translatable.js dependencies: Selectize -->
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/translatable.js') }}"></script>
 
     <script src="{{ asset_rev('resources/assets/operator/js/filtering.js') }}"></script>
     <script src="{{ asset_rev('resources/assets/operator/js/formfield.js') }}"></script>

diff --git a/core/forms/ip_ban.twig b/core/forms/ip_ban.twig
@@ -91,7 +91,7 @@
         {{ jsValidator|raw }}
     {% endif %}
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             // Date picker
             $('.datepicker').datepicker();

diff --git a/core/forms/message.twig b/core/forms/message.twig
@@ -1,7 +1,11 @@
 {% extends parent_template %}
 
 {% block title %}
-    {{ Lang.choice('general.message', 2) }}
+    {% if conversation.subject %}
+        {{ conversation.subject }}
+    {% else %}
+        {{ Lang.choice('general.message', 2) }}
+    {% endif %}
 {% endblock %}
 
 {% block precontent %}
@@ -15,7 +19,7 @@
 
 {% block content %}
 
-    {% for message in messages %}
+    {% for message in conversation.messages %}
         <div class="sp-message sp-message-{{ message.id }}">
             <div class="sp-flex">
                 <div class="sp-flex-initial sp-hidden sp-mr-4 md:sp-block">
@@ -46,8 +50,8 @@
 
     <h2>{{ Lang.get('general.reply') }}</h2>
 
-    {{ form_open({'method': 'PUT', 'route': ['core.operator.message.update', conversation_id], 'class': 'validate'}) }}
-        {{ form_hidden('conversation_id', conversation_id) }}
+    {{ form_open({'method': 'PUT', 'route': ['core.operator.message.update', conversation.id], 'class': 'validate'}) }}
+        {{ form_hidden('conversation_id', conversation.id) }}
 
         <div class="sp-form-row">
             <div class="sp-input-container">
@@ -71,7 +75,7 @@
     <script src="{{ asset_rev('resources/assets/libs/editor.min.js') }}"></script>
     <script src="{{ asset_rev('resources/assets/general/js/editor_config.js') }}"></script>
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $('textarea').editor();
 

diff --git a/core/general_settings.twig b/core/general_settings.twig
@@ -288,9 +288,9 @@
         {{ jsValidator|raw }}
     {% endif %}
 
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/settings.js') }}"></script>
-    <script type="text/javascript" src="{{ asset_rev('resources/assets/operator/js/oauth.js') }}"></script>
-    <script type="text/javascript">
+    <script src="{{ asset_rev('resources/assets/operator/js/settings.js') }}"></script>
+    <script src="{{ asset_rev('resources/assets/operator/js/oauth.js') }}"></script>
+    <script>
         var sslWarning = new SslWarning({
             route: "{{ mail_route('core.frontend.home') }}"
         });

diff --git a/core/integration.twig b/core/integration.twig
@@ -50,7 +50,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/ip_ban.twig b/core/ip_ban.twig
@@ -49,7 +49,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/ip_whitelist.twig b/core/ip_whitelist.twig
@@ -49,7 +49,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/language.twig b/core/language.twig
@@ -46,7 +46,7 @@
     {{ table.script()|raw }}
 
     <!-- Filter the table -->
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             /**
              * Initialise the filters

diff --git a/core/license_error.twig b/core/license_error.twig
@@ -80,7 +80,7 @@
 {% endblock %}
 
 {% block scripts_footer %}
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             // Handle forgotten click
             $('.license-key').on('click', function() {