Commit f3e2e681 authored by alexpott's avatar alexpott

Issue #2489664 by sumitmadan, davidhernandez, Manjit.Singh, Cottser: Remove...

Issue #2489664 by sumitmadan, davidhernandez, Manjit.Singh, Cottser: Remove unnecessary markup from core templates, a.k.a. divitis
parent eed1c99c
......@@ -18,14 +18,10 @@
* @ingroup themeable
*/
#}
<div>
{{ title_prefix }}
{% if not full %}
<h2{{ title_attributes }}>{{ title }}</h2>
{% endif %}
{{ title_suffix }}
{{ title_prefix }}
{% if not full %}
<h2{{ title_attributes }}>{{ title }}</h2>
{% endif %}
{{ title_suffix }}
{{ content }}
</div>
{{ content }}
......@@ -23,11 +23,8 @@
{% endif %}
{% if tips|length %}
{% if multiple %}
<div>
{% endif %}
{% for name, tip in tips %}
{% if multiple %}
<div{{ attributes }}>
<h3>{{ tip.name }}</h3>
......@@ -44,9 +41,6 @@
{% if multiple %}
</div>
{% endif %}
{% endfor %}
{% if multiple %}
</div>
{% endif %}
{% endfor %}
{% endif %}
......@@ -17,9 +17,7 @@
*/
#}
{% if forums_defined %}
<div>
{{ forums }}
{{ topics }}
{{ topics_pager }}
</div>
{{ forums }}
{{ topics }}
{{ topics_pager }}
{% endif %}
......@@ -13,13 +13,7 @@
*/
#}
<div{{ attributes }}>
{% if data.preview %}
<div>
{{ data.preview }}
</div>
{% endif %}
<div>
{# Render widget data without the image preview that was output already. #}
{{ data|without('preview') }}
</div>
{{ data.preview }}
{# Render widget data without the image preview that was output already. #}
{{ data|without('preview') }}
</div>
......@@ -15,10 +15,6 @@
*/
#}
{% spaceless %}
<div>
{% if title %}
<div>{{ title }}</div>
{% endif %}
<div>{{ link }}</div>
</div>
{{ title }}
{{ link }}
{% endspaceless %}
......@@ -17,6 +17,4 @@
* @ingroup themeable
*/
#}
<div>
{{ form }}
</div>
{{ form }}
......@@ -63,11 +63,9 @@
<a href="{{ url }}">{{ title }}</a>
</h3>
{{ title_suffix }}
<div>
{% if snippet %}
<p{{ content_attributes }}>{{ snippet }}</p>
{% endif %}
{% if info %}
<p>{{ info }}</p>
{% endif %}
</div>
{% if snippet %}
<p{{ content_attributes }}>{{ snippet }}</p>
{% endif %}
{% if info %}
<p>{{ info }}</p>
{% endif %}
......@@ -22,11 +22,7 @@
</a>
{% endif %}
{% if site_name %}
<div>
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
</div>
{% endif %}
{% if site_slogan %}
<div>{{ site_slogan }}</div>
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
{% endif %}
{{ site_slogan }}
{% endblock %}
......@@ -24,6 +24,4 @@
<h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
{% endif %}
{{ content }}
{% if description %}
<div>{{ description }}</div>
{% endif %}
{{ description }}
......@@ -19,15 +19,8 @@
{%- if title -%}
<summary{{ summary_attributes }}>{{ title }}</summary>
{%- endif -%}
<div>
{%- if description -%}
<div>{{ description }}</div>
{%- endif -%}
{%- if children -%}
{{ children }}
{%- endif -%}
{%- if value -%}
{{ value }}
{%- endif -%}
</div>
{{ description }}
{{ children }}
{{ value }}
</details>
......@@ -19,18 +19,17 @@
*/
#}
{%- if items or empty -%}
<div>
{%- if title is not empty -%}
<h3>{{ title }}</h3>
{%- endif -%}
{%- if items -%}
<{{ list_type }}{{ attributes }}>
{%- for item in items -%}
<li{{ item.attributes }}>{{ item.value }}</li>
{%- endfor -%}
</{{ list_type }}>
{%- else -%}
{{- empty -}}
{%- endif -%}
</div>
{%- if title is not empty -%}
<h3>{{ title }}</h3>
{%- endif -%}
{%- if items -%}
<{{ list_type }}{{ attributes }}>
{%- for item in items -%}
<li{{ item.attributes }}>{{ item.value }}</li>
{%- endfor -%}
</{{ list_type }}>
{%- else -%}
{{- empty -}}
{%- endif -%}
{%- endif %}
......@@ -11,57 +11,50 @@
* @ingroup themeable
*/
#}
<div>
<header role="banner">
{% if logo %}
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">
<img src="{{ logo }}" alt="{{ 'Home'|t }}"/>
</a>
{% endif %}
{% if site_name or site_slogan %}
<div>
{% if site_name %}
<h1>
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
</h1>
{% endif %}
<header role="banner">
{% if logo %}
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">
<img src="{{ logo }}" alt="{{ 'Home'|t }}"/>
</a>
{% endif %}
{% if site_slogan %}
<div>{{ site_slogan }}</div>
{% endif %}
</div>
{% if site_name or site_slogan %}
{% if site_name %}
<h1>
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
</h1>
{% endif %}
</header>
<main role="main">
{% if title %}
<h1>{{ title }}</h1>
{% if site_slogan %}
<div>{{ site_slogan }}</div>
{% endif %}
{% endif %}
</header>
{{ page.highlighted }}
<main role="main">
{% if title %}
<h1>{{ title }}</h1>
{% endif %}
{{ page.content }}
</main>
{{ page.highlighted }}
{% if page.sidebar_first %}
<aside role="complementary">
{{ page.sidebar_first }}
</aside>
{% endif %}
{{ page.content }}
</main>
{% if page.sidebar_second %}
<aside role="complementary">
{{ page.sidebar_second }}
</aside>
{% endif %}
{% if page.sidebar_first %}
<aside role="complementary">
{{ page.sidebar_first }}
</aside>
{% endif %}
{% if page.footer %}
<footer role="contentinfo">
{{ page.footer }}
</footer>
{% endif %}
{% if page.sidebar_second %}
<aside role="complementary">
{{ page.sidebar_second }}
</aside>
{% endif %}
</div>
{% if page.footer %}
<footer role="contentinfo">
{{ page.footer }}
</footer>
{% endif %}
......@@ -15,8 +15,8 @@
#}
{% if logged_in %}
{% if status is constant('MARK_NEW') %}
<span>{{ 'new'|t }}</span>
{{ 'new'|t }}
{% elseif status is constant('MARK_UPDATED') %}
<span>{{ 'updated'|t }}</span>
{{ 'updated'|t }}
{% endif %}
{% endif %}
......@@ -31,7 +31,5 @@
<h2><a href="{{ url }}">{{ name }}</a></h2>
{% endif %}
{{ title_suffix }}
<div>
{{ content }}
</div>
{{ content }}
</div>
Markdown is supported
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