summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2014-12-29 21:52:00 (GMT)
committerwebchick2014-12-29 21:52:00 (GMT)
commit847a50ac1c7985e772ea467c89adb7150f6f35f4 (patch)
tree8458a8bf4b4316f43c3b65e686a7183add3fb936
parent0a4d2b559e9d4fd33384afca42735877c29d027c (diff)
Issue #1903048 by DickJohnson, emma.maria, lauriii, mbrett5062, JamesLefrère, lilGemVinny: Revise Bartik template indentation inline with best practices
-rw-r--r--core/themes/bartik/templates/block--system-menu-block.html.twig7
-rw-r--r--core/themes/bartik/templates/comment.html.twig39
-rw-r--r--core/themes/bartik/templates/maintenance-page.html.twig77
-rw-r--r--core/themes/bartik/templates/node.html.twig10
-rw-r--r--core/themes/bartik/templates/page.html.twig230
5 files changed, 168 insertions, 195 deletions
diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
index 4bbab76..65ab19b 100644
--- a/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -12,16 +12,13 @@
{% block content %}
{# If a label is displayed, wrap it in <div class="content">. #}
{% if configuration.label_display %}
- <div{{ content_attributes.addClass('content') }}>
+ <div{{ content_attributes.addClass('content') }}>{{ content }}</div>
{% else %}
{# When rendering a menu without label, render a menu toggle. #}
<div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
<div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
<a class="menu-toggle" href="#{{ show_anchor }}">{{ 'Menu'|t }}</a>
<a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{{ 'Menu'|t }}</a>
- {% endif %}
- {{ content }}
- {% if configuration.label_display %}
- </div>
+ {{ content }}
{% endif %}
{% endblock %}
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 0e40230..22243e3 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -74,68 +74,47 @@
]
%}
<article role="article"{{ attributes.addClass(classes)|without('role') }}>
-
<header class="comment-header">
<div class="attribution">
{{ user_picture }}
-
<div class="submitted">
- <p class="commenter-name">
- {{ author }}
- </p>
- <p class="comment-time">
- {{ created }}
- </p>
- <p class="comment-permalink">
- {{ permalink }}
- </p>
+ <p class="commenter-name">{{ author }}</p>
+ <p class="comment-time">{{ created }}</p>
+ <p class="comment-permalink">{{ permalink }}</p>
{#
// Indicate the semantic relationship between parent and child comments
// for accessibility. The list is difficult to navigate in a screen
// reader without this information.
#}
{% if parent %}
- <p class="comment-parent visually-hidden">
- {{ parent }}
- </p>
+ <p class="comment-parent visually-hidden">{{ parent }}</p>
{% endif %}
</div>
</div> <!-- /.attribution -->
</header> <!-- /.comment-header -->
-
<div class="comment-text">
<div class="comment-arrow"></div>
-
{#
Hide the "new" indicator by default, let a piece of JavaScript ask
the server which comments are new for the user. Rendering the final
"new" indicator here would break the render cache.
#}
<span class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
-
{% if title %}
{{ title_prefix }}
- <h3{{ title_attributes }}>{{ title }}</h3>
+ <h3{{ title_attributes }}>{{ title }}</h3>
{{ title_suffix }}
{% endif %}
-
<div{{ content_attributes.addClass('content') }}>
{{ content|without('links') }}
</div> <!-- /.content -->
-
<footer class="comment-footer">
{% if signature %}
- <div class="user-signature clearfix">
- {{ signature }}
- </div>
+ <div class="user-signature clearfix">{{ signature }}</div>
+ {% endif %}
+ {% if content.links %}
+ <nav>{{ content.links }}</nav>
{% endif %}
-
- {% if content.links %}
- <nav>
- {{ content.links }}
- </nav>
- {% endif %}
</footer> <!-- /.comment-footer -->
</div> <!-- /.comment-text -->
-
</article>
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 5de50cc..5c2e980 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -8,38 +8,47 @@
* @see template_preprocess_maintenance_page()
*/
#}
- <div id="page-wrapper"><div id="page">
-
- <header id="header" role="banner"><div class="section clearfix">
- {% if site_name or site_slogan %}
- <div id="name-and-slogan"{{ hide_site_name and hide_site_slogan ? ' class="visually-hidden"' }}>
- {% if site_name %}
- <div id="site-name"{{ hide_site_name ? ' class="visually-hidden"' }}>
- <strong>
- <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
- </strong>
- </div>
- {% endif %}
- {% if site_slogan %}
- <div id="site-slogan"{{ hide_site_slogan ? ' class="visually-hidden"' }}>
- {{ site_slogan }}
- </div>
- {% endif %}
- </div> <!-- /#name-and-slogan -->
- {% endif %}
- </div></header> <!-- /.section, /#header -->
-
- <div id="main-wrapper"><div id="main" class="clearfix">
- <main id="content" class="column" role="main"><section class="section">
- <a id="main-content"></a>
- {% if title %}<h1 class="title" id="page-title">{{ title }}</h1>{% endif %}
- {{ page.content }}
- {% if messages %}
- <div id="messages"><div class="section clearfix">
- {{ messages }}
- </div></div> <!-- /.section, /#messages -->
+<div id="page-wrapper">
+ <div id="page">
+ <header id="header" role="banner">
+ <div class="section clearfix">
+ {% if site_name or site_slogan %}
+ <div id="name-and-slogan"{{ hide_site_name and hide_site_slogan ? ' class="visually-hidden"' }}>
+ {% if site_name %}
+ <div id="site-name"{{ hide_site_name ? ' class="visually-hidden"' }}>
+ <strong>
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
+ </strong>
+ </div>
+ {% endif %}
+ {% if site_slogan %}
+ <div id="site-slogan"{{ hide_site_slogan ? ' class="visually-hidden"' }}>
+ {{ site_slogan }}
+ </div>
+ {% endif %}
+ </div> <!-- /#name-and-slogan -->
{% endif %}
- </section></main> <!-- /.section, /#content -->
- </div></div> <!-- /#main, /#main-wrapper -->
-
- </div></div> <!-- /#page, /#page-wrapper -->
+ </div> <!-- /.section -->
+ </header> <!-- /#header -->
+ <div id="main-wrapper">
+ <div id="main" class="clearfix">
+ <main id="content" class="column" role="main">
+ <section class="section">
+ <a id="main-content"></a>
+ {% if title %}
+ <h1 class="title" id="page-title">{{ title }}</h1>
+ {% endif %}
+ {{ page.content }}
+ {% if messages %}
+ <div id="messages">
+ <div class="section clearfix">
+ {{ messages }}
+ </div>
+ </div> <!-- /#messages -->
+ {% endif %}
+ </section> <!-- /.section -->
+ </main> <!-- /#content -->
+ </div> <!-- /.section -->
+ </div> <!-- /#main-wrapper -->
+ </div> <!-- /#page -->
+</div> <!-- /#page-wrapper -->
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 2e35f63..b390681 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -74,7 +74,6 @@
]
%}
<article{{ attributes.addClass(classes) }}>
-
<header>
{{ title_prefix }}
{% if not page %}
@@ -83,7 +82,6 @@
</h2>
{% endif %}
{{ title_suffix }}
-
{% if display_submitted %}
<div class="node__meta">
{{ author_picture }}
@@ -94,17 +92,11 @@
</div>
{% endif %}
</header>
-
<div{{ content_attributes.addClass('node__content', 'clearfix') }}>
{{ content|without('comment', 'links') }}
</div>
-
{% if content.links %}
- <div class="node__links">
- {{ content.links }}
- </div>
+ <div class="node__links">{{ content.links }}</div>
{% endif %}
-
{{ content.comment }}
-
</article>
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 2b34b1a..ef758f2 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -75,126 +75,122 @@
* @see html.html.twig
*/
#}
-<div id="page-wrapper"><div id="page">
-
- <header id="header" role="banner" aria-label="{{ 'Site header'|t}}"><div class="section clearfix">
-
- {{ page.secondary_menu }}
-
- {% if logo %}
- <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
- <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
- </a>
- {% endif %}
-
- {% if site_name or site_slogan %}
- <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
- {% if site_name %}
- {% if title %}
- <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
- <strong>
- <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
- </strong>
- </div>
- {# Use h1 when the content title is empty #}
- {% else %}
- <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
- <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
- </h1>
- {% endif %}
+<div id="page-wrapper">
+ <div id="page">
+ <header id="header" role="banner" aria-label="{{ 'Site header'|t}}">
+ <div class="section clearfix">
+ {{ page.secondary_menu }}
+ {% if logo %}
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
+ <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
+ </a>
{% endif %}
-
- {% if site_slogan %}
- <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
- {{ site_slogan }}
- </div>
+ {% if site_name or site_slogan %}
+ <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
+ {% if site_name %}
+ {% if title %}
+ <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
+ <strong>
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
+ </strong>
+ </div>
+ {# Use h1 when the content title is empty #}
+ {% else %}
+ <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
+ </h1>
+ {% endif %}
+ {% endif %}
+ {% if site_slogan %}
+ <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
+ {{ site_slogan }}
+ </div>
+ {% endif %}
+ </div><!-- /#name-and-slogan -->
{% endif %}
- </div><!-- /#name-and-slogan -->
+ {{ page.header }}
+ {{ page.primary_menu }}
+ </div> <!-- /.section -->
+ </header> <!-- /.section -->
+ {% if messages %}
+ <div id="messages">
+ <div class="section clearfix">{{ messages }}</div>
+ </div> <!-- /#messages -->
{% endif %}
-
- {{ page.header }}
- {{ page.primary_menu }}
-
- </div></header> <!-- /.section, /#header-->
-
- {% if messages %}
- <div id="messages"><div class="section clearfix">
- {{ messages }}
- </div></div> <!-- /.section, /#messages -->
- {% endif %}
-
- {% if page.featured %}
- <div id="featured"><aside class="section clearfix" role="complementary">
- {{ page.featured }}
- </aside></div> <!-- /.section, /#featured -->
- {% endif %}
-
- <div id="main-wrapper" class="clearfix"><div id="main" class="clearfix">
- {{ breadcrumb }}
-
- <main id="content" class="column" role="main"><section class="section">
- {% if page.highlighted %}<div id="highlighted">{{ page.highlighted }}</div>{% endif %}
- <a id="main-content" tabindex="-1"></a>
- {{ title_prefix }}
- {% if title %}
- <h1 class="title" id="page-title">
- {{ title }}
- </h1>
- {% endif %}
- {{ title_suffix }}
- {% if tabs %}
- <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
- {{ tabs }}
- </nav>
+ {% if page.featured %}
+ <div id="featured">
+ <aside class="section clearfix" role="complementary">
+ {{ page.featured }}
+ </aside> <!-- /.section -->
+ </div> <!-- /#featured -->
+ {% endif %}
+ <div id="main-wrapper" class="clearfix">
+ <div id="main" class="clearfix">
+ {{ breadcrumb }}
+ <main id="content" class="column" role="main">
+ <section class="section">
+ {% if page.highlighted %}<div id="highlighted">{{ page.highlighted }}</div>{% endif %}
+ <a id="main-content" tabindex="-1"></a>
+ {{ title_prefix }}
+ {% if title %}
+ <h1 class="title" id="page-title">
+ {{ title }}
+ </h1>
+ {% endif %}
+ {{ title_suffix }}
+ {% if tabs %}
+ <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+ {{ tabs }}
+ </nav>
+ {% endif %}
+ {{ page.help }}
+ {% if action_links %}
+ <ul class="action-links">{{ action_links }}</ul>
+ {% endif %}
+ {{ page.content }}
+ </section> <!-- /.section -->
+ </main> <!-- /#content -->
+ {% if page.sidebar_first %}
+ <div id="sidebar-first" class="column sidebar">
+ <aside class="section" role="complementary">
+ {{ page.sidebar_first }}
+ </aside><!-- /.section -->
+ </div><!-- /#sidebar-first -->
{% endif %}
- {{ page.help }}
- {% if action_links %}
- <ul class="action-links">
- {{ action_links }}
- </ul>
+ {% if page.sidebar_second %}
+ <div id="sidebar-second" class="column sidebar">
+ <aside class="section" role="complementary">
+ {{ page.sidebar_second }}
+ </aside> <!-- /.section -->
+ </div><!-- /#sidebar-second -->
{% endif %}
- {{ page.content }}
- </section></main> <!-- /.section, /#content -->
-
- {% if page.sidebar_first %}
- <div id="sidebar-first" class="column sidebar"><aside class="section" role="complementary">
- {{ page.sidebar_first }}
- </aside></div><!-- /.section, /#sidebar-first -->
- {% endif %}
-
- {% if page.sidebar_second %}
- <div id="sidebar-second" class="column sidebar"><aside class="section" role="complementary">
- {{ page.sidebar_second }}
- </aside></div><!-- /.section, /#sidebar-second -->
+ </div> <!-- /#main -->
+ </div> <!-- /#main-wrapper -->
+ {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
+ <div id="triptych-wrapper">
+ <aside id="triptych" class="clearfix" role="complementary">
+ {{ page.triptych_first }}
+ {{ page.triptych_middle }}
+ {{ page.triptych_last }}
+ </aside> <!-- /#triptych -->
+ </div> <!-- /#triptych-wrapper -->
{% endif %}
-
- </div></div><!-- /#main, /#main-wrapper -->
-
- {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
- <div id="triptych-wrapper"><aside id="triptych" class="clearfix" role="complementary">
- {{ page.triptych_first }}
- {{ page.triptych_middle }}
- {{ page.triptych_last }}
- </aside></div><!-- /#triptych, /#triptych-wrapper -->
- {% endif %}
-
- <div id="footer-wrapper"><footer class="section">
-
- {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
- <div id="footer-columns" class="clearfix">
- {{ page.footer_firstcolumn }}
- {{ page.footer_secondcolumn }}
- {{ page.footer_thirdcolumn }}
- {{ page.footer_fourthcolumn }}
- </div><!-- /#footer-columns -->
- {% endif %}
-
- {% if page.footer %}
- <div id="footer" role="contentinfo" class="clearfix">
- {{ page.footer }}
- </div> <!-- /#footer -->
- {% endif %}
-
- </footer></div> <!-- /.section, /#footer-wrapper -->
-
-</div></div> <!-- /#page, /#page-wrapper -->
+ <div id="footer-wrapper">
+ <footer class="section">
+ {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
+ <div id="footer-columns" class="clearfix">
+ {{ page.footer_firstcolumn }}
+ {{ page.footer_secondcolumn }}
+ {{ page.footer_thirdcolumn }}
+ {{ page.footer_fourthcolumn }}
+ </div> <!-- /#footer-columns -->
+ {% endif %}
+ {% if page.footer %}
+ <div id="footer" role="contentinfo" class="clearfix">
+ {{ page.footer }}
+ </div> <!-- /#footer -->
+ {% endif %}
+ </footer> <!-- /.section -->
+ </div> <!-- /#footer-wrapper -->
+ </div> <!-- /#page -->
+</div> <!-- /#page-wrapper -->