Skip to content
Snippets Groups Projects
Unverified Commit a938fcb3 authored by Jaime Pérez Crespo's avatar Jaime Pérez Crespo
Browse files

Give up on indenting the resulting HTML. 

It doesn't make much sense anyway. Makes the original templates harder to format, and browser developer tools can provide hierarchical indentation anyway. This allows us to save quite a few bytes per page, write cleaner templates, and forget about how it would look like in the resulting HTML.
parent 27102013
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
templates/_footer.twig
+ 10
− 12
View file @ a938fcb3
<div id="footer"> <div id="footer">
<div class="wrap"> <div class="wrap">
<div class="center copyrights"> <div class="center copyrights">&copy; 2007-{{ year }} <a href="https://simplesamlphp.org/">SimpleSAMLphp</a>
&copy; 2007-{{ year }} </div>
<a href="https://simplesamlphp.org/">SimpleSAMLphp</a> <div class="logo-footer-right show-for-large">
</div> <div class="logo-footer">
<div class="logo-footer-right show-for-large"> <img class="pure-img" src="/{{ baseurlpath }}resources/icons/ssplogo-fish-small.png" alt="Small fish logo">
<div class="logo-footer">
<img class="pure-img" src="/{{ baseurlpath }}resources/icons/ssplogo-fish-small.png" alt="Small fish logo">
</div>
</div>
</div>
</div> </div>
</div>
</div>
</div>
templates/_header.twig
+ 78
− 80
View file @ a938fcb3
<div id="header"> <div id="header">
<div class="wrap"> <div class="wrap">
<div class="left"> <div class="left">
<div class="v-center logo-header"> <div class="v-center logo-header">
<div id="logo"> <div id="logo">
{%- if header == 'SimpleSAMLphp' %} {% if header == 'SimpleSAMLphp' %}
<span class="simple">Simple</span>{# -#}
<span class="simple">Simple</span>{# -#} <span class="saml">SAML</span>{# -#}
<span class="saml">SAML</span>{# -#} <span class="simple">php</span>
<span class="simple">php</span> {% else %}
{%- else %} {{ header }}
{% endif %}
{{ header }} <img class="pure-img hidden" src="" alt="{% trans %}Logo{% endtrans %}">
{%- endif %} </div>
</div>
<img class="pure-img hidden" src="" alt="LOGO"> </div>
</div> {% if not hideLanguageBar %}
</div> <div class="right">
</div> <a href="" id="menuLink" class="menu-link hide-for-large">
{% if not hideLanguageBar -%} <span class="fa fa-globe fa-2x" aria-hidden="true"></span>
<div class="right"> </a>
<a href="" id="menuLink" class="menu-link hide-for-large"> </div>
<span class="fa fa-globe fa-2x" aria-hidden="true"></span> <div id="languagebar" class="hide-for-large">
</a> <div id="menu">
</div> <div class="pure-menu">
{% endif %} <ul class="pure-menu-list">
{% if not hideLanguageBar -%} {% for key, lang in languageBar %}
<div id="languagebar" class="hide-for-large"> {% if key == currentLanguage %}
<div id="menu"> <li><a class="pure-menu-heading" href="#">{{ lang.name }}</a><li>
<div class="pure-menu"> {% else %}
<ul class="pure-menu-list"> {% if lang.url %}
{% for key, lang in languageBar -%} <li class="pure-menu-item"><a href="{{ lang.url }}
{% if key == currentLanguage -%} {%- if queryParams %}&{% endif %}
<li><a class="pure-menu-heading" href="#">{{ lang.name }}</a><li> {%- for name, value in queryParams %}
{% else -%} {%- if not loop.first %}&{% endif %}
{% if lang.url -%} {%- if value %}{{ name }}={{ value }}{% else %}{{ name }}{% endif %}
<li class="pure-menu-item"><a href="{{ lang.url }}{%- spaceless %} {%- endfor %}" class="pure-menu-link">{{ lang.name }}</a></li>
{% if queryParams -%}&{% endif -%} {% endif %}
{% for name, value in queryParams -%} {% endif %}
{%- if not loop.first %}&{% endif -%} {% endfor %}
{%- if value %}{{ name }}={{ value }}{% else %}{{ name }}{%- endif %} </ul>
{%- endfor %}"{% endspaceless %} class="pure-menu-link">{{ lang.name }}</a></li> </div>
{% endif -%} </div>
{% endif -%} </div>
{% endfor -%} {% endif %}
</ul> <div class="right show-for-large">
</div> <div class="v-center language-bar">
</div> <form id="language-form" class="pure-form" method="get">
</div> {% if not hideLanguageBar %}
{%- endif -%} <div id="languagebar">
<div class="right show-for-large"> {% for name, value in queryParams %}
<div class="v-center language-bar"> {% if value %}
<form id="language-form" class="pure-form" method="get"> <input type="hidden" name="{{ name }}" value="{{ value }}" />
{% if not hideLanguageBar -%} {% else %}
<div id="languagebar"> <input type="hidden" name="{{ name }}" />
{% for name, value in queryParams -%} {% endif %}
{% if value -%} {% endfor %}
<input type="hidden" name="{{ name }}" value="{{ value }}" /> <select class="pure-input-1-4 language-menu selectize" name="language" id="language-selector">
{%- else -%} {% for key, lang in languageBar %}
<input type="hidden" name="{{ name }}" /> {% if key == currentLanguage %}
{%- endif -%} <option value="{{ key }}" selected="selected">&#xf0ac; {{ lang.name }}</option>
{%- endfor %} {% else %}
<option value="{{ key }}">{{ lang.name }}</option>
<select class="pure-input-1-4 language-menu selectize" name="language" {% endif %}
id="language-selector"> {% endfor %}
{% for key, lang in languageBar -%} </select>
{% if key == currentLanguage -%} <noscript>
<option value="{{ key }}" selected="selected">&#xf0ac; {{ lang.name }}</option> <button type="submit" class="pure-button">
{% else -%} <i class="fa fa-arrow-right"></i>
<option value="{{ key }}">{{ lang.name }}</option> </button>
{% endif -%} </noscript>
{% endfor -%} </div>
</select> {% endif %}
</div> </form>
{% endif -%} </div>{# language bar #}
</form> </div>{# show-for-large #}
</div> <!--language-bar--> </div>{# wrap #}
</div><!--show-for-large--> </div>{# header #}
</div> <!-- wrap -->
</div> <!-- header -->
templates/base.twig
+ 10
− 17
View file @ a938fcb3
{% spaceless %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ currentLanguage }}" xml:lang="{{ currentLanguage }}"> <html lang="{{ currentLanguage }}" xml:lang="{{ currentLanguage }}">
<head> <head>
...@@ -7,35 +8,27 @@ ...@@ -7,35 +8,27 @@
<link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}">
<link rel="icon" href="/{{ baseurlpath }}resources/icons/favicon.ico"> <link rel="icon" href="/{{ baseurlpath }}resources/icons/favicon.ico">
{% if isRTL %} {% if isRTL %}
<link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}"> <link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}">
{% endif %} {% endif %}
<meta name="robots" content="noindex, nofollow"> <meta name="robots" content="noindex, nofollow">
<link rel="preload" href="{{ asset('js/bundle.js') }}" as="script" /> <link rel="preload" href="{{ asset('js/bundle.js') }}" as="script">
{%- block preload %}{% endblock %} {% block preload %}{% endblock %}
</head> </head>
<body id="{{ templateId }}"> <body id="{{ templateId }}">
<div id="layout"> <div id="layout">
{%- block header %}{% include "_header.twig" %}{% endblock %} {% block header %}{% include "_header.twig" %}{% endblock %}
<div id="content"> <div id="content">
<div class="wrap"> <div class="wrap">
{%- block contentwrapper %} {% block contentwrapper %}{% block content %}{% endblock %}{% endblock contentwrapper %}
{%- block content %}{% endblock %}
{%- endblock contentwrapper %}
</div> </div>
</div><!-- content --> </div>{# content #}
<div id="push"></div> <div id="push"></div>
</div><!-- layout --> </div>{# layout #}
<div id="foot"> <div id="foot">
{%- block footer %}{% include "_footer.twig" %}{% endblock %} {% block footer %}{% include "_footer.twig" %}{% endblock %}
</div> </div>
<script src="{{ asset('js/bundle.js') }}"></script> <script src="{{ asset('js/bundle.js') }}"></script>
{%- block postload %}{% endblock %} {% block postload %}{% endblock %}
</body> </body>
</html> </html>
{% endspaceless %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment