From 9d69b1a86f69a75efd18d998f70b240d40ee5b64 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 23 May 2015 00:11:59 +0200
Subject: [PATCH] date

---
 app/Resources/views/base.html.twig            |   2 +-
 .../Resources/public/css/cleanblog/main.css   | 267 +++++++++---------
 .../Resources/views/Default/post.html.twig    |   9 +
 .../Resources/views/Default/thePost.html.twig |   9 -
 .../Resources/views/Default/tiny.html.twig    |  18 +-
 .../views/Default/tinyThePost.html.twig       |  26 +-
 6 files changed, 166 insertions(+), 165 deletions(-)

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index a9ef2c0..9922a46 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -16,7 +16,7 @@
             <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/bootstrap.css') }}" />
             <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/clean-blog.css') }}" />
             <link rel="stylesheet" href="{{ asset('bundles/deblanblog/syntaxhighlighter/styles/shThemeEclipse.css') }}" />
-            <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/main.css') }}?v=2" />
+            <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/main.css') }}?v=14" />
         {% endblock %}
         {{ get_var('CssBlock')|raw }}
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css
index 6d67dd9..2fa9882 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css
+++ b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css
@@ -1,125 +1,134 @@
 #search input[type=text] {
-	position: relative;
-	right: 0;
-	top: 40px;
-	float: right;
-	width: 173px;
-	height: 25px;
-	border: 1px solid #fff;
-	background: url(../img/search.png) #ffffff 150px 2px no-repeat;
-	color: #333;
-	padding: 3px 25px 3px 4px;
+    position: relative;
+    right: 0;
+    top: 40px;
+    float: right;
+    width: 173px;
+    height: 25px;
+    border: 1px solid #fff;
+    background: url(../img/search.png) #ffffff 150px 2px no-repeat;
+    color: #333;
+    padding: 3px 25px 3px 4px;
 }
 
 #breadcrumb {
-	background: #333;
-	padding: 10px 0;
-	font-size: 14px;
-	font-family: Calibri, Verdana;
+    background: #333;
+    padding: 10px 0;
+    font-size: 14px;
+    font-family: Calibri, Verdana;
 }
 
 #breadcrumb ul {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 @media (max-width: 960px) {
-	#breadcrumb ul {
-		padding: 0 4px;
-	}
+    #breadcrumb ul {
+        padding: 0 4px;
+    }
 
 }
 
 #breadcrumb li {
-	display: inline-block;
-	color: #ccc;
+    display: inline-block;
+    color: #ccc;
 }
 
 #breadcrumb li.sep {
-	color: #666;
-	padding: 0 3px;
+    color: #666;
+    padding: 0 3px;
 }
 
 #breadcrumb a {
-	color: #ccc;
+    color: #ccc;
 }
 
 #breadcrumb .glyphicon {
-	margin-right: 3px;
+    margin-right: 3px;
+}
+
+.author {
+    display: inline;
+}
+
+.author a {
+    color: #fff;
 }
 
 #social {
-	list-style: none;
-	text-align: center;
+    list-style: none;
+    text-align: center;
+    padding-left: 0;
 }
 
 #social li {
-	display: inline-block;
+    display: inline-block;
 }
 
 .social {
-	background: url(../../img/socials.png) no-repeat 1000px 0;
-	margin-left: 2px;
+    background: url(../../img/socials.png) no-repeat 1000px 0;
+    margin-left: 2px;
 }
 
 .social a {
-	display: block;
-	height: 20px;
-	width: 20px;
-	overflow: hidden;
-	text-indent: 100px;
+    display: block;
+    height: 20px;
+    width: 20px;
+    overflow: hidden;
+    text-indent: 100px;
 }
 
 .social-rss {
-	background-position: -20px 0;
+    background-position: -20px 0;
 }
 
 .social-twitter {
-	background-position: 0 0;
+    background-position: 0 0;
 }
 
 .social-facebook {
-	background-position: -40px 0;
+    background-position: -40px 0;
 }
 
 .social-linkedin {
-	background-position: -60px 0;
+    background-position: -60px 0;
 }
 
 .social-diaspora {
-	background-position: -80px 0;
+    background-position: -80px 0;
 }
 
 .social-github {
-	background-position: -100px 0;
+    background-position: -100px 0;
 }
 
 code {
-	white-space: normal;
+    white-space: normal;
 }
 
 .media.level-2 {
-	padding-left: 40px;
+    padding-left: 40px;
 }
 
 .media.level-3 {
-	padding-left: 80px;
+    padding-left: 80px;
 }
 
 .media.level-4 {
-	padding-left: 120px;
+    padding-left: 120px;
 }
 
 .media .media-body .answer {
-	visibility: hidden;
+    visibility: hidden;
 }
 
 .media-body p {
-	margin-bottom: 0;
+    margin-bottom: 0;
 }
 
 .media .media-body:hover .answer {
-	visibility: visible;
+    visibility: visible;
 }
 
 
