Version 5.3.0

supportpal · May 1, 2024 · e1eb084 · e1eb084
1 parent 884873f
commit e1eb084
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 137 deletions.
diff --git a/selfservice/article.twig b/selfservice/article.twig
@@ -64,12 +64,12 @@
                       sp-text-center sp-align-middle hover:sp-text-white group">
                 <i class="fas fa-envelope group-hover:sp-opacity-75"></i>
             </a><!--
-        --><a href="http://twitter.com/intent/tweet?text={{ article.title|url_encode }}&amp;url={{ article.url(type) }}"
+        --><a href="https://twitter.com/intent/tweet?text={{ article.title|url_encode }}&amp;url={{ article.url(type) }}"
               class="sp-inline-block sp-h-8 sp-w-8 sp-p-1 sp-ml-2 sp-rounded-full sp-text-white sp-text-center
-                     sp-align-middle hover:sp-text-white group" style="background: #55acee">
-                <i class="fab fa-twitter group-hover:sp-opacity-75"></i>
+                     sp-align-middle hover:sp-text-white group" style="background: #000000">
+                <i class="fab fa-x-twitter group-hover:sp-opacity-75"></i>
             </a><!--
-        --><a href="http://www.facebook.com/sharer.php?u={{ article.url(type) }}"
+        --><a href="https://www.facebook.com/sharer.php?u={{ article.url(type) }}"
               class="sp-inline-block sp-h-8 sp-w-8 sp-p-1 sp-ml-2 sp-rounded-full sp-text-white sp-text-center
                      sp-align-middle hover:sp-text-white group" style="background: #3b5998">
                 <i class="fab fa-facebook group-hover:sp-opacity-75"></i>
@@ -167,7 +167,6 @@
 {% block scripts_footer %}
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/selfservice/comment.twig b/selfservice/comment.twig
@@ -16,10 +16,15 @@
                             {% if comment.author.isOperator %}
                                 &nbsp;<span class="sp-badge">{{ Lang.get('general.staff') }}</span>
                             {% endif %}
+                            {% if comment.parent_id and comment.parent_author %}
+                                &nbsp;<span class="sp-description sp-inline-block">{{ Lang.get('selfservice.in_reply_to') }} <a href="#comment-{{ comment.parent_id }}">{{ comment.parent_author.formatted_name }}</a></span>
+                            {% endif %}
                             &nbsp;<span class="sp-description sp-inline-block">{{ timeago(comment.created_at) }}</span>
                         </div>
 
-                        {% if comment.rating|default is not empty and comment.rating < Config.get('settings.comment_threshold') %}
+                        {% if comment.deleted_at %}
+                            <div class="sp-description">
+                        {% elseif comment.rating|default is not empty and comment.rating < Config.get('settings.comment_threshold') %}
                             <a class="sp-comment-hidden sp-inline-block sp-mt-1 sp-mb-3/2 sp-description sp-italic">{{ Lang.get('selfservice.comment_below_threshold') }}</a>
                             <div class="sp-comment-text sp-mt-1 sp-mb-3/2 sp-hidden">
                         {% else %}
@@ -28,34 +33,36 @@
                             {{ comment.purified_text|raw }}
                         </div>
 
-                        <div class="sp-comment-options sp-text-sm sp-text-secondary">
-                            {% if Config.get('settings.comment_ratings') %}
-                                <span class="sp-mr-1">
-                                    <a class="sp-rate-comment sp-inline-block sp-text-tertiary" data-comment="{{ comment.id }}" data-score="1">
-                                        <i class="fas fa-thumbs-up
-                                                  {% if comment.ratings[0] is defined and comment.ratings[0].score == '1' %}sp-text-secondary{% endif %}"></i>
-                                    </a>&nbsp;
-                                    <a class="sp-rate-comment sp-inline-block sp-text-tertiary" data-comment="{{ comment.id }}" data-score="-1">
-                                        <i class="fas fa-thumbs-down
-                                                  {% if comment.ratings[0] is defined and comment.ratings[0].score == '-1' %}sp-text-secondary{% endif %}"></i>
-                                    </a>
-                                </span>
+                        {% if not comment.deleted_at %}
+                            <div class="sp-comment-options sp-text-sm sp-text-secondary">
+                                {% if Config.get('settings.comment_ratings') %}
+                                    <span class="sp-mr-1">
+                                        <a class="sp-rate-comment sp-inline-block sp-text-tertiary" data-comment="{{ comment.id }}" data-score="1">
+                                            <i class="fas fa-thumbs-up
+                                                      {% if comment.ratings[0] is defined and comment.ratings[0].score == '1' %}sp-text-secondary{% endif %}"></i>
+                                        </a>&nbsp;
+                                        <a class="sp-rate-comment sp-inline-block sp-text-tertiary" data-comment="{{ comment.id }}" data-score="-1">
+                                            <i class="fas fa-thumbs-down
+                                                      {% if comment.ratings[0] is defined and comment.ratings[0].score == '-1' %}sp-text-secondary{% endif %}"></i>
+                                        </a>
+                                    </span>
+
+                                    {% if comment.rating is not empty %}
+                                        <span class="sp-comment-rating">{{ comment.rating }}</span>
+                                    {% else %}
+                                        <span class="sp-comment-score sp-hidden"></span>
+                                    {% endif %}
 
