From 10ae616b1c24098ae94feb55ebf71a6199bd8b14 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Wed, 1 Apr 2020 15:05:05 +0100 Subject: [PATCH] Version 3.0.0-beta.2 --- core/dashboard.twig | 136 ++++++++++++++++ core/maintenance.twig | 21 +++ core/search.twig | 23 +++ errors/401.twig | 18 +++ errors/403.twig | 18 +++ errors/404.twig | 18 +++ errors/405.twig | 18 +++ footer_common.twig | 23 +++ forms/custom_fields.twig | 137 ++++++++++++++++ head_common.twig | 18 +++ header.twig | 0 index.twig | 222 ++++++++++++++++++++++++++ navigation.twig | 87 ++++++++++ selfservice/article.twig | 189 ++++++++++++++++++++++ selfservice/article_attachments.twig | 33 ++++ selfservice/article_details.twig | 29 ++++ selfservice/article_list.twig | 40 +++++ selfservice/article_related.twig | 20 +++ selfservice/category.twig | 32 ++++ selfservice/category_list.twig | 25 +++ selfservice/comment.twig | 83 ++++++++++ selfservice/feedback.twig | 9 ++ selfservice/forms/comment.twig | 53 ++++++ selfservice/hierarchical.twig | 39 +++++ selfservice/list.twig | 20 +++ selfservice/sidebar.twig | 40 +++++ selfservice/tag.twig | 23 +++ sidebar.twig | 0 ticket/entire_message.twig | 61 +++++++ ticket/feedback.twig | 53 ++++++ ticket/forms/message.twig | 93 +++++++++++ ticket/forms/submit_ticket_step1.twig | 66 ++++++++ ticket/forms/submit_ticket_step2.twig | 28 ++++ ticket/forms/submit_ticket_step3.twig | 216 +++++++++++++++++++++++++ ticket/message.twig | 92 +++++++++++ ticket/ticket.twig | 165 +++++++++++++++++++ ticket/ticket_custom_fields.twig | 11 ++ ticket/ticket_details.twig | 42 +++++ ticket/ticket_grid.twig | 103 ++++++++++++ ticket/ticket_messages.twig | 7 + ticket/track.twig | 34 ++++ user/change_password.twig | 55 +++++++ user/confirm.twig | 27 ++++ user/email.twig | 112 +++++++++++++ user/email_history.twig | 17 ++ user/forms/organisation.twig | 44 +++++ user/forms/organisation_profile.twig | 35 ++++ user/forms/twofa.twig | 40 +++++ user/forms/user_profile.twig | 112 +++++++++++++ user/linked_account.twig | 39 +++++ user/login.twig | 105 ++++++++++++ user/login_twofa.twig | 40 +++++ user/login_twofa_setup.twig | 32 ++++ user/organisation.twig | 171 ++++++++++++++++++++ user/organisation_add.twig | 50 ++++++ user/password_reset.twig | 39 +++++ user/profile.twig | 84 ++++++++++ user/register.twig | 101 ++++++++++++ user/reset_complete.twig | 21 +++ user/reset_confirm.twig | 67 ++++++++ user/set_password.twig | 53 ++++++ user/twofa.twig | 56 +++++++ 62 files changed, 3645 insertions(+) create mode 100644 core/dashboard.twig create mode 100644 core/maintenance.twig create mode 100644 core/search.twig create mode 100644 errors/401.twig create mode 100644 errors/403.twig create mode 100644 errors/404.twig create mode 100644 errors/405.twig create mode 100644 footer_common.twig create mode 100644 forms/custom_fields.twig create mode 100644 head_common.twig create mode 100644 header.twig create mode 100644 index.twig create mode 100644 navigation.twig create mode 100644 selfservice/article.twig create mode 100644 selfservice/article_attachments.twig create mode 100644 selfservice/article_details.twig create mode 100644 selfservice/article_list.twig create mode 100644 selfservice/article_related.twig create mode 100644 selfservice/category.twig create mode 100644 selfservice/category_list.twig create mode 100644 selfservice/comment.twig create mode 100644 selfservice/feedback.twig create mode 100644 selfservice/forms/comment.twig create mode 100644 selfservice/hierarchical.twig create mode 100644 selfservice/list.twig create mode 100644 selfservice/sidebar.twig create mode 100644 selfservice/tag.twig create mode 100644 sidebar.twig create mode 100644 ticket/entire_message.twig create mode 100644 ticket/feedback.twig create mode 100644 ticket/forms/message.twig create mode 100644 ticket/forms/submit_ticket_step1.twig create mode 100644 ticket/forms/submit_ticket_step2.twig create mode 100644 ticket/forms/submit_ticket_step3.twig create mode 100644 ticket/message.twig create mode 100644 ticket/ticket.twig create mode 100644 ticket/ticket_custom_fields.twig create mode 100644 ticket/ticket_details.twig create mode 100644 ticket/ticket_grid.twig create mode 100644 ticket/ticket_messages.twig create mode 100644 ticket/track.twig create mode 100644 user/change_password.twig create mode 100644 user/confirm.twig create mode 100644 user/email.twig create mode 100644 user/email_history.twig create mode 100644 user/forms/organisation.twig create mode 100644 user/forms/organisation_profile.twig create mode 100644 user/forms/twofa.twig create mode 100644 user/forms/user_profile.twig create mode 100644 user/linked_account.twig create mode 100644 user/login.twig create mode 100644 user/login_twofa.twig create mode 100644 user/login_twofa_setup.twig create mode 100644 user/organisation.twig create mode 100644 user/organisation_add.twig create mode 100644 user/password_reset.twig create mode 100644 user/profile.twig create mode 100644 user/register.twig create mode 100644 user/reset_complete.twig create mode 100644 user/reset_confirm.twig create mode 100644 user/set_password.twig create mode 100644 user/twofa.twig diff --git a/core/dashboard.twig b/core/dashboard.twig new file mode 100644 index 0000000..6af35f6 --- /dev/null +++ b/core/dashboard.twig @@ -0,0 +1,136 @@ +{% extends parent_template %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.get('general.home') }} +{% endblock %} + +{% block precontent %} + {% if isModuleEnabled('Selfservice') %} +
{{ Lang.get('core.submit_ticket_desc') }}
+{{ Lang.get('core.track_ticket_desc') }}
+{{ Lang.get('core.my_tickets_desc') }}
+{{ type.description }}
+{{ Lang.get('messages.not_authorised') }} {{ Lang.get('messages.please_report') }}
+ +{{ Lang.get('messages.return_to', {'page': '' ~ mb_strtolower(Lang.get('general.previous_page'), 'UTF-8') ~ ''})|raw }}
+ +{% endblock %} \ No newline at end of file diff --git a/errors/403.twig b/errors/403.twig new file mode 100644 index 0000000..88b29ae --- /dev/null +++ b/errors/403.twig @@ -0,0 +1,18 @@ +{% extends parent_template %} + +{% block title %} + 403 - {{ Lang.get('messages.forbidden') }} +{% endblock %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.get('messages.error') }} (403) +{% endblock %} + +{% block content %} + +{{ Lang.get('messages.forbidden') }}.
{{ Lang.get('messages.please_report') }}
{{ Lang.get('messages.return_to', {'page': '' ~ mb_strtolower(Lang.get('general.previous_page'), 'UTF-8') ~ ''})|raw }}
+ +{% endblock %} \ No newline at end of file diff --git a/errors/404.twig b/errors/404.twig new file mode 100644 index 0000000..5ee1887 --- /dev/null +++ b/errors/404.twig @@ -0,0 +1,18 @@ +{% extends parent_template %} + +{% block title %} + 404 - {{ Lang.get('messages.page_not_found') }} +{% endblock %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.get('messages.error') }} (404) +{% endblock %} + +{% block content %} + +{{ Lang.get('messages.cant_find_page') }} {{ Lang.get('messages.please_report') }}
+ +{{ Lang.get('messages.return_to', {'page': '' ~ mb_strtolower(Lang.get('general.support_portal'), 'UTF-8') ~ ''})|raw }}
+ +{% endblock %} \ No newline at end of file diff --git a/errors/405.twig b/errors/405.twig new file mode 100644 index 0000000..e697c27 --- /dev/null +++ b/errors/405.twig @@ -0,0 +1,18 @@ +{% extends parent_template %} + +{% block title %} + 405 - {{ Lang.get('messages.page_not_found') }} +{% endblock %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.get('messages.error') }} (405) +{% endblock %} + +{% block content %} + +{{ Lang.get('messages.cant_find_page') }} {{ Lang.get('messages.please_report') }}
+ +{{ Lang.get('messages.return_to', {'page': '' ~ mb_strtolower(Lang.get('general.support_portal'), 'UTF-8') ~ ''})|raw }}
+ +{% endblock %} \ No newline at end of file diff --git a/footer_common.twig b/footer_common.twig new file mode 100644 index 0000000..f00e97c --- /dev/null +++ b/footer_common.twig @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/forms/custom_fields.twig b/forms/custom_fields.twig new file mode 100644 index 0000000..a4da256 --- /dev/null +++ b/forms/custom_fields.twig @@ -0,0 +1,137 @@ +{% for customfield in customfields %} + {# If we don't wish to lock fields on new forms #} + {% if new is defined and new %} + {% set customfield = customfield|merge({'locked': 0}) %} + {% elseif ticket|default is not empty and ticket.locked == 1 %} + {% set customfield = customfield|merge({'locked': 1}) %} + {% endif %} + + {% set attributes = { 'data-depends-on': customfield.depends_on_option_id } %} +{{ Lang.get('selfservice.login_to_comment') }}
+ {% endif %} + + {% if article.comments is not empty %} +{{ article.excerpt }}
+ + + {% include 'frontend.' ~ template ~ '.selfservice.article_details' %} +{{ Lang.get('ticket.enter_user_details') }}
+ + {% set email = Request.old('email') %} + {% if email %} +{{ Lang.get('ticket.select_department_desc') }}
+ + {% for department in departments %} + +{{ department.description }}
+ {% endif %} + + {% else %} + {{ Lang.get('ticket.no_departments') }} + {% endfor %} + +{% endblock %} \ No newline at end of file diff --git a/ticket/forms/submit_ticket_step3.twig b/ticket/forms/submit_ticket_step3.twig new file mode 100644 index 0000000..39c0e6a --- /dev/null +++ b/ticket/forms/submit_ticket_step3.twig @@ -0,0 +1,216 @@ +{% extends parent_template %} + +{% block title %}{{ Lang.get('core.submit_ticket') }}{% endblock %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.get('core.submit_ticket') }} +{% endblock %} + +{% block precontent %} + +{% endblock %} + +{% block content %} + + {{ form_open({'route': 'ticket.frontend.ticket.storeStep3', 'class': 'validate'}) }} + + {% if not auth_check() %} + {{ form_hidden('email', guest_user.email) }} + + {% if guest_user.firstname is not empty %} + {{ form_hidden('firstname', guest_user.firstname) }} + {% endif %} + {% if guest_user.lastname is not empty %} + {{ form_hidden('lastname', guest_user.lastname) }} + {% endif %} + {% if guest_user.organisation is not empty %} + {{ form_hidden('organisation', guest_user.organisation) }} + {% endif %} + {% endif %} + +{{ Lang.get('ticket.feedback_desc') }}
+ + +{{ Lang.get('user.two_fa_required') }}
+ + {{ form_open({'route': 'user.login.twofa.setup', 'method': 'POST', 'class': 'validate'}) }} + + {{ form_hidden('email', email) }} + {{ form_hidden('twofa_token', twofa_token) }} + {{ form_hidden('twofa_secret', twofa_secret) }} + + {% include 'frontend.' ~ template ~ '.user.forms.twofa' %} + + {{ form_close() }} + +{% endblock %} + +{% block scripts_footer %} + {% if jsValidator|default is not empty %} + {{ jsValidator|raw }} + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/user/organisation.twig b/user/organisation.twig new file mode 100644 index 0000000..0545fbd --- /dev/null +++ b/user/organisation.twig @@ -0,0 +1,171 @@ +{% extends parent_template %} + +{% block title %}{{ Lang.choice('user.organisation', 1) }}: {{ auth_user().organisation.name }}{% endblock %} + +{% block breadcrumb %} + {{ parent() }} + {{ Lang.choice('user.organisation', 1) }} +{% endblock %} + +{% block precontent %} +{{ Lang.get('user.organisation_desc')|raw }}
+ + {{ form_model(record, {'route': 'user.organisation.updateUsers', 'method': 'POST'}) }} + +{{ Lang.get('general.name') }} | +{{ Lang.get('user.access_level')|raw }} | ++ |
---|---|---|
+ + {{ user.formattedname }} + {% if user.email %} + {{ '<' ~ user.email ~ '>' }} + {% endif %} + {% if record.isOwner(user.id) %} + {{ Lang.get('user.owner') }} + {% endif %} + {% if user.confirmed == 0 %} + {{ Lang.get('user.unconfirmed') }} + {% endif %} + | ++ {{ form_select('access_level[' ~ user.id ~ ']', { + 0: Lang.get('user.manager'), + 1: Lang.choice('user.user', 1) + }, + user.organisation_access_level, record.isOwner(user.id) or user.id == auth_user().id ? + {'class': 'access-level', 'disabled': 'disabled'} : {'class': 'access-level'}) }} + | ++ {% if not (auth_user().id == user.id or record.isOwner(user.id)) %} + + + + + {% endif %} + | +
{{ Lang.get('user.transfer_ownership_desc') }}
+ +