From e1eb084247a91e7d23f5aa8ffb80031436de0b90 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Wed, 1 May 2024 15:58:25 +0100 Subject: [PATCH] Version 5.3.0 --- selfservice/article.twig | 9 ++--- selfservice/comment.twig | 57 +++++++++++++++------------ selfservice/forms/comment.twig | 4 +- ticket/feedback.twig | 1 - ticket/forms/submit_ticket_step3.twig | 1 - ticket/ticket.twig | 1 - ticket/ticket_grid.twig | 49 ++++++++--------------- user/change_password.twig | 4 +- user/email_history.twig | 6 +-- user/forms/twofa.twig | 12 +++--- user/organisation.twig | 1 - user/organisation_invite_step1.twig | 1 - user/organisation_invite_step2.twig | 1 - user/organisation_users.twig | 1 - user/profile.twig | 1 - user/register.twig | 1 - user/reset_complete.twig | 21 ---------- user/set_password.twig | 54 ++++++++++++------------- user/social_login_options.twig | 2 +- user/verify.twig | 11 ++++-- 20 files changed, 101 insertions(+), 137 deletions(-) delete mode 100644 user/reset_complete.twig diff --git a/selfservice/article.twig b/selfservice/article.twig index e153c94..7163556 100644 --- a/selfservice/article.twig +++ b/selfservice/article.twig @@ -64,12 +64,12 @@ sp-text-center sp-align-middle hover:sp-text-white group"> - + sp-align-middle hover:sp-text-white group" style="background: #000000"> + @@ -167,7 +167,6 @@ {% block scripts_footer %} - diff --git a/selfservice/comment.twig b/selfservice/comment.twig index 64ba4de..f654665 100644 --- a/selfservice/comment.twig +++ b/selfservice/comment.twig @@ -16,10 +16,15 @@ {% if comment.author.isOperator %}  {{ Lang.get('general.staff') }} {% endif %} + {% if comment.parent_id and comment.parent_author %} +  {{ Lang.get('selfservice.in_reply_to') }} {{ comment.parent_author.formatted_name }} + {% endif %}  {{ timeago(comment.created_at) }} - {% if comment.rating|default is not empty and comment.rating < Config.get('settings.comment_threshold') %} + {% if comment.deleted_at %} +
+ {% elseif comment.rating|default is not empty and comment.rating < Config.get('settings.comment_threshold') %} {{ Lang.get('selfservice.comment_below_threshold') }}
{% else %} @@ -28,34 +33,36 @@ {{ comment.purified_text|raw }}
-
- {% if Config.get('settings.comment_ratings') %} - - - -   - - - - + {% if not comment.deleted_at %} +
+ {% if Config.get('settings.comment_ratings') %} + + + +   + + + + + + {% if comment.rating is not empty %} + {{ comment.rating }} + {% else %} + + {% endif %} - {% if comment.rating is not empty %} - {{ comment.rating }} - {% else %} - + {% if Config.get('settings.comment_write') == 0 or auth_check() %} + · + {% endif %} {% endif %} {% if Config.get('settings.comment_write') == 0 or auth_check() %} - · + {{ Lang.get('general.reply') }} {% endif %} - {% endif %} - - {% if Config.get('settings.comment_write') == 0 or auth_check() %} - {{ Lang.get('general.reply') }} - {% endif %} -
+
+ {% endif %} {% if comment.children is not empty %} {% if comment.more|default is not empty and comment_ordering == 1 %} @@ -80,4 +87,4 @@ {% endfor %}
-{% endif %} \ No newline at end of file +{% endif %} diff --git a/selfservice/forms/comment.twig b/selfservice/forms/comment.twig index 6fa4a07..b88e5d8 100644 --- 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 @@
- {{ form_textarea('text', null, {'placeholder': Lang.choice('selfservice.comment', 1), 'class': 'sp-h-24'}) }} + {{ form_editor('text', null, {'placeholder': Lang.choice('selfservice.comment', 1)}) }}
diff --git a/ticket/feedback.twig b/ticket/feedback.twig index d0dc1f9..3d203be 100644 --- a/ticket/feedback.twig +++ b/ticket/feedback.twig @@ -58,7 +58,6 @@ {% block scripts_footer %} - diff --git a/ticket/forms/submit_ticket_step3.twig b/ticket/forms/submit_ticket_step3.twig index e48e594..3397741 100644 --- a/ticket/forms/submit_ticket_step3.twig +++ b/ticket/forms/submit_ticket_step3.twig @@ -194,7 +194,6 @@ - diff --git a/ticket/ticket.twig b/ticket/ticket.twig index cc6ecfa..1de103e 100644 --- a/ticket/ticket.twig +++ b/ticket/ticket.twig @@ -145,7 +145,6 @@ - diff --git a/ticket/ticket_grid.twig b/ticket/ticket_grid.twig index 4cbcc8b..b570685 100644 --- a/ticket/ticket_grid.twig +++ b/ticket/ticket_grid.twig @@ -9,62 +9,45 @@ {% block content %} -
+

