From 448c2e37d16136f96841d97a77b4713e02711dd4 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 22 May 2015 22:37:41 +0200
Subject: [PATCH] templating

---
 .../views/default.html.twig                   |  34 +++--
 .../views/Default/category.html.twig          |   7 +
 .../Resources/views/Default/post.html.twig    |   3 +
 .../Resources/views/Default/tag.html.twig     |   7 +
 .../Resources/views/Default/contact.html.twig | 124 +++++++++---------
 .../views/Default/lesson_page.html.twig       |  24 +++-
 6 files changed, 118 insertions(+), 81 deletions(-)

diff --git a/app/Resources/TrinityContentManagerBundle/views/default.html.twig b/app/Resources/TrinityContentManagerBundle/views/default.html.twig
index 0cf9402..3df5880 100644
--- a/app/Resources/TrinityContentManagerBundle/views/default.html.twig
+++ b/app/Resources/TrinityContentManagerBundle/views/default.html.twig
@@ -1,21 +1,27 @@
 {% extends "::base.html.twig" %}
 
 {% block breadcrumb %}
-	<li><a href="{{ path('homepage') }}">Accueil</a></li>
-	<li class="sep"> » </li>
-	<li>{{ render_block('title') }}</li>
+    <li><a href="{{ path('homepage') }}">Accueil</a></li>
+    <li class="sep"> » </li>
+    <li>{{ render_block('title') }}</li>
+{% endblock %}
+
+{% block header_title %}
+    {{ render_block('title') }}
+{% endblock %}
+
+{% block header_subtitle %}
+    <h2>{{ render_block('subtitle') }}</h2>
 {% endblock %}
 
 {% block body %}
-	<article class="post">
-		<header>
-			<h1>{{ render_block('title') }}</h1>
-
-			{% if render_block('subtitle') %}
-				<h2>{{ render_block('subtitle') }}</h2>
-			{% endif %}
-		</header>
-	</article>
-	
-	<div class="page-content">{{ render_block('content1')|post }}</div>
+    <article>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                    {{ render_block('content1')|post }}
+                </div>
+            </div>
+        </div>
+    </article>
 {% endblock %}
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig
index f195410..288b8f3 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig
@@ -11,6 +11,13 @@
     {% endif %}
 {% endblock %}
 
+{% block header_title %}
+    {{ page.object }}
+{% endblock %}
+
+{% block header_subtitle %}
+{% endblock %}
+
 {% block body %}
     {% if page.pager.nbResults == 0 %}
         <div class="alert alert-info">Aucun article disponible.</div>
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig
index c8f0fc6..67414aa 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig
@@ -10,6 +10,9 @@
     {{  page.object.title }}
 {% endblock %}
 
+{% block header_subtitle %}
+{% endblock %}
+
 {% block body %}
     {% set post = page.object %}
 
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tag.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tag.html.twig
index 95a4619..00a29ec 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tag.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tag.html.twig
@@ -11,6 +11,13 @@
     {% endif %}
 {% endblock %}
 
+{% block header_title %}
+    #{{ page.object }}
+{% endblock %}
+
+{% block header_subtitle %}
+{% endblock %}
+
 {% block body %}
     {% if page.pager.nbResults == 0 %}
         <div class="alert alert-info">Aucun article disponible.</div>
diff --git a/src/Deblan/Bundle/ContactBundle/Resources/views/Default/contact.html.twig b/src/Deblan/Bundle/ContactBundle/Resources/views/Default/contact.html.twig
index 3824e9f..78aa93b 100644
--- a/src/Deblan/Bundle/ContactBundle/Resources/views/Default/contact.html.twig
+++ b/src/Deblan/Bundle/ContactBundle/Resources/views/Default/contact.html.twig
@@ -1,72 +1,76 @@
 {% extends "::base.html.twig" %}
 
 {% block breadcrumb %}
-	<li><a href="{{ cms_path('homepage') }}">Accueil</a></li>
-	<li class="sep"> » </li>
-	<li>Contact</li>
+    <li><a href="{{ cms_path('homepage') }}">Accueil</a></li>
+    <li class="sep"> » </li>
+    <li>Contact</li>
 {% endblock %}
 
+{% block header_title %}
+    {{ render_block('title') }}
+{% endblock %}
+
+{% block header_subtitle %}{% endblock %}
+
 {% block body %}
