diff options
Diffstat (limited to 'resources/views/pages')
-rw-r--r-- | resources/views/pages/credits.twig | 24 | ||||
-rw-r--r-- | resources/views/pages/login.twig | 11 | ||||
-rw-r--r-- | resources/views/pages/password/reset-form.twig | 18 | ||||
-rw-r--r-- | resources/views/pages/password/reset-success.twig | 12 | ||||
-rw-r--r-- | resources/views/pages/password/reset.twig | 32 | ||||
-rw-r--r-- | resources/views/pages/user-shifts.html | 8 |
6 files changed, 85 insertions, 20 deletions
diff --git a/resources/views/pages/credits.twig b/resources/views/pages/credits.twig index 3bb04895..8bd1f694 100644 --- a/resources/views/pages/credits.twig +++ b/resources/views/pages/credits.twig @@ -4,28 +4,28 @@ {% block content %} <div class="container"> - <h1>Credits</h1> + <h1>{{ __('Credits') }}</h1> <div class="row"> {% for title, credit in credits %} <div class="col-md-4"> - <h2>{{ title }}</h2> - {{ credit|markdown }} + <h2>{{ __(title) }}</h2> + {{ __(credit)|markdown }} </div> {% endfor %} <div class="col-md-4"> - <h2>Source code</h2> - <p>Version: <i>{{ version }}</i></p> + <h2>{{ __('Source code') }}</h2> + <p>{{ __('Version: _%s_', [version])|markdown }}</i></p> <p> - The original engelsystem was written by - <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>. - It was then completely rewritten and enhanced by - <a href="https://notrademark.de">msquare</a> (maintainer) and - <a href="https://myigel.name">MyIgel</a>. + {{ __('The original engelsystem was written by +[cookie](https://github.com/cookieBerlin/engelsystem). +It was then completely rewritten and enhanced by [msquare](https://notrademark.de) (maintainer) and +[MyIgel](https://myigel.name).')|markdown }} </p> <p> - Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors"> - contributor list on GitHub</a> for a complete list. + {{ __('Please have a look at the +[contributors list on GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors) +for a complete list.')|markdown }} </p> </div> </div> diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig index da6f4fdf..34dbd63f 100644 --- a/resources/views/pages/login.twig +++ b/resources/views/pages/login.twig @@ -32,6 +32,7 @@ <div class="col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4"> <div class="panel panel-primary first"> <div class="panel-body"> + {{ msg() }} {% for message in errors|default([]) %} {{ m.alert(__(message), 'danger') }} {% endfor %} @@ -50,7 +51,7 @@ <div class="input-group"> <span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span> <input class="form-control input-lg" id="form_password" - type="password" name="password" value="" placeholder="{{ __('Password') }}"> + type="password" name="password" value="" placeholder="{{ __('Password') }}"> </div> </div> @@ -61,7 +62,7 @@ </div> <div class="text-center"> - <a href="{{ url('user-password-recovery') }}" class=""> + <a href="{{ url('/password/reset') }}" class=""> {{ __('I forgot my password') }} </a> </div> @@ -93,8 +94,10 @@ </a> </div> </div> - </div> - {{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }} + <div class="col-md-12 text-center"> + {{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }} + </div> + </div> </div> {% endblock %} diff --git a/resources/views/pages/password/reset-form.twig b/resources/views/pages/password/reset-form.twig new file mode 100644 index 00000000..60eb2499 --- /dev/null +++ b/resources/views/pages/password/reset-form.twig @@ -0,0 +1,18 @@ +{% extends "pages/password/reset.twig" %} +{% import 'macros/base.twig' as m %} +{% import 'macros/form.twig' as f %} + +{% block row_content %} + <div class="col-md-8"> + <form action="" enctype="multipart/form-data" method="post"> + {{ csrf() }} + + {{ f.input('password', __('Password'), 'password', true) }} + {{ f.input('password_confirmation', __('Confirm password'), 'password', true) }} + + <div class="form-group"> + {{ f.submit(__('Save')) }} + </div> + </form> + </div> +{% endblock %} diff --git a/resources/views/pages/password/reset-success.twig b/resources/views/pages/password/reset-success.twig new file mode 100644 index 00000000..19b8a93e --- /dev/null +++ b/resources/views/pages/password/reset-success.twig @@ -0,0 +1,12 @@ +{% extends "pages/password/reset.twig" %} +{% import 'macros/base.twig' as m %} + +{% block row_content %} + <div class="col-md-12"> + {% if type == 'email' %} + {{ m.alert(__('We sent you an email containing your password recovery link.'), 'info') }} + {% elseif type == 'reset' %} + {{ m.alert(__('Password saved.'), 'success') }} + {% endif %} + </div> +{% endblock %} diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig new file mode 100644 index 00000000..289152ea --- /dev/null +++ b/resources/views/pages/password/reset.twig @@ -0,0 +1,32 @@ +{% extends 'layouts/app.twig' %} +{% import 'macros/base.twig' as m %} +{% import 'macros/form.twig' as f %} + +{% block title %}{{ __('Password recovery') }}{% endblock %} + +{% block content %} + <div class="container"> + <h1>{{ __('Password recovery') }}</h1> + + {% for message in errors|default([]) %} + {{ m.alert(__(message), 'danger') }} + {% endfor %} + + <div class="row"> + {% block row_content %} + <div class="col-md-8"> + <form action="" enctype="multipart/form-data" method="post"> + {{ csrf() }} + + {{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }} + {{ f.input('email', __('E-Mail'), 'email', true) }} + + <div class="form-group"> + {{ f.submit(__('Recover')) }} + </div> + </form> + </div> + {% endblock %} + </div> + </div> +{% endblock %} diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html index 9ac501da..d5a98f80 100644 --- a/resources/views/pages/user-shifts.html +++ b/resources/views/pages/user-shifts.html @@ -55,12 +55,12 @@ <div class="col-md-6"> <button class="btn btn-info btn-sm hidden-print" style="margin-top: 20px; margin-bottom:10px" type="button" data-toggle="collapse" - data-target="#collapseRoomSelect" aria-expanded="false" - aria-controls="collapseRoomSelect" + data-target="#collapseShiftsFilterSelect" aria-expanded="true" + aria-controls="collapseShiftsFilterSelect" > collapse/show filters </button> - <div class="collapse in" id="collapseRoomSelect"> + <div class="collapse in" id="collapseShiftsFilterSelect"> <div class="row"> <div class="col-xs-4 col-xxs-12">%room_select%</div> <div class="col-xs-4 col-xxs-12">%type_select%</div> @@ -79,5 +79,5 @@ %shifts_table% <div class="hidden-print"> -%ical_text% + %ical_text% </div>
\ No newline at end of file |