From 7385f3c549fe97cd25a6ac7450a878e26319723b Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 26 Sep 2013 18:40:22 -0300
Subject: [PATCH] Updating planet layout

---
 src/planet/templates/common/pagination.html       | 32 ++++++++++++++------------------
 src/planet/templates/feedzilla/base.html          | 15 +++++++++------
 src/planet/templates/feedzilla/index.html         | 25 ++++++++++++-------------
 src/static/css/screen.css                         | 57 +++++++++++++++++++++++++--------------------------------
 src/super_archives/templates/message-preview.html |  2 +-
 5 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/src/planet/templates/common/pagination.html b/src/planet/templates/common/pagination.html
index 4cb83d3..270f64e 100644
--- a/src/planet/templates/common/pagination.html
+++ b/src/planet/templates/common/pagination.html
@@ -1,38 +1,34 @@
 {% load i18n %}
 {% if page.paginator.num_pages > 1 %}
-<div class="pagination">
+<div class="text-center">
+  <ul class="pagination">
     {% if page.has_previous %}
-    <a href="{{ alterpath }}{{ page.previous_page_url }}">&laquo; {% trans "previous" %}</a>
-    {% else %}
-    <span class="control">&laquo; {% trans "previous" %}</span>
+    <li><a href="{{ alterpath }}{{ page.previous_page_url }}">&laquo;</a></li>
     {% endif %}
 
     {% if page.paginator.frame_start_page > 1 %}
-    <a href="{{ alterpath }}{{ page.first_page_url }}">1</a>
-        {% if page.paginator.frame_start_page > 2 %}
-        <span class="control">...</span>
-        {% endif %}
+    <li><a href="{{ alterpath }}{{ page.first_page_url }}">1</a></li>
+    {% endif %}
+    {% if page.paginator.frame_start_page > 2 %}
+    <li class="disabled"><a href="#">...</a></li>
     {% endif %}
 
     {% for number, url in page.paginator.frame %}
     {% if not url %}..{% else %}
-    <a {% ifequal page.number number%}class="active"{% endifequal %} href="{{ alterpath }}{{ url }}">{{ number }}</a>
+    <li {% ifequal page.number number%}class="active"{% endifequal %}><a href="{{ alterpath }}{{ url }}">{{ number }}</a></li>
     {% endif %}
     {% endfor %}
 
     {% if page.paginator.frame_end_page != page.paginator.num_pages %}
-        {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %}
-        <span class="control">...</span>
-        {% endif %}
-        <a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a>
+      {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %}
+      <li class="disabled"><a href="#">...</a></li>
+      {% endif %}
+    <li><a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a></li>
     {% endif %}
 
     {% if page.has_next %}
-    <a href="{{ alterpath }}{{ page.next_page_url }}">{% trans "next" %} &raquo;</a>
-    {% else %}
-    <span class="control">{% trans "next" %} &raquo;</span>
+    <li><a href="{{ alterpath }}{{ page.next_page_url }}">&raquo;</a></li>
     {% endif %}
-
-    <div class="clear"></div>
+  </ul>
 </div>
 {% endif %}
diff --git a/src/planet/templates/feedzilla/base.html b/src/planet/templates/feedzilla/base.html
index 09bee25..44df98a 100644
--- a/src/planet/templates/feedzilla/base.html
+++ b/src/planet/templates/feedzilla/base.html
@@ -5,21 +5,24 @@
     <h2>{% trans 'Planet' %}</h2>
     <hr/>
 
-    <div class="row">
-      {% block feedzilla_content %}{% endblock %}
+    <div id="planet" class="row">
+      <div class="col-lg-9">
+        {% block feedzilla_content %}{% endblock %}
+      </div>
   
       <div class="col-lg-3">
         <div class="well">
-          <a href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
-        </div>
-        <div class="well">
           <h3>{% trans 'Tags' %}</h3>
-          {% include_tagcloud 'feedzilla.post' %}
+          {% feedzilla_tag_cloud %}
         </div>
         <div class="well">
           <h3>{% trans 'Source Blogs' %}</h3>
           {% feedzilla_donor_list %}
+          <div class="text-center">
+            <a class="btn btn-primary" href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
+          </div>
         </div>
       </div>
     </div>
+
 {% endblock %}
diff --git a/src/planet/templates/feedzilla/index.html b/src/planet/templates/feedzilla/index.html
index 7003155..d9ef686 100644
--- a/src/planet/templates/feedzilla/index.html
+++ b/src/planet/templates/feedzilla/index.html
@@ -3,17 +3,16 @@
 
 {% block feedzilla_content %}
 
-<div class="col-lg-9">
-  {% for post in page.object_list %}
-    {% include 'feedzilla/_post_template.html' %}
-    <hr>
-    {% empty %}
-      <h2>{% trans 'There&#39;s no RSS registered' %}</h2>
-      <h3>{% trans 'Please' %}
-<a href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
-      {% trans 'to submit a blog' %}</h3>
-  {% endfor %}
-  
-  {% include "pagination.html" %}
-</div>
+{% for post in page.object_list %}
+  {% include 'feedzilla/_post_template.html' %}
+  <hr>
+  {% empty %}
+    <h2>{% trans 'There is no RSS registered' %}</h2>
+    <h3>{% trans 'Please' %}
+ href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
+    {% trans 'to submit a blog' %}</h3>
+{% endfor %}
+
+{% include "common/pagination.html" %}
+
 {% endblock %}
diff --git a/src/static/css/screen.css b/src/static/css/screen.css
index 3ee13dc..24bbb2e 100644
--- a/src/static/css/screen.css
+++ b/src/static/css/screen.css
@@ -70,38 +70,6 @@ body {
     margin-right: 5px;
 }
 
-.tag {
-    text-decoration: none;
-    background-color: #2183b3;
-    padding: 2px 4px;
-    border-radius: 5px;
-    font-size: 85%;
-    color: #fff;
-    margin-right: 4px;
-    margin-left: 4px;
-    line-height: 2;
-    white-space: nowrap;
-}
-
-.tag:hover,
-.tag:focus {
-    background-color: #21b6e6;
-    color: #fff;
-}
-
-.tag-cloud .size-1 {
-    font-size: 90%;
-}
-.tag-cloud .size-2 {
-    font-size: 100%;
-}
-.tag-cloud .size-3 {
-    font-size: 130%;
-}
-.tag-cloud .size-4 {
-    font-size: 150%;
-}
-
 .subject,
 .subject a {
     color: #000;
@@ -349,3 +317,28 @@ ul.unstyled-list .glyphicon-chevron-right {
     border: none;
 }
 /* End of Converse JS*/
+
+
+/* Feedzilla */
+
+#planet .well h3 {
+    margin-top: 0;
+}
+
+.tag-cloud .size-1 {
+    font-size: 0.9em;
+}
+
+.tag-cloud .size-2 {
+    font-size: 1.2em;
+}
+
+.tag-cloud .size-3 {
+    font-size: 1.4em;
+}
+
+.tag-cloud .size-4 {
+    font-size: 1.6em;
+}
+
+/* end Feedzilla */
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index 7b457e9..d336140 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -13,7 +13,7 @@
 
   {% if doc.mailinglist %}
   <a href="{% url 'super_archives.views.list_messages' %}?list={{ doc.mailinglist }}">
-    <span class="tag">{{ doc.mailinglist }}</span>
+    <span class="label label-primary">{{ doc.mailinglist }}</span>
   </a>
   {% endif %}
 
--
libgit2 0.21.2