-                                {% if comment.rating is not empty %}
-                                    <span class="sp-comment-rating">{{ comment.rating }}</span>
-                                {% else %}
-                                    <span class="sp-comment-score sp-hidden"></span>
+                                    {% if Config.get('settings.comment_write') == 0 or auth_check() %}
+                                        <span class="sp-mx-1 print:sp-hidden">&middot;</span>
+                                    {% endif %}
                                 {% endif %}
 
                                 {% if Config.get('settings.comment_write') == 0 or auth_check() %}
-                                    <span class="sp-mx-1 print:sp-hidden">&middot;</span>
+                                    <a class="sp-reply-to-comment sp-description print:sp-hidden" data-id="{{ comment.id }}">{{ Lang.get('general.reply') }}</a>
                                 {% endif %}
-                            {% endif %}
-
-                            {% if Config.get('settings.comment_write') == 0 or auth_check() %}
-                                <a class="sp-reply-to-comment sp-description print:sp-hidden" data-id="{{ comment.id }}">{{ Lang.get('general.reply') }}</a>
-                            {% endif %}
-                        </div>
+                            </div>
+                        {% endif %}
 
                         {% if comment.children is not empty %}
                             {% if comment.more|default is not empty and comment_ordering == 1 %}
@@ -80,4 +87,4 @@
         {% endfor %}
 
     </div>
-{% endif %}
+{% endif %}
diff --git a/selfservice/forms/comment.twig b/selfservice/forms/comment.twig
@@ -1,4 +1,4 @@
-{{ form_open({ 'route': [ 'selfservice.comment' ], 'method': 'post', 'class': 'add-comment validate' }) }}
+{{ form_open({ 'route': 'selfservice.comment', 'method': 'post', 'class': 'add-comment validate' }) }}
 
     {{ form_hidden('article_id', article['id']) }}
     {{ form_hidden('type_id', type) }}
@@ -20,7 +20,7 @@
 
     <div class="sp-form-row sp-form-full">
         <div class="sp-input-container">
-            {{ form_textarea('text', null, {'placeholder': Lang.choice('selfservice.comment', 1), 'class': 'sp-h-24'}) }}
+            {{ form_editor('text', null, {'placeholder': Lang.choice('selfservice.comment', 1)}) }}
         </div>
     </div>
 

diff --git a/ticket/feedback.twig b/ticket/feedback.twig
@@ -58,7 +58,6 @@
 {% block scripts_footer %}
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/ticket/forms/submit_ticket_step3.twig b/ticket/forms/submit_ticket_step3.twig
@@ -194,7 +194,6 @@
     <script src="{{ asset_rev('resources/assets/frontend/js/newticket.js') }}"></script>
 
     <script src="{{ asset_rev('resources/assets/libs/editor.min.js') }}"></script>
-    <script src="{{ asset_rev('resources/assets/general/js/editor_config.js') }}"></script>
 
     <!-- Attachments -->
     <script src="{{ asset_rev('resources/assets/libs/fileupload/js/jquery.fileupload.min.js') }}"></script>

diff --git a/ticket/ticket.twig b/ticket/ticket.twig
@@ -145,7 +145,6 @@
 
     <!-- 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>
 
     <!-- Attachments -->
     <script src="{{ asset_rev('resources/assets/libs/fileupload/js/jquery.fileupload.min.js') }}"></script>

diff --git a/ticket/ticket_grid.twig b/ticket/ticket_grid.twig
@@ -9,62 +9,45 @@
 
 {% block content %}
 
-    <div class="sp-filter-results sp-mx-6 sp-hidden">
+    <div class="sp-filter-results sp-hidden">
         <h3>{{ Lang.get('general.filter_results') }}</h3>
 
         <div class="sp-table">
             <div class="sp-table-row">
                 <label>{{ Lang.get('general.number') }}:</label>
-                <div>
-                    {{ form_text('sSearch_0', null, {'placeholder': Lang.get('general.type_to_filter')}) }}<!--
-                    -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                </div>
+                <div id="filter_number"></div>
             </div>
             <div class="sp-table-row">
                 <label>{{ Lang.get('general.subject') }}:</label>
-                <div>
-                    {{ form_text('sSearch_1', null, {'placeholder': Lang.get('general.type_to_filter')}) }}<!--
-                    -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                </div>
+                <div id="filter_subject"></div>
             </div>
             <div class="sp-table-row">
                 <label>{{ Lang.choice('ticket.department', 1) }}:</label>
-                <div>
-                    {{ form_select('sSearch_2', {'-1': Lang.get('general.select_value')} + departments.pluck('name', 'id').all()) }}<!--
-                    -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                </div>
+                <div id="filter_department"> </div>
             </div>
             <div class="sp-table-row">
                 <label>{{ Lang.get('ticket.submitted') }}:</label>
                 <div>
-                    <span class="sp-block sm:sp-inline-block">
-                        {{ form_text('sSearch_4_start', null, {'class': 'datepicker sp-w-40', 'placeholder': '&#xf073;'}) }}<!--
-                        -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                    </span>
-                    <span class="sp-hidden sm:sp-inline-block">&nbsp;{{ Lang.get('general.to') }}&nbsp;</span>
-                    <span class="sp-block sp-mt-2 sm:sp-inline-block sm:sp-mt-0">
-                        {{ form_text('sSearch_4_end', null, {'class': 'datepicker sp-w-40', 'placeholder': '&#xf073;'}) }}<!--
-                        -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
+                    <button class="sp-action sp-filter-datepicker" data-active="0" data-column="4">
+                        <i class="fas fa-calendar"></i>
+                        <span class="sp-hidden xs:sp-inline">
+                        &nbsp;<span class="sp-filter-datepicker-text">{{ Lang.get('general.date') }}</span>
                     </span>
+                    </button>
                 </div>
             </div>
             <div class="sp-table-row">
                 <label>{{ Lang.get('ticket.last_reply') }}:</label>
                 <div>
-                    <span class="sp-block sm:sp-inline-block">
-                        {{ form_text('sSearch_5_start', null, {'class': 'datepicker sp-w-40', 'placeholder': '&#xf073;'}) }}<!--
-                        -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                    </span>
-                    <span class="sp-hidden sm:sp-inline-block">&nbsp;{{ Lang.get('general.to') }}&nbsp;</span>
-                    <span class="sp-block sp-mt-2 sm:sp-inline-block sm:sp-mt-0">
-                        {{ form_text('sSearch_5_end', null, {'class': 'datepicker sp-w-40', 'placeholder': '&#xf073;'}) }}<!--
-                        -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
+                    <button class="sp-action sp-filter-datepicker" data-active="0" data-column="5">
+                        <i class="fas fa-calendar"></i>
+                        <span class="sp-hidden xs:sp-inline">
+                        &nbsp;<span class="sp-filter-datepicker-text">{{ Lang.get('general.date') }}</span>
                     </span>
+                    </button>
                 </div>
             </div>
         </div>
-
-        {{ form_hidden('sSearch_6') }}
     </div>
 
 	{{ table.render()|raw }}
@@ -73,9 +56,9 @@
 
 {% 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 src="{{ asset_rev('resources/assets/operator/js/datefiltering.js') }}"></script>
     {{ table.script()|raw }}
 
-    <script src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
-
     <script src="{{ asset_rev('resources/assets/frontend/js/ticketgrid.js') }}"></script>
 {% endblock %}
diff --git a/user/change_password.twig b/user/change_password.twig
@@ -9,7 +9,7 @@
 
 {% block content %}
 
-    {{ form_open({'route': [ 'user.change_password' ], 'method': 'PUT', 'class': 'validate'}) }}
+    {{ form_open({'route': 'user.change_password', 'method': 'PUT', 'class': 'validate'}) }}
 
     <div class="sp-form-row">
         {{ form_label('current_password', Lang.get('user.current_password')) }}
@@ -45,4 +45,4 @@
     {% if jsValidator|default is not empty %}
         {{ jsValidator|raw }}
     {% endif %}
-{% endblock %}
+{% endblock %}
diff --git a/user/email_history.twig b/user/email_history.twig
@@ -32,10 +32,10 @@
 
             // DataTable events.
             $table.on('init.dt', function (settings, json) {
-                $('.sp-date-range-filter').prependTo('div.dataTables_filter');
+                $('.sp-date-range-filter').prependTo('div.dt-search');
 
-                $("div.dataTables_filter")
-                    .removeClass('dataTables_filter')
+                $("div.dt-search")
+                    .removeClass('dt-search')
                     .addClass('sp-flex sp-ml-6 sp-mb-6');
             });
         });

diff --git a/user/forms/twofa.twig b/user/forms/twofa.twig
@@ -39,12 +39,14 @@
     </div>
 </div>
 
-<div class="sp-form-row">
-    {{ form_label('password', Lang.get('general.password')) }}
-    <div class="sp-input-container">
-        {{ form_password('password') }}
+{% if password %}
+    <div class="sp-form-row">
+        {{ form_label('password', Lang.get('general.password')) }}
+        <div class="sp-input-container">
+            {{ form_password('password') }}
+        </div>
     </div>
-</div>
+{% endif %}
 
 <div class="sp-form-button">
     {{ form_submit(Lang.get('user.verify_and_enable'), {'class': 'twofa-verify'}) }}

diff --git a/user/organisation.twig b/user/organisation.twig
@@ -28,7 +28,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/organisation_invite_step1.twig b/user/organisation_invite_step1.twig
@@ -36,7 +36,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/organisation_invite_step2.twig b/user/organisation_invite_step2.twig
@@ -33,7 +33,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/organisation_users.twig b/user/organisation_users.twig
@@ -79,7 +79,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/profile.twig b/user/profile.twig
@@ -60,7 +60,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/register.twig b/user/register.twig
@@ -70,7 +70,6 @@
 
     <!-- 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>
 
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>

diff --git a/user/reset_complete.twig b/user/reset_complete.twig