@@ -130,153 +139,153 @@ code {
 .media.level-9,
 .media.level-10,
 .media.level-11 {
-	padding-left: 160px;
+    padding-left: 160px;
 }
 
 @media (max-width: 500px) {
-	.media.level-2 {
-		padding-left: 10px;
-	}
+    .media.level-2 {
+        padding-left: 10px;
+    }
 
-	.media.level-3 {
-		padding-left: 20px;
-	}
+    .media.level-3 {
+        padding-left: 20px;
+    }
 
-	.media.level-4 {
-		padding-left: 30px;
-	}
+    .media.level-4 {
+        padding-left: 30px;
+    }
 
-	.media.level-5,
-	.media.level-6,
-	.media.level-7,
-	.media.level-8,
-	.media.level-9,
-	.media.level-10,
-	.media.level-11 {
-		padding-left: 40px;
-	}
+    .media.level-5,
+    .media.level-6,
+    .media.level-7,
+    .media.level-8,
+    .media.level-9,
+    .media.level-10,
+    .media.level-11 {
+        padding-left: 40px;
+    }
 
-	.media .avatar {
-		width: 45px;
-		height: 45px;
-	}
+    .media .avatar {
+        width: 45px;
+        height: 45px;
+    }
 
-	.media .pull-left .answer {
-		display: none;
-	}
+    .media .pull-left .answer {
+        display: none;
+    }
 
-	.media .media-body .answer {
-		display: block;
-	}
+    .media .media-body .answer {
+        display: block;
+    }
 
 }
 
 .comments .media button {
-	display: block;
-	width: 90px;
-	margin-top: 2px;
+    display: block;
+    width: 90px;
+    margin-top: 2px;
 }
 
 .comments .media {
-	margin-bottom: 40px;
+    margin-bottom: 40px;
 }
 
 .form-group.submit .control-label {
-	visibility: hidden;
+    visibility: hidden;
 }
 
 .error_list {
-	margin: 0;
-	padding: 0;
-	color: #fff;
-	background: #FF8D8D;
-	border: 1px solid #b94a48;
-	border-top: 0;
-	box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+    margin: 0;
+    padding: 0;
+    color: #fff;
+    background: #FF8D8D;
+    border: 1px solid #b94a48;
+    border-top: 0;
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
 }
 
 .error_list li {
-	margin: 0;
-	padding: 5px;
-	list-style: none;
+    margin: 0;
+    padding: 5px;
+    list-style: none;
 }
 
 input.has-error,
 textarea.has-error {
-	border-color: #b94a48;
-	border-radius: 0;
-	box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+    border-color: #b94a48;
+    border-radius: 0;
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
 }
 
 #cancel_answer {
-	margin-top: -7px;
+    margin-top: -7px;
 }
 
 .syntaxhighlighter .container {
-	width: auto;
-	margin: auto;
-	padding: auto;
+    width: auto;
+    margin: auto;
+    padding: auto;
 }
 
 .dropdown-menu {
-	border-radius: 0 !important;
+    border-radius: 0 !important;
 }
 
 code,
 pre,
 .syntaxhighlighter .line {
-	-webkit-hyphens: auto !important;
-	-moz-hyphens: auto !important;
-	-ms-hyphens: auto !important;
-	-o-hyphens: auto !important;
-	hyphens: auto !important;
-	word-wrap: break-word !important;
-	background: none;
+    -webkit-hyphens: auto !important;
+    -moz-hyphens: auto !important;
+    -ms-hyphens: auto !important;
+    -o-hyphens: auto !important;
+    hyphens: auto !important;
+    word-wrap: break-word !important;
+    background: none;
 }
 
 .toolbar {
-	display: none;
+    display: none;
 }
 
 .code-container {
-	overflow: auto;
-	padding: 10px 0;
-	margin: 10px 0;
-	max-width: 700px;
+    overflow: auto;
+    padding: 10px 0;
+    margin: 10px 0;
+    max-width: 700px;
 }
 
 .show-code {
-	display: none;
-	color: blue;
-	padding: 4px 0 10px 0;
+    display: none;
+    color: blue;
+    padding: 4px 0 10px 0;
 }
 
 .show-code:hover {
-	cursor: pointer;
+    cursor: pointer;
 }
 
 @media (max-width: 500px) {
-	.code-container {
-		display: none;
-	}
+    .code-container {
+        display: none;
+    }
 
-	.show-code {
-		display: block;
-	}
+    .show-code {
+        display: block;
+    }
 }
 
 .labels {
-	list-style: none;
-	margin: 0;
-	padding: 10px 0;
+    list-style: none;
+    margin: 0;
+    padding: 10px 0;
 }
 
 .labels li {
-	display: inline-block;
-	margin: 0;
-	padding: 0
+    display: inline-block;
+    margin: 0;
+    padding: 0
 }
 
 label {
-	font-size: 16px;
+    font-size: 16px;
 }
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 67414aa..7cc2776 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/post.html.twig
@@ -11,6 +11,15 @@
 {% endblock %}
 
 {% block header_subtitle %}
