{{ 'app.name'|trans }}
{{ description }}
+ +{{ 'stepup.error.timestamp'|trans }} | +{{ timestamp }} | +
---|---|
{{ 'stepup.error.hostname'|trans }} | +{{ hostname }} | +
{{ 'stepup.error.request_id'|trans }} | +{{ request_id }} | +
{{ 'stepup.error.error_code'|trans }} | +{{ error_code }} | +
{{ 'stepup.error.user_agent'|trans }} | +{{ user_agent }} | +
{{ 'stepup.error.ip_address'|trans }} | +{{ ip_address }} | +
{{ 'stepup.error.support_page.text'|trans({'%support_url%': global_view_parameters.supportUrl })|raw }}
+ + {# For now the back button is not shown on the error page until a more intelligent solution is thought of #} + {% block back_button %}{% endblock %} + +{% endblock %} diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig new file mode 100644 index 00000000..185692a6 --- /dev/null +++ b/templates/bundles/TwigBundle/Exception/error404.html.twig @@ -0,0 +1,15 @@ +{% extends 'base.html.twig' %} + +{% block title %}{{ 'stepup.error.page_not_found.title'|trans }}{% endblock %} + +{% block content %} +{{ 'stepup.error.page_not_found.text'|trans }}
+ ++ +
{{ 'stepup.error.support_page.text'|trans({'%support_url%': global_view_parameters.supportUrl })|raw }}
+ + {# For now the back button is not shown on the error page until a more intelligent solution is thought of #} + {% block back_button %}{% endblock %} + +{% endblock %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/form/fields.html.twig b/templates/form/fields.html.twig similarity index 94% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/form/fields.html.twig rename to templates/form/fields.html.twig index fec7da93..6d018b78 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/form/fields.html.twig +++ b/templates/form/fields.html.twig @@ -7,7 +7,7 @@ {%- endblock form_group_class %} {% block anchor_widget %} - {% spaceless %} + {% apply spaceless %} {% if label is empty %} {% set label = name|humanize %} {% endif %} @@ -16,11 +16,11 @@ {% endif %} {{ label|trans({}, translation_domain) }} - {% endspaceless %} + {% endapply %} {% endblock anchor_widget %} {% block anchor_row %} - {% spaceless %} + {% apply spaceless %} {% if button_offset is defined and button_offset is not empty %} {% set attr = attr|merge({'for': id, 'class': button_offset }) %}-
{% include item with {name: 'first',
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/pagination/sliding_item.html.twig b/templates/pagination/sliding_item.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/pagination/sliding_item.html.twig
rename to templates/pagination/sliding_item.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/pagination/sortable_link.html.twig b/templates/pagination/sortable_link.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/pagination/sortable_link.html.twig
rename to templates/pagination/sortable_link.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/partial/language_switcher.html.twig b/templates/partial/language_switcher.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/partial/language_switcher.html.twig
rename to templates/partial/language_switcher.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/profile/profile.html.twig b/templates/profile/profile.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/profile/profile.html.twig
rename to templates/profile/profile.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/change.html.twig b/templates/ra_location/change.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/change.html.twig
rename to templates/ra_location/change.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/create.html.twig b/templates/ra_location/create.html.twig
similarity index 100%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/create.html.twig
rename to templates/ra_location/create.html.twig
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/manage.html.twig b/templates/ra_location/manage.html.twig
similarity index 97%
rename from src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/manage.html.twig
rename to templates/ra_location/manage.html.twig
index b700ff84..c5e0ad50 100644
--- a/src/Surfnet/StepupRa/RaBundle/Resources/views/ra_location/manage.html.twig
+++ b/templates/ra_location/manage.html.twig
@@ -5,7 +5,7 @@
{% block content %}
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/ra_management/ra_candidate_overview.html.twig b/templates/ra_management/ra_candidate_overview.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/ra_management/ra_candidate_overview.html.twig rename to templates/ra_management/ra_candidate_overview.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/recovery_token/search.html.twig b/templates/recovery_token/search.html.twig similarity index 98% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/recovery_token/search.html.twig rename to templates/recovery_token/search.html.twig index 6c75aeb4..a7b99de6 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/recovery_token/search.html.twig +++ b/templates/recovery_token/search.html.twig @@ -8,7 +8,7 @@ {{ form(form) }} {% if recoveryTokens.elements|length > 0 %} -
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/saml/consume_assertion.html.twig b/templates/saml/consume_assertion.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/saml/consume_assertion.html.twig rename to templates/saml/consume_assertion.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/audit_log.html.twig b/templates/second_factor/audit_log.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/audit_log.html.twig rename to templates/second_factor/audit_log.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/search.html.twig b/templates/second_factor/search.html.twig similarity index 97% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/search.html.twig rename to templates/second_factor/search.html.twig index c72e62dd..ada7f560 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/search.html.twig +++ b/templates/second_factor/search.html.twig @@ -8,7 +8,7 @@ {{ form(form) }} {% if secondFactors.elements|length > 0 %} -
diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/security/session_expired.html.twig b/templates/security/session_expired.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/security/session_expired.html.twig rename to templates/security/session_expired.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/translations.html.twig b/templates/translations.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/translations.html.twig rename to templates/translations.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/gssf/initiate.html.twig b/templates/vetting/gssf/initiate.html.twig similarity index 62% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/gssf/initiate.html.twig rename to templates/vetting/gssf/initiate.html.twig index 3a7b23af..a4e1e10e 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/gssf/initiate.html.twig +++ b/templates/vetting/gssf/initiate.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} {% endblock %} {% block content %} @@ -22,6 +22,6 @@
- {% include 'SurfnetStepupRaRaBundle:vetting/partial:cancel_vetting_procedure.html.twig' with { 'procedureId': app.request.attributes.get('procedureId') } only %} + {% include 'vetting/partial/cancel_vetting_procedure.html.twig' with { 'procedureId': app.request.attributes.get('procedureId') } only %} {% endblock %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/partial/cancel_vetting_procedure.html.twig b/templates/vetting/partial/cancel_vetting_procedure.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/partial/cancel_vetting_procedure.html.twig rename to templates/vetting/partial/cancel_vetting_procedure.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/partial/progress_bar.html.twig b/templates/vetting/partial/progress_bar.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/partial/progress_bar.html.twig rename to templates/vetting/partial/progress_bar.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/second_factor_type_disabled.html.twig b/templates/vetting/second_factor_type_disabled.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/second_factor_type_disabled.html.twig rename to templates/vetting/second_factor_type_disabled.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/prove_possession.html.twig b/templates/vetting/sms/prove_possession.html.twig similarity index 92% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/prove_possession.html.twig rename to templates/vetting/sms/prove_possession.html.twig index 2efdfda7..5e67e299 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/prove_possession.html.twig +++ b/templates/vetting/sms/prove_possession.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 35, 'step': 2} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 35, 'step': 2} only %} {% endblock %} {% block content %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/send_challenge.html.twig b/templates/vetting/sms/send_challenge.html.twig similarity index 94% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/send_challenge.html.twig rename to templates/vetting/sms/send_challenge.html.twig index 1687bb0b..62fea23e 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/sms/send_challenge.html.twig +++ b/templates/vetting/sms/send_challenge.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} {% endblock %} {% block content %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/start_procedure.html.twig b/templates/vetting/start_procedure.html.twig similarity index 100% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/start_procedure.html.twig rename to templates/vetting/start_procedure.html.twig diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/verify_identity.html.twig b/templates/vetting/verify_identity.html.twig similarity index 94% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/verify_identity.html.twig rename to templates/vetting/verify_identity.html.twig index 1b3fb19d..ed36a617 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/verify_identity.html.twig +++ b/templates/vetting/verify_identity.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 60, 'step': 3} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 60, 'step': 3} only %} {% endblock %} {% block content %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/vetting_completed.html.twig b/templates/vetting/vetting_completed.html.twig similarity index 79% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/vetting_completed.html.twig rename to templates/vetting/vetting_completed.html.twig index 9e1e5671..654cda97 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/vetting_completed.html.twig +++ b/templates/vetting/vetting_completed.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 100, 'step': 4} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 100, 'step': 4} only %} {% endblock %} {% block content %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/yubikey/verify.html.twig b/templates/vetting/yubikey/verify.html.twig similarity index 70% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/yubikey/verify.html.twig rename to templates/vetting/yubikey/verify.html.twig index fd719664..b9b0831c 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting/yubikey/verify.html.twig +++ b/templates/vetting/yubikey/verify.html.twig @@ -5,7 +5,7 @@ {% block page_header %} {{ parent() }} - {% include 'SurfnetStepupRaRaBundle:vetting/partial:progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} + {% include 'vetting/partial/progress_bar.html.twig' with {'progress': 25, 'step': 2} only %} {% endblock %} {% block content %} @@ -28,6 +28,6 @@
- {% include 'SurfnetStepupRaRaBundle:vetting/partial:cancel_vetting_procedure.html.twig' with { 'procedureId': app.request.attributes.get('procedureId') } only %} + {% include 'vetting/partial/cancel_vetting_procedure.html.twig' with { 'procedureId': app.request.attributes.get('procedureId') } only %} {% endblock %} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting_type_hint/overview.html.twig b/templates/vetting_type_hint/overview.html.twig similarity index 83% rename from src/Surfnet/StepupRa/RaBundle/Resources/views/vetting_type_hint/overview.html.twig rename to templates/vetting_type_hint/overview.html.twig index ab519b71..ebf3b113 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/vetting_type_hint/overview.html.twig +++ b/templates/vetting_type_hint/overview.html.twig @@ -5,7 +5,7 @@ {% block content %}