From 11e83a42378824ecdd48378fb93108e8b2d99ece Mon Sep 17 00:00:00 2001
From: Olimpia Magliulo <olimpiam@intern-ikts-MacBook-Air.local>
Date: Thu, 14 Dec 2017 16:12:08 +0100
Subject: [PATCH] Ignore autofocus in loginuserpass as suggested in
documentation
+ fix typos and indentation
---
modules/core/templates/loginuserpass.twig | 22 ++++++++--------------
templates/_header.twig | 8 ++++----
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index b8e948195..b12f077ad 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -1,15 +1,9 @@
{% set pagetitle = 'Enter your username and password'|trans %}
-{% if username|length > 0 %}
- {% set autofocus = 'password' %}
-{% else %}
- {% set autofocus = 'username' %}
-{% endif %}
{% extends "@core/base.twig" %}
{% block content %}
-
- {% if errorcode %}
+ {% if errorcode -%}
<div class="pure-g">
<div class="pure-u-1">
<div class="message-box error">
@@ -27,7 +21,7 @@
</div>
</div>
</div>
- {% endif %}
+ {%- endif %}
<h1>{{ 'Enter your username and password'|trans }}</h1>
@@ -44,8 +38,8 @@
<div class="pure-control-group">
<label for="username">{{ 'Username'|trans }}</label>
- <input id="username" {{ forceUsername ? 'disabled="disabled"' }} type="text" name="username" class="edge"{% spaceless %}
- {%- if not forceUsername %} tabindex="1" value="{{ username }}"{% endif %}{% endspaceless %}>
+ <input id="username" {{ forceUsername ? 'disabled="disabled"' }} type="text" name="username" class="edge"
+ {%- if not forceUsername %} tabindex="1" value="{{ username }}"{% endif %}>
{% if rememberUsernameEnabled and not forceUsername -%}
</div>
<div class="pure-controls pure-form-message">
@@ -54,7 +48,7 @@
{{ rememberUsernameChecked ? 'checked="checked"' }} name="remember_username" value="Yes"/>
<small>{{ 'Remember my username'|trans }}</small>
</label>
- {% endif -%}
+ {%- endif %}
</div>
<div class="pure-control-group">
@@ -69,7 +63,7 @@
{{ rememberMeChecked ? 'checked="checked"' }} name="remember_me" value="Yes"/>
<small>{{ 'Remember me'|trans }}</small>
</label>
- {% endif -%}
+ {%- endif %}
</div>
{% if organizations is defined -%}
<div class="pure-control-group">
@@ -102,10 +96,10 @@
<input type="hidden" name="{{ name }}" value="{{ value }}" />
{%- endfor %}
</form>
- </div><!--center inline-->
+ </div><!--center-->
{% if links -%}
<ul>
- {% for link in links %}
+ {% for link in links -%}
<li><a href="{{ link.href }}">{{ link['text']|trans }}</a></li>
{% endfor %}
</ul>
diff --git a/templates/_header.twig b/templates/_header.twig
index 0a5fc7e5e..69711aeb2 100644
--- a/templates/_header.twig
+++ b/templates/_header.twig
@@ -26,11 +26,11 @@
{% else -%}
{% if lang.url -%}
<li class="pure-menu-item"><a href="{{ lang.url }}{%- spaceless %}
- {% if queryParams %}&{% endif %}
- {% for name, value in queryParams %}
+ {% if queryParams -%}&{% endif -%}
+ {% for name, value in queryParams -%}
{%- if not loop.first %}&{% endif -%}
- {% if value %}{{ name }}={{ value }}{% else %}{{ name }}{% endif %}
- {% endfor %}"{% endspaceless %} class="pure-menu-link">{{ lang.name }}</a></li>
+ {%- if value %}{{ name }}={{ value }}{% else %}{{ name }}{%- endif %}
+ {%- endfor %}"{% endspaceless %} class="pure-menu-link">{{ lang.name }}</a></li>
{% endif -%}
{% endif -%}
{% endfor -%}
--
GitLab