+    {% set post = page.object %}
+
+    <address class="author">
+        <a rel="author" href="{{ cms_path('about') }}">{{ post.user.username|capitalize }}</a>,
+    </address>
+
+    <time datetime="{{ post.publishedAt|date("Y-m-d") }}" title="{{ post.publishedAt|date("r") }}">
+        le {{ post.publishedAt|date("d/m/Y à H\\hi") }}
+    </time>
 {% endblock %}
 
 {% block body %}
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/thePost.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/thePost.html.twig
index 2336e08..0f8e27b 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/thePost.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/thePost.html.twig
@@ -40,15 +40,6 @@
         <h1><a href="{{ cms_path('post', {id: post.id, post: post.slug}) }}">{{ post.title }}</a></h1>
 
         <div class="meta">
-            <address class="author">
-                <span class="glyphicon glyphicon-user"></span>
-                <a rel="author" href="{{ cms_path('about') }}">{{ post.user.username|capitalize }}</a>
-            </address>
-
-            <time datetime="{{ post.publishedAt|date("Y-m-d") }}" title="{{ post.publishedAt|date("r") }}">
-                <span class="glyphicon glyphicon-calendar"></span> 
-                {{ post.publishedAt|date("d/m/Y à H\\hi") }}
-            </time>
                 
             <ul class="labels">
                 {% for category in post.categories %}
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tiny.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tiny.html.twig
index 9a5ec09..0acbfac 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tiny.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tiny.html.twig
@@ -12,15 +12,17 @@
     {% endif %}
 {% endblock %}
 
-{% block body %}
-    <h1>
-        {{ page.seoTitle|pp(page.object)|pp(page)|e }}
-        
-        <a href="https://tiny.deblan.org/public.php?op=rss&amp;id=-1&amp;key=c35938b7d791af1d550a8e11e77eb91ad2bf7a6f" target="_blank">
-            <span class="social social-rss" style="width: 20px; height: 20px; display: inline-block"></span>
-        </a>
-    </h1>
+{% block header_title %}
+    {{ page.seoTitle|pp(page.object)|pp(page)|e }}
+    <a href="https://tiny.deblan.org/public.php?op=rss&amp;id=-1&amp;key=c35938b7d791af1d550a8e11e77eb91ad2bf7a6f" target="_blank">
+        <span class="social social-rss" style="width: 20px; height: 20px; display: inline-block"></span>
+    </a>
+{% endblock %}
 
+{% block header_subtitle %}
+{% endblock %}
+
+{% block body %}
     {% for post in page.pager %}
         {{ include('DeblanBlogBundle:Default:tinyThePost.html.twig', {post: post}) }}
     {% endfor %}
diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tinyThePost.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tinyThePost.html.twig
index 8521c4d..ce154f3 100644
--- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tinyThePost.html.twig
+++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/tinyThePost.html.twig
@@ -1,23 +1,13 @@
-<article class="post" id="post-{{ post.id }}">
-    <header>
-        <h3><a href="{{ post.link }}" target="_blank">{{ post.title }}</a></h3>
+<article>
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                <h1><a href="{{ post.link }}" target="_blank">{{ post.title }}</a></h1>
 
-        <div class="meta">
-            <address class="author">
-                <span class="glyphicon glyphicon-user"></span>
-                <a rel="author" href="{{ post.link }}" target="_blank">{{ post.author }}</a>
-            </address>
+                {{ post.excerpt|raw }}
 
-            <time datetime="{{ post.updated|date("Y-m-d") }}" title="{{ post.updated|date("r") }}">
-                <span class="glyphicon glyphicon-calendar"></span> 
-                {{ post.updated|date("d/m/Y à H\\hi") }}
-            </time>
+                <p><a href="{{ post.link }}" target="_blank">{{ post.link }}</a></p>
+            </div>
         </div>
-    </header>
-
-    <div class="page-content">
-        {{ post.excerpt|raw }}
-
-        <p><a href="{{ post.link }}" target="_blank">{{ post.link }}</a></p>
     </div>
 </article>