From b32028566b0ea751ec69f3fc847393c39a7a28ac Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 17:48:27 +0100
Subject: [PATCH] Fix layout of planet pages.

---
 templates/planet/index.html   | 33 ++++++++++++++++--------------
 templates/planet/posting.html | 38 ++++++++++++++++-------------------
 templates/planet/user.html    | 13 ++++++++----
 3 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/templates/planet/index.html b/templates/planet/index.html
index e321824..15cebd6 100644
--- a/templates/planet/index.html
+++ b/templates/planet/index.html
@@ -11,24 +11,27 @@
 	<br>
 
 	<div class="row">
-		<div class="col-lg-4 col-md-4 col-lg-offset-4">
+		<div class="col-lg-6 col-md-6 col-lg-offset-3 ac">
 			<form class="form-inline" action="/search" method="GET">
-				<div class="input-append">
-					<input type="text" class="form-control input-medium planet-search-autocomplete" name="q"
+				<div class="form-group">
+					<label class="sr-only" for="searchBox">{{ _("Search") }}</label>
+					<input type="text" class="form-control planet-search-autocomplete" name="q" id="searchBox"
 						placeholder="{{ _("Search") }}" autocomplete="off">
-					<button type="submit" class="btn btn-default"><i class="icon-search"></i></button>
-				</div>
+					<button type="submit" class="btn btn-default">
+						<i class="glyphicon glyphicon-search"></i>
+					</button>
 
-				<div class="btn-group">
-					<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
-						{{ _("All posts from") }}
-						<span class="caret"></span>
-					</a>
-					<ul class="dropdown-menu">
-						{% for y in years %}
-							<li><a href="/year/{{ y }}">{{ y }}</a></li>
-						{% end %}
-					</ul>
+					<div class="btn-group">
+						<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+							{{ _("All posts from") }}
+							<span class="caret"></span>
+						</a>
+						<ul class="dropdown-menu">
+							{% for y in years %}
+								<li><a href="/year/{{ y }}">{{ y }}</a></li>
+							{% end %}
+						</ul>
+					</div>
 				</div>
 			</form>
 		</div>
diff --git a/templates/planet/posting.html b/templates/planet/posting.html
index 4524a2a..9c622b0 100644
--- a/templates/planet/posting.html
+++ b/templates/planet/posting.html
@@ -9,27 +9,23 @@
 		</h1>
 	</div>
 
-	<div class="row">
-		<div class="col-lg-9 col-md-9">
-			{% if entry.is_draft() %}
-				<div class="alert alert-warning alert-dismissable">
-					<button type="button" class="close" data-dismiss="alert">&times;</button>
-					<strong>{{ _("Heads up!") }}</strong> {{ _("This post is a draft and has not been published, yet.") }}
-				</div>
-			{% end %}
-
-			{% raw entry.text %}
+	{% if entry.is_draft() %}
+		<div class="alert alert-warning alert-dismissable">
+			<button type="button" class="close" data-dismiss="alert">&times;</button>
+			<strong>{{ _("Heads up!") }}</strong> {{ _("This post is a draft and has not been published, yet.") }}
 		</div>
+	{% end %}
 
-		<p class="pull-right" style="clear: both;">
-			{% if entry.tags %}
-				{{ _("Tags") }}:
-				{% for tag in entry.tags %}
-					<a href="/search?q={{ tag }}">{{ tag }}</a>
-				{% end %} &bull;
-			{% end %}
-			{{ _("Posted by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.cn }}</a>
-			{{ _("on") }} {{ locale.format_date(entry.published, shorter=True) }}
-		</p>
-	</div>
+	{% raw entry.text %}
+
+	<p class="clear pull-right">
+		{% if entry.tags %}
+			{{ _("Tags") }}:
+			{% for tag in entry.tags %}
+				<a href="/search?q={{ tag }}">{{ tag }}</a>
+			{% end %} &bull;
+		{% end %}
+		{{ _("Posted by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.cn }}</a>
+		{{ _("on") }} {{ locale.format_date(entry.published, shorter=True) }}
+	</p>
 {% end block %}
diff --git a/templates/planet/user.html b/templates/planet/user.html
index 369a381..189b5a0 100644
--- a/templates/planet/user.html
+++ b/templates/planet/user.html
@@ -37,15 +37,20 @@
 
 		<div class="col-lg-3 col-md-3">
 			<div class="well">
-				<img class="img-rounded" src="{{ author.gravatar_icon(232) }}" alt="{{ author.cn }}" />
+				<img class="img-thumbnail" src="{{ author.gravatar_icon(213) }}" alt="{{ author.cn }}" />
+
 				<hr>
+
+				<i class="glyphicon glyphicon-user"></i>
 				<a href="/user/{{ author.uid }}">
-					<i class="glyphicon glyphicon-user"></i>
-					{{ escape(author.cn) }}
+					{{ author.cn }}
 				</a>
+
 				<hr>
+
+				<i class="glyphicon glyphicon-envelope"></i>
 				<a href="mailto:{{ author.email }}">
-					<i class="glyphicon glyphicon-envelope"></i> {{ _("Mail") }}
+					{{ _("Mail") }}
 				</a>
 			</div>
 		</div>
-- 
2.39.2