diff --git a/modules/core/templates/_frontpage_menu.twig b/modules/core/templates/_frontpage_menu.twig index 7b363ffaf4a9178c234fb6e87bff8476e8a101d2..d19592356b007af61567b4ac8840f6efb5b7534f 100644 --- a/modules/core/templates/_frontpage_menu.twig +++ b/modules/core/templates/_frontpage_menu.twig @@ -1,25 +1,29 @@ <div class="pure-g frontpage-menu"> - <div class="pure-u-2-3"> - <div class="pure-menu pure-menu-horizontal"> - <ul class="pure-menu-list"> - <li class="pure-menu-item {% if frontpage_section == "welcome" %} pure-menu-selected{% endif %}"> - <a href="frontpage_welcome.php" class="pure-menu-link">Welcome</a></li> - <li class="pure-menu-item {% if frontpage_section == "config" %} pure-menu-selected{% endif %}"> - <a href="frontpage_config.php" class="pure-menu-link">Configuration</a></li> - <li class="pure-menu-item {% if frontpage_section == "auth" %} pure-menu-selected{% endif %}"> - <a href="frontpage_auth.php" class="pure-menu-link">Authentication</a></li> - <li class="pure-menu-item {% if frontpage_section == "federation" %} pure-menu-selected{% endif %}"> - <a href="frontpage_federation.php" class="pure-menu-link">Federation</a></li> - </ul> + <div class="pure-u-2-3"> + <div class="pure-menu pure-menu-horizontal"> + <ul class="pure-menu-list"> + <li class="pure-menu-item{% if frontpage_section == "welcome" %} pure-menu-selected{% endif %}"> + <a href="frontpage_welcome.php" class="pure-menu-link">Welcome</a> + </li> + <li class="pure-menu-item{% if frontpage_section == "config" %} pure-menu-selected{% endif %}"> + <a href="frontpage_config.php" class="pure-menu-link">Configuration</a> + </li> + <li class="pure-menu-item{% if frontpage_section == "auth" %} pure-menu-selected{% endif %}"> + <a href="frontpage_auth.php" class="pure-menu-link">Authentication</a> + </li> + <li class="pure-menu-item{% if frontpage_section == "federation" %} pure-menu-selected{% endif %}"> + <a href="frontpage_federation.php" class="pure-menu-link">Federation</a> + </li> + </ul> + </div> </div> - </div> - <div class="pure-u-1-3"> + <div class="pure-u-1-3"> {% if isadmin %} - <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p> + <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p> {% else %} - <p class="float-r youareadmin"> - <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a> - </p> + <p class="float-r youareadmin"> + <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a> + </p> {% endif %} - </div> + </div> </div> diff --git a/modules/core/templates/authsource_list.twig b/modules/core/templates/authsource_list.twig index acf0d57fa51de28382b6bd9c6760723772cf1121..c966180b7fb54b8ef8b304f65034ba1f7dfd1457 100644 --- a/modules/core/templates/authsource_list.twig +++ b/modules/core/templates/authsource_list.twig @@ -5,7 +5,7 @@ <h1>{{ header }}</h1> <ul> {% for key, name in sources %} - <li><a href="?as={{ name|escape('url') }}">{{ name|escape('html') }}</a></li> + <li><a href="?as={{ name|escape('url') }}">{{ name|escape('html') }}</a></li> {% endfor %} </ul> {% endblock %} diff --git a/modules/core/templates/base.twig b/modules/core/templates/base.twig index 47a732abda4e6ae049b5111bf0bd442861dc78f3..96fcc07baeb873b82c4f94a4e6a17a002a40b500 100644 --- a/modules/core/templates/base.twig +++ b/modules/core/templates/base.twig @@ -2,23 +2,24 @@ {% block contentwrapper %} {% if tabname %} <div id="portalmenu" class="ui-tabs ui-widget ui-widget-content ui-corner-all"> -<ul class="tabset_tabs ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> -{% for name, link in links %} -{% if name == pageid %} -<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"> -<a href="#">{{ link.text|trans }}</a> -</li> -{% else %} -<li class="ui-state-default ui-corner-top"> -<a href="{{ link.href }}">{{ link.text|trans }}</a> -</li> -{% endif %} -{% endfor %} -</ul> -<div id="portalcontent" class="ui-tabs-panel ui-widget-content ui-corner-bottom"> + <ul class="tabset_tabs ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> + {% for name, link in links %} + {% if name == pageid %} + <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"> + <a href="#">{{ link.text|trans }}</a> + </li> + {% else %} + <li class="ui-state-default ui-corner-top"> + <a href="{{ link.href }}">{{ link.text|trans }}</a> + </li> + {% endif %} + {% endfor %} + </ul> + <div id="portalcontent" class="ui-tabs-panel ui-widget-content ui-corner-bottom"> {% endif %} {{ block('content') }} {% if tabname %} -</div></div> + </div> +</div> {% endif %} {% endblock %} diff --git a/modules/core/templates/login.twig b/modules/core/templates/login.twig index adf3f8426029a838847c170c28d8c70946067a9d..e1b342cc0a9ba9e71324930c7ff732f2e69f860e 100644 --- a/modules/core/templates/login.twig +++ b/modules/core/templates/login.twig @@ -2,7 +2,7 @@ {% extends "@core/base.twig" %} {% block content %} -<h1>{{ pagetitle|trans }}</h1> + <h1>{{ pagetitle|trans }}</h1> <p>Please choose one of the following authentication methods: </p> {% if sources is empty -%} @@ -17,4 +17,4 @@ </ul> </div> {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig index 49fe67bf6fa4f3b6367897bcc73898f3be7c92c8..4ec8bb8352fa410bce6d8528b46db776cd649785 100644 --- a/modules/core/templates/loginuserpass.twig +++ b/modules/core/templates/loginuserpass.twig @@ -3,7 +3,7 @@ {% extends "@core/base.twig" %} {% block postload %} -<script src="{{baseurlpath}}assets/js/loginuserpass.js"></script> + <script src="{{baseurlpath}}assets/js/loginuserpass.js"></script> {% endblock %} {% block content %} diff --git a/modules/core/templates/short_sso_interval.twig b/modules/core/templates/short_sso_interval.twig index c8b08934afa46a725efbc3d51d82373e51484352..542e174c0a9315e54c873bafe4895e17dd5473f6 100644 --- a/modules/core/templates/short_sso_interval.twig +++ b/modules/core/templates/short_sso_interval.twig @@ -5,12 +5,12 @@ <h1>{{ header }}</h1> <form style="display: inline; margin: 0px; padding: 0px" action="{{ target|escape('html') }}"> {% for name, value in params %} - <input type="hidden" name="{{ name|escape('html') }}" value="{{ value|escape('html') }}" /> + <input type="hidden" name="{{ name|escape('html') }}" value="{{ value|escape('html') }}"> {% endfor %} <p>{{ '{core:short_sso_interval:warning}'|trans }}</p> <div class="trackidtext"> <p>{{ '{errors:report_trackid}'|trans }}<span class="trackid">{{ trackId }}</span></p> </div> - <input type="submit" name="continue" id="contbutton" value="'{core:short_sso_interval:retry}'|trans|escape('html') }}" autofocus /> + <input type="submit" name="continue" id="contbutton" value="'{core:short_sso_interval:retry}'|trans|escape('html') }}" autofocus> </form> {% endblock %}