Update planet templates

diff --git a/templates/planet/base.html b/templates/planet/base.html
index 27d2545f951310db714749a627521cc057ebc3e2..da6c70acd0942964daa9749e9e162fe81cf4c1c8 100644 (file)
--- a/templates/planet/base.html
+++ b/templates/planet/base.html
@@ -4,7 +4,7 @@
        <header class="jumbotron subhead" id="overview">
                <div class="container">
                        <h1>{{ _("IPFire Planet") }}</h1>
-                       <p class="lead">
+                       <p>
                                {% block subtitle %}
                                        {{ _("The official blog of the IPFire team") }}
                                {% end block %}

diff --git a/templates/planet/index.html b/templates/planet/index.html
index 9b84ca5f4e83d3999527927158fbc5541c08decc..e3218248e9745b9c473ff713bdcd82b1f4e88cbf 100644 (file)
--- a/templates/planet/index.html
+++ b/templates/planet/index.html
@@ -11,16 +11,16 @@
        <br>
 
        <div class="row">
-               <div class="span4 offset4">
+               <div class="col-lg-4 col-md-4 col-lg-offset-4">
                        <form class="form-inline" action="/search" method="GET">
                                <div class="input-append">
-                                       <input type="text" class="input-medium planet-search-autocomplete" name="q"
+                                       <input type="text" class="form-control input-medium planet-search-autocomplete" name="q"
                                                placeholder="{{ _("Search") }}" autocomplete="off">
-                                       <button type="submit" class="btn"><i class="icon-search"></i></button>
+                                       <button type="submit" class="btn btn-default"><i class="icon-search"></i></button>
                                </div>
 
                                <div class="btn-group">
-                                       <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                                       <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
                                                {{ _("All posts from") }}
                                                <span class="caret"></span>
                                        </a>

diff --git a/templates/planet/posting.html b/templates/planet/posting.html
index 921ba408cf866da8127a67aa38ceca5794156d5a..4524a2abe2164ba8d580b418d1c555ca122d601f 100644 (file)
--- a/templates/planet/posting.html
+++ b/templates/planet/posting.html
@@ -10,9 +10,9 @@
        </div>
 
        <div class="row">
-               <div class="span9">
+               <div class="col-lg-9 col-md-9">
                        {% if entry.is_draft() %}
-                               <div class="alert">
+                               <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>

diff --git a/templates/planet/search.html b/templates/planet/search.html
index 71de0a66086b3e556028891796874cd9256b94e3..a3e79ab5c9a71d25bac2190545c5b1a096c93995 100644 (file)
--- a/templates/planet/search.html
+++ b/templates/planet/search.html
@@ -12,7 +12,7 @@
                        {% module PlanetEntry(entry) %}
                {% end %}
        {% else %}
-               <p class="lead muted ac">
+               <p class="lead text-muted ac">
                        {{ _("No results found for '%s'") % query }}
                </p>
        {% end %}

diff --git a/templates/planet/user.html b/templates/planet/user.html
index 82387c11efcdac091128a6abd0332683158fc906..369a381db990b141a9d3fa5d9648ff22a1147274 100644 (file)
--- a/templates/planet/user.html
+++ b/templates/planet/user.html
@@ -4,7 +4,7 @@
 
 {% block body %}
        <div class="row">
-               <div class="span9">
+               <div class="col-lg-9 col-md-9">
                        {% block bodyA %}
                                <div class="page-header">
                                        <h1>{{ author.cn }}'s posts</h1>
@@ -16,7 +16,7 @@
                                        {% end %}
 
                                        <div class="row">
-                                               <div class="span9">
+                                               <div class="col-lg-9 col-md-9">
                                                        <ul class="pager">
                                                                <li class="previous">
                                                                        <a href="?offset={{ offset }}">&larr; {{ _("Older posts") }}</a>
@@ -35,17 +35,17 @@
                        {% end block %}
                </div>
 
-               <div class="span3">
+               <div class="col-lg-3 col-md-3">
                        <div class="well">
                                <img class="img-rounded" src="{{ author.gravatar_icon(232) }}" alt="{{ author.cn }}" />
                                <hr>
                                <a href="/user/{{ author.uid }}">
-                                       <i class="icon-user"></i>
+                                       <i class="glyphicon glyphicon-user"></i>
                                        {{ escape(author.cn) }}
                                </a>
                                <hr>
                                <a href="mailto:{{ author.email }}">
-                                       <i class="icon-envelope"></i> {{ _("Mail") }}
+                                       <i class="glyphicon glyphicon-envelope"></i> {{ _("Mail") }}
                                </a>
                        </div>
                </div>