-	<article>
-		<div class="container">
-			<div class="row">
-				<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-					<h1>{{ render_block('title') }}</h1>
+    <article>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                    {{ render_block('content1') }}
+                    
+                    <hr />
+                </div>
+                
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                    <form class="form-horizontal" action="{{ cms_path('bot') }}" data-secured data-target="{{ cms_path('contact') }}" method="post" {{ form_enctype(form) }}>    
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">Qui c'est ?</label>
 
-					{{ render_block('content1') }}
-					
-					<hr />
-				</div>
-				
-				<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-					<form class="form-horizontal" action="{{ cms_path('bot') }}" data-secured data-target="{{ cms_path('contact') }}" method="post" {{ form_enctype(form) }}>	
-						<div class="form-group">
-							<label class="col-sm-2 control-label">Qui c'est ?</label>
+                            <div class="col-sm-10">
+                                {{ form_widget(form.name) }}
+                                {{ form_errors(form.name) }}
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">Email</label>
 
-							<div class="col-sm-10">
-								{{ form_widget(form.name) }}
-								{{ form_errors(form.name) }}
-							</div>
-						</div>
-						
-						<div class="form-group">
-							<label class="col-sm-2 control-label">Email</label>
+                            <div class="col-sm-10">
+                                {{ form_widget(form.email) }}
+                                {{ form_errors(form.email) }}
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">Sujet</label>
 
-							<div class="col-sm-10">
-								{{ form_widget(form.email) }}
-								{{ form_errors(form.email) }}
-							</div>
-						</div>
-						
-						<div class="form-group">
-							<label class="col-sm-2 control-label">Sujet</label>
+                            <div class="col-sm-10">
+                                {{ form_widget(form.subject) }}
+                                {{ form_errors(form.subject) }}
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">Message</label>
 
-							<div class="col-sm-10">
-								{{ form_widget(form.subject) }}
-								{{ form_errors(form.subject) }}
-							</div>
-						</div>
-						
-						<div class="form-group">
-							<label class="col-sm-2 control-label">Message</label>
+                            <div class="col-sm-10">
+                                {{ form_widget(form.message) }}
+                                {{ form_errors(form.message) }}
+                            </div>
+                        </div>
+                        
+                        <div class="form-group submit">
+                            <label class="col-sm-2 control-label">Envoyer dans Internets</label>
+                            <div class="col-sm-10">
+                                <input type="submit" class="btn btn-primary" value="Envoi la monnaie !" />
+                            </div>
+                        </div>
 
-							<div class="col-sm-10">
-								{{ form_widget(form.message) }}
-								{{ form_errors(form.message) }}
-							</div>
-						</div>
-						
-						<div class="form-group submit">
-							<label class="col-sm-2 control-label">Envoyer dans Internets</label>
-							<div class="col-sm-10">
-								<input type="submit" class="btn btn-primary" value="Envoi la monnaie !" />
-							</div>
-						</div>
-
-						{{ form_rest(form) }}
-					</form>
-				</div>
-			</div>
-		</div>
-	</article>
+                        {{ form_rest(form) }}
+                    </form>
+                </div>
+            </div>
+        </div>
+    </article>
 {% endblock %}
diff --git a/src/Deblan/Bundle/LessonBundle/Resources/views/Default/lesson_page.html.twig b/src/Deblan/Bundle/LessonBundle/Resources/views/Default/lesson_page.html.twig
index 8a7ad3d..61f3776 100644
--- a/src/Deblan/Bundle/LessonBundle/Resources/views/Default/lesson_page.html.twig
+++ b/src/Deblan/Bundle/LessonBundle/Resources/views/Default/lesson_page.html.twig
@@ -6,14 +6,24 @@
 	<li>{{ render_block('title') }}</li>
 {% endblock %}
 
+{% block header_title %}
+    {{ render_block('title') }}
+{% endblock %}
+
+{% block header_subtitle %}
+    <h2>{{ render_block('subtitle') }}</h2>
+{% endblock %}
+
 {% block body %}
-	<article class="post">
-		<header>
-			<h1>{{ render_block('title') }}</h1>
-		</header>
-	</article>
-	
-	<div class="page-content">{{ render_block('content1')|transform_url }}</div>
+    <article>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                    {{ render_block('content1')|post }}
+                </div>
+            </div>
+        </div>
+    </article>
 {% endblock %}
 
 {% import _self as macros %}