diff --git a/src/Gist/Resources/views/Login/login.html.twig b/src/Gist/Resources/views/Login/login.html.twig index f551214..f313bdd 100644 --- a/src/Gist/Resources/views/Login/login.html.twig +++ b/src/Gist/Resources/views/Login/login.html.twig @@ -24,19 +24,19 @@

{{ form_errors(form._username) }} {{ form_widget(form._username) }} -

- +

+

{{ form_errors(form._password) }} {{ form_widget(form._password) }} -

- +

+

{{ form_errors(form._remember_me) }} {{ form_widget(form._remember_me) }} {{ form_label(form._remember_me) }} -

- +

+

diff --git a/src/Gist/Resources/views/Login/register.html.twig b/src/Gist/Resources/views/Login/register.html.twig index 0650bff..051b398 100644 --- a/src/Gist/Resources/views/Login/register.html.twig +++ b/src/Gist/Resources/views/Login/register.html.twig @@ -1,52 +1,52 @@ {% extends 'base.html.twig' %} {% block title %} - {{ 'login.register.title'|trans }} + {{ 'login.register.title'|trans }} {% endblock %} {% block body %}
- {% if error %} -
-
- {{ error }} -
-
- {% endif %} - - {% if success %} -
-
- {{ success }} -
-
- {% else %} -
-
-
-
- {{ 'login.register.title'|trans }} -
-
-

- {{ form_errors(form.username) }} - {{ form_widget(form.username) }} -

- -

- {{ form_errors(form.password) }} - {{ form_widget(form.password) }} -

- -

- -

+ {% if error %} +
+
+ {{ error }} +
+
+ {% endif %} - {{ form_rest(form) }} -
-
-
-
- {% endif %} + {% if success %} +
+
+ {{ success }} +
+
+ {% else %} +
+
+
+
+ {{ 'login.register.title'|trans }} +
+
+

+ {{ form_errors(form.username) }} + {{ form_widget(form.username) }} +

+ +

+ {{ form_errors(form.password) }} + {{ form_widget(form.password) }} +

+ +

+ +

+ + {{ form_rest(form) }} +
+
+
+
+ {% endif %}
{% endblock %} diff --git a/src/Gist/Resources/views/My/my.html.twig b/src/Gist/Resources/views/My/my.html.twig index fdd2933..2e65a3b 100644 --- a/src/Gist/Resources/views/My/my.html.twig +++ b/src/Gist/Resources/views/My/my.html.twig @@ -29,14 +29,14 @@
- {{ 'my.title'|trans }} + {{ 'my.title'|trans }}
{{ 'gist.action.add'|trans }}
-
+
@@ -109,9 +109,9 @@
- {% if gists.nbResults == 0 %} - {{ 'my.nothing'|trans }} - {% else %} + {% if gists.nbResults == 0 %} + {{ 'my.nothing'|trans }} + {% else %} {% set pager %} {% if gists.haveToPaginate %} {% set params = app.request.attributes.get('_route_params')|merge({filter: app.request.query.get('filter', [])}) %} @@ -170,45 +170,45 @@ {{ pager }} - {% for gist in gists %} -
-

- {{ gist.title ? gist.title : 'gist.untitled'|trans }}, - {{ gist.createdAt|date('date.format'|trans) }} -

+ {% for gist in gists %} +
+

+ {{ gist.title ? gist.title : 'gist.untitled'|trans }}, + {{ gist.createdAt|date('date.format'|trans) }} +

-

- +

+ - {% if not gist.cipher %} - - {{ 'gist.action.view'|trans }} - - {% else %} - - {% endif %} + {% if not gist.cipher %} + + {{ 'gist.action.view'|trans }} + + {% else %} + + {% endif %} -

-
- {% endfor %} +

+
+ {% endfor %} {{ pager }} - {% endif %} -
-
-
+ {% endif %} + + +
- {{ 'login.login.form.password.placeholder'|trans }} -
+ {{ 'login.login.form.password.placeholder'|trans }} +
@@ -230,6 +230,6 @@
- - + + {% endblock %} diff --git a/src/Gist/Resources/views/base.html.twig b/src/Gist/Resources/views/base.html.twig index ca0418b..8ffe273 100644 --- a/src/Gist/Resources/views/base.html.twig +++ b/src/Gist/Resources/views/base.html.twig @@ -37,32 +37,32 @@ - {% if user %} -
  • - - {{ 'app.menu.my.my.title'|trans }} - -
    • -
  • - - {{ 'app.menu.my.logout.title'|trans }} - -
    • - {% elseif app.enable_login %} -
  • - - {{ 'app.menu.my.login.title'|trans }} - -
    • + {% if user %} +
  • + + {{ 'app.menu.my.my.title'|trans }} + +
    • +
  • + + {{ 'app.menu.my.logout.title'|trans }} + +
    • + {% elseif app.enable_login %} +
  • + + {{ 'app.menu.my.login.title'|trans }} + +
    • - {% if app.enable_registration %} -
  • - - {{ 'app.menu.my.register.title'|trans }} - -
    • - {% endif %} - {% endif %} + {% if app.enable_registration %} +
  • + + {{ 'app.menu.my.register.title'|trans }} + +
    • + {% endif %} + {% endif %}
  • {{ 'app.menu.about.title'|trans }}