diff options
Diffstat (limited to 'resources')
-rw-r--r-- | resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po | 19 | ||||
-rw-r--r-- | resources/lang/en_US.UTF-8/LC_MESSAGES/default.mo | bin | 0 -> 745 bytes | |||
-rw-r--r-- | resources/lang/en_US.UTF-8/LC_MESSAGES/default.po | 26 | ||||
-rw-r--r-- | resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.mo | bin | 0 -> 41129 bytes | |||
-rw-r--r-- | resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.po (renamed from resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po) | 14 | ||||
-rw-r--r-- | resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo | bin | 41256 -> 0 bytes | |||
-rw-r--r-- | resources/views/errors/405.twig | 5 | ||||
-rw-r--r-- | resources/views/macros/base.twig | 11 | ||||
-rw-r--r-- | resources/views/pages/login.twig | 104 |
9 files changed, 163 insertions, 16 deletions
diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po index d5a7b993..27ceb586 100644 --- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po @@ -541,7 +541,7 @@ msgstr "Du kannst Dich nicht selber löschen." #: includes/controller/users_controller.php:78 #: includes/pages/guest_login.php:410 -msgid "Your password is incorrect. Please try it again." +msgid "Your password is incorrect. Please try it again." msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal." #: includes/controller/users_controller.php:87 @@ -1530,18 +1530,21 @@ msgid "Entry required!" msgstr "Pflichtfeld!" #: includes/pages/guest_login.php:414 -msgid "Please enter a password." +msgid "auth.no-password" msgstr "Gib bitte ein Passwort ein." #: includes/pages/guest_login.php:418 -msgid "" -"No user was found with that Nickname. Please try again. If you are still " -"having problems, ask a Dispatcher." +msgid "auth.not-found" msgstr "" -"Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch " -"einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher." +"Es wurde kein Engel gefunden. Probiere es bitte noch einmal. Wenn das Problem " +"weiterhin besteht, melde dich im Himmel." #: includes/pages/guest_login.php:451 includes/view/User_view.php:130 +msgid "auth.no-nickname" +msgstr "Gib bitte einen Nick an." + +#: includes/pages/guest_login.php:481 +#: includes/view/User_view.php:122 msgid "I forgot my password" msgstr "Passwort vergessen" @@ -2357,7 +2360,7 @@ msgid "" "I have my own car with me and am willing to use it for the event (You'll get " "reimbursed for fuel)" msgstr "" -"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für das " +"Ich habe mein eigenes Auto dabei und möchte es zum Fahren für das " "Event verwenden (Du wirst für Spritkosten entschädigt)" #: includes/view/UserDriverLicenses_view.php:30 diff --git a/resources/lang/en_US.UTF-8/LC_MESSAGES/default.mo b/resources/lang/en_US.UTF-8/LC_MESSAGES/default.mo Binary files differnew file mode 100644 index 00000000..e95ae703 --- /dev/null +++ b/resources/lang/en_US.UTF-8/LC_MESSAGES/default.mo diff --git a/resources/lang/en_US.UTF-8/LC_MESSAGES/default.po b/resources/lang/en_US.UTF-8/LC_MESSAGES/default.po new file mode 100644 index 00000000..22566e52 --- /dev/null +++ b/resources/lang/en_US.UTF-8/LC_MESSAGES/default.po @@ -0,0 +1,26 @@ +msgid "" +msgstr "" +"Project-Id-Version: Engelsystem 2.0\n" +"POT-Creation-Date: 2017-12-29 19:01+0100\n" +"PO-Revision-Date: 2018-11-27 00:28+0100\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Language: en_US\n" +"X-Poedit-SearchPath-0: .\n" + +msgid "auth.no-nickname" +msgstr "Please enter a nickname." + +msgid "auth.no-password" +msgstr "Please enter a password." + +msgid "auth.not-found" +msgstr "No user was found. Please try again. If you are still having problems, ask Heaven." diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.mo Binary files differnew file mode 100644 index 00000000..8b864156 --- /dev/null +++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.mo diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.po index e7307e5d..b9bf420d 100644 --- a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po +++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-04-25 05:23+0200\n" -"PO-Revision-Date: 2018-10-05 15:35+0200\n" +"PO-Revision-Date: 2018-11-27 00:29+0100\n" "Last-Translator: samba <samba@autistici.org>\n" "Language-Team: \n" "Language: pt_BR\n" @@ -477,7 +477,7 @@ msgstr "Você não pode se deletar." #: includes/controller/users_controller.php:61 #: includes/pages/guest_login.php:315 -msgid "Your password is incorrect. Please try it again." +msgid "Your password is incorrect. Please try it again." msgstr "Sua senha está incorreta. Por favor, tente novamente." #: includes/controller/users_controller.php:71 @@ -1420,19 +1420,17 @@ msgid "Entry required!" msgstr "Campo necessário!" #: includes/pages/guest_login.php:319 -msgid "Please enter a password." +msgid "auth.no-password" msgstr "Por favor digite uma senha." #: includes/pages/guest_login.php:323 -msgid "" -"No user was found with that Nickname. Please try again. If you are still " -"having problems, ask a Dispatcher." +msgid "auth.not-found" msgstr "" -"Nenhum usuário com esse apelido foi encontrado. Por favor tente novamente. \n" +"Nenhum usuário foi encontrado. Por favor tente novamente. \n" "Se você continuar com problemas, pergunte a um Dispatcher." #: includes/pages/guest_login.php:327 -msgid "Please enter a nickname." +msgid "auth.no-nickname" msgstr "Por favor digite um apelido." #: includes/pages/guest_login.php:358 includes/view/User_view.php:101 diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo Binary files differdeleted file mode 100644 index 95251feb..00000000 --- a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo +++ /dev/null diff --git a/resources/views/errors/405.twig b/resources/views/errors/405.twig new file mode 100644 index 00000000..cbbb94ea --- /dev/null +++ b/resources/views/errors/405.twig @@ -0,0 +1,5 @@ +{% extends "errors/default.twig" %} + +{% block title %}{{ __("405: Method not allowed") }}{% endblock %} + +{% block content_headline_text %}{{ __("405: Method not allowed") }}{% endblock %} diff --git a/resources/views/macros/base.twig b/resources/views/macros/base.twig new file mode 100644 index 00000000..94287bd4 --- /dev/null +++ b/resources/views/macros/base.twig @@ -0,0 +1,11 @@ +{% macro angel() %} + <span class="icon-icon_angel"></span> +{% endmacro %} + +{% macro glyphicon(glyph) %} + <span class="glyphicon glyphicon-{{ glyph }}"></span> +{% endmacro %} + +{% macro alert(message, type) %} + <div class="alert alert-{{ type|default('info') }}">{{ message }}</div> +{% endmacro %} diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig new file mode 100644 index 00000000..75b98aa1 --- /dev/null +++ b/resources/views/pages/login.twig @@ -0,0 +1,104 @@ +{% extends "layouts/app.twig" %} +{% import 'macros/base.twig' as m %} + +{% block title %}{{ __('Login') }}{% endblock %} + +{% block content %} + <div class="col-md-12"> + <div class="row"> + <div class="col-sm-12 text-center"> + <h2>{{ __('Welcome to the %s!', [config('name') ~ m.angel() ~ (config('app_name')|upper) ])|raw }}</h2> + </div> + </div> + + <div class="row"> + {% for name,date in { + (__('Buildup starts')): config('buildup_start'), + (__('Event starts')): config('event_start'), + (__('Event ends')): config('event_end'), + (__('Teardown ends')): config('teardown_end') + } if date %} + {% if date > date() %} + <div class="col-sm-3 text-center hidden-xs"> + <h4>{{ name }}</h4> + <span class="moment-countdown text-big" data-timestamp="{{ date.getTimestamp }}">%c</span> + <small>{{ date.format(__('Y-m-d')) }}</small> + </div> + {% endif %} + {% endfor %} + </div> + + <div class="row"> + <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-heading">{{ m.angel }} {{ __('Login') }}</div> + + <div class="panel-body"> + {% for message in errors|default([]) %} + {{ m.alert(__(message), 'danger') }} + {% endfor %} + + <form action="" enctype="multipart/form-data" method="post"> + {{ csrf() }} + <div class="form-group"> + <input class="form-control" id="form_nick" + type="text" name="login" value="" placeholder="{{ __('Nick') }}"> + </div> + + <div class="form-group"> + <input class="form-control" id="form_password" + type="password" name="password" value="" placeholder="{{ __('Password') }}"> + </div> + + <div class="form-group"> + <div class="btn-group"> + <button class="btn btn-primary" type="submit" name="submit"> + {{ __('Login') }} + </button> + + {% if show_password_recovery|default(false) %} + <a href="{{ url('user-password-recovery') }}" class="btn btn-default "> + {{ __('I forgot my password') }} + </a> + {% endif %} + </div> + </div> + + </form> + </div> + + <div class="panel-footer"> + {{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }} + </div> + + </div> + </div> + </div> + + <div class="row"> + <div class="col-sm-6 text-center"> + <h2>{{ __('Register') }}</h2> + {% if has_permission_to('register') and config('registration_enabled') %} + <p>{{ __('Please sign up, if you want to help us!') }}</p> + <div class="form-group"> + <a href="{{ url('register') }}" class="btn btn-default">{{ __('Register') }} »</a> + </div> + {% else %} + {{ m.alert(__('Registration is disabled.'), 'danger') }} + {% endif %} + </div> + + <div class="col-sm-6 text-center"> + <h2>{{ __('What can I do?') }}</h2> + <p>{{ __('Please read about the jobs you can do to help us.') }}</p> + <div class="form-group"> + <a href="{{ url('angeltypes', {'action': 'about'}) }}" class="btn btn-default"> + {{ __('Teams/Job description') }} » + </a> + </div> + </div> + </div> + + </div> +{% endblock %} |