{{ Lang.get('general.filter_results') }}

-
- {{ form_text('sSearch_0', null, {'placeholder': Lang.get('general.type_to_filter')}) }}{{ form_button('', {'class': 'reset-filter'}) }} -
+
-
- {{ form_text('sSearch_1', null, {'placeholder': Lang.get('general.type_to_filter')}) }}{{ form_button('', {'class': 'reset-filter'}) }} -
+
-
- {{ form_select('sSearch_2', {'-1': Lang.get('general.select_value')} + departments.pluck('name', 'id').all()) }}{{ form_button('', {'class': 'reset-filter'}) }} -
+
- - {{ form_text('sSearch_4_start', null, {'class': 'datepicker sp-w-40', 'placeholder': ''}) }}{{ form_button('', {'class': 'reset-filter'}) }} - -  {{ Lang.get('general.to') }}  - - {{ form_text('sSearch_4_end', null, {'class': 'datepicker sp-w-40', 'placeholder': ''}) }}{{ form_button('', {'class': 'reset-filter'}) }} +
- - {{ form_text('sSearch_5_start', null, {'class': 'datepicker sp-w-40', 'placeholder': ''}) }}{{ form_button('', {'class': 'reset-filter'}) }} - -  {{ Lang.get('general.to') }}  - - {{ form_text('sSearch_5_end', null, {'class': 'datepicker sp-w-40', 'placeholder': ''}) }}{{ form_button('', {'class': 'reset-filter'}) }} +
- - {{ form_hidden('sSearch_6') }}
{{ table.render()|raw }} @@ -73,9 +56,9 @@ {% block scripts_footer %} + + {{ table.script()|raw }} - - {% endblock %} diff --git a/user/change_password.twig b/user/change_password.twig index 4a9424e..0f7014e 100644 --- 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'}) }}
{{ form_label('current_password', Lang.get('user.current_password')) }} @@ -45,4 +45,4 @@ {% if jsValidator|default is not empty %} {{ jsValidator|raw }} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/user/email_history.twig b/user/email_history.twig index 2978b1e..e564115 100644 --- 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 index d8ef2a1..ae77567 100644 --- a/user/forms/twofa.twig +++ b/user/forms/twofa.twig @@ -39,12 +39,14 @@
-
- {{ form_label('password', Lang.get('general.password')) }} -
- {{ form_password('password') }} +{% if password %} +
+ {{ form_label('password', Lang.get('general.password')) }} +
+ {{ form_password('password') }} +
-
+{% endif %}
{{ form_submit(Lang.get('user.verify_and_enable'), {'class': 'twofa-verify'}) }} diff --git a/user/organisation.twig b/user/organisation.twig index 00a712b..a30a643 100644 --- a/user/organisation.twig +++ b/user/organisation.twig @@ -28,7 +28,6 @@ - diff --git a/user/organisation_invite_step1.twig b/user/organisation_invite_step1.twig index 24db2bd..57a75a6 100644 --- a/user/organisation_invite_step1.twig +++ b/user/organisation_invite_step1.twig @@ -36,7 +36,6 @@ - diff --git a/user/organisation_invite_step2.twig b/user/organisation_invite_step2.twig index 789fd7f..aecb118 100644 --- a/user/organisation_invite_step2.twig +++ b/user/organisation_invite_step2.twig @@ -33,7 +33,6 @@ - diff --git a/user/organisation_users.twig b/user/organisation_users.twig index 052bbe3..e5ed161 100644 --- a/user/organisation_users.twig +++ b/user/organisation_users.twig @@ -79,7 +79,6 @@ - diff --git a/user/profile.twig b/user/profile.twig index 45f061d..7110e48 100644 --- a/user/profile.twig +++ b/user/profile.twig @@ -60,7 +60,6 @@ - diff --git a/user/register.twig b/user/register.twig index f99374e..184df1e 100644 --- a/user/register.twig +++ b/user/register.twig @@ -70,7 +70,6 @@ - diff --git a/user/reset_complete.twig b/user/reset_complete.twig deleted file mode 100644 index 5549471..0000000 --- a/user/reset_complete.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% extends parent_template %} - -{% block title %}{{ Lang.get('user.reset_password') }}{% endblock %} - -{% block breadcrumb %} - {{ parent() }} - {{ Lang.get('user.reset_password') }} -{% endblock %} - -{% block content %} - - {% if reset_success|default is not empty and reset_success %} -
- {{ Lang.get('user.password_reset_success') }} - {% if not auth_check() %} - {{ Lang.get('user.continue_to_login', {'route': route('user.login')})|raw }} - {% endif %} -
- {% endif %} - -{% endblock %} \ No newline at end of file diff --git a/user/set_password.twig b/user/set_password.twig index afa5d76..ab6f3fd 100644 --- a/user/set_password.twig +++ b/user/set_password.twig @@ -3,44 +3,44 @@ {% block title %}{{ Lang.get('user.set_password') }}{% endblock %} {% block breadcrumb %} - {{ parent() }} - {{ Lang.get('user.set_password') }} + {{ parent() }} + {{ Lang.get('user.set_password') }} {% endblock %} {% block content %} - {{ Lang.get('user.verified_set_password_desc') }} -

+ {{ Lang.get('user.verified_set_password_desc') }} +

- {{ form_open({'route': 'user.setpassword', 'method': 'post', 'class': 'validate'}) }} + {{ form_open({'route': 'user.setpassword', 'method': 'post', 'class': 'validate'}) }} - {{ form_hidden('email', Request.input('email')) }} - {{ form_hidden('token', Request.input('token')) }} + {{ form_hidden('email', Request.input('email')) }} + {{ form_hidden('token', Request.input('token')) }} -
- {{ form_label('password', Lang.get('general.password')) }} -
- {{ form_password('password', {'autocomplete': 'new-password'}) }} -
-
+
+ {{ form_label('password', Lang.get('general.password')) }} +
+ {{ form_password('password', {'autocomplete': 'new-password'}) }} +
+
-
- {{ form_label('password_confirmation', Lang.get('user.confirm_password')) }} -
- {{ form_password('password_confirmation', {'autocomplete': 'new-password'}) }} -
-
+
+ {{ form_label('password_confirmation', Lang.get('user.confirm_password')) }} +
+ {{ form_password('password_confirmation', {'autocomplete': 'new-password'}) }} +
+
-
- {{ form_submit(Lang.get('general.save')) }} -
+
+ {{ form_submit(Lang.get('general.save')) }} +
- {{ form_close() }} + {{ form_close() }} {% endblock %} {% block scripts_footer %} - {% if jsValidator|default is not empty %} - {{ jsValidator|raw }} - {% endif %} -{% endblock %} \ No newline at end of file + {% if jsValidator|default is not empty %} + {{ jsValidator|raw }} + {% endif %} +{% endblock %} diff --git a/user/social_login_options.twig b/user/social_login_options.twig index 00be4fc..1b274f0 100644 --- a/user/social_login_options.twig +++ b/user/social_login_options.twig @@ -3,7 +3,7 @@ diff --git a/user/verify.twig b/user/verify.twig index 21d0c44..bea8517 100644 --- a/user/verify.twig +++ b/user/verify.twig @@ -21,10 +21,13 @@
{{ Lang.get('messages.error') }}
{{ error }} - {% if resend %} - {{ Lang.get('user.resend_verification_email') }} - {% endif %}
+ + {% if resend %} +
+ {{ Lang.get('user.resend_verification_email') }} +
+ {% endif %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %}