Fix some broken layout on index page.

diff --git a/static/css/style.css b/static/css/style.css
index 85049a2f4b5e1734a9afb1d0d4cbdc8642952534..98aeb4e2a711ed9044274293060e917a7a285f65 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -244,6 +244,7 @@ width: 10em;
 width: 8em;
 text-align: right;
 }
-.table-wishlist-widget td.progress-bar {
-width: 40%;
+
+.table-wishlist-widget {
+       width: 100%;
 }

diff --git a/templates/index.html b/templates/index.html
index 82c8da566fd340fad2bd3b9a00036fbc02e7789b..0ba1e25005d56b9f632a29a0d3dccfd7d1abf799 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -129,95 +129,91 @@
                </div>
 
                <div class="col-lg-6 col-md-6">
-                       <div class="well">
-                               <h4>
-                                       <a href="/news">{{ _("What's new?") }}</a>
-                                       <a class="pull-right" href="http://www.ipfire.org/news.rss"><small>[RSS]</small></a>
-                               </h4>
-
-                               <table class="news-entries">
-                                       {% for item in latest_news %}
-                                               <tr>
-                                                       <td class="date">
-                                                               {{ locale.format_date(item.published, relative=True, shorter=True) }} &dash;
-                                                       </td>
-                                                       <td class="link">
-                                                               <a href="/news/{{ item.slug }}">{{ item.title }}</a>
-                                                       </td>
-                                               </tr>
-                                       {% end %}
-                               </table>
-
-                               <hr>
-
-                               <h4>
-                                       <a href="http://planet.ipfire.org">{{ _("IPFire Planet") }}</a>
-                                       <a class="pull-right" href="http://planet.ipfire.org/rss"><small>[RSS]</small></a>
-                               </h4>
-
-                               <table class="news-entries">
-                                       {% for item in planet_posts %}
-                                               <tr>
-                                                       <td class="date">
-                                                               {{ locale.format_date(item.published, relative=True, shorter=True) }} &dash;
-                                                       </td>
-                                                       <td class="link">
-                                                               <a href="http://planet.ipfire.org/post/{{ item.slug }}">{{ item.title }}</a>
-                                                       </td>
-                                               </tr>
-                                       {% end %}
-                               </table>
+                       <div class="panel panel-default">
+                               <div class="panel-body">
+                                       <h3>
+                                               <a href="/news">{{ _("What's new?") }}</a>
+                                               <a class="pull-right" href="http://www.ipfire.org/news.rss"><small>[RSS]</small></a>
+                                       </h3>
 
-                               <hr>
+                                       <table class="news-entries">
+                                               {% for item in latest_news %}
+                                                       <tr>
+                                                               <td class="date">
+                                                                       {{ locale.format_date(item.published, relative=True, shorter=True) }} &dash;
+                                                               </td>
+                                                               <td class="link">
+                                                                       <a href="/news/{{ item.slug }}">{{ item.title }}</a>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       </table>
+
+                                       <hr>
 
-                               {% if wishlist_items %}
-                                       <h4>
-                                               <a href="http://wishlist.ipfire.org">{{ _("IPFire Wishlist") }}</a>
-                                               <small>{{ _("The IPFire Crowdfunding Platform") }}</small>
-                                       </h4>
+                                       <h3>
+                                               <a href="http://planet.ipfire.org">{{ _("IPFire Planet") }}</a>
+                                               <a class="pull-right" href="http://planet.ipfire.org/rss"><small>[RSS]</small></a>
+                                       </h3>
 
-                                       <table class="table-wishlist-widget">
-                                               {% for item in wishlist_items %}
+                                       <table class="news-entries">
+                                               {% for item in planet_posts %}
                                                        <tr>
-                                                               <td>
-                                                                       {% if item.is_new() %}
-                                                                               <span class="label label-success pull-right">{{ _("NEW") }}</span>
-                                                                       {% elif item.remaining_days and item.remaining_days <= 10 %}
-                                                                               <span class="pull-right">
-                                                                                       {{ _("one day left", "%(num)s days left", item.remaining_days) % { "num" : item.remaining_days } }}
-                                                                               </span>
-                                                                       {% else %}
-                                                                               <span class="pull-right">
-                                                                                       {{ _("%d%% funded") % item.percentage }}
-                                                                               </span>
-                                                                       {% end %}
-
-                                                                       <a href="http://wishlist.ipfire.org/wish/{{ item.slug }}" target="_blank">{{ item.title }}</a>
-
-                                                                       <br class="separator-small">
-
-                                                                       <div class="progress progress-small">
-                                                                               <div class="progress-bar progress-{{ item.progressbar_colour }}" style="width: {{ "%.2f%%" % item.percentage_bar }};"></div>
-                                                                       </div>
+                                                               <td class="date">
+                                                                       {{ locale.format_date(item.published, relative=True, shorter=True) }} &dash;
+                                                               </td>
+                                                               <td class="link">
+                                                                       <a href="http://planet.ipfire.org/post/{{ item.slug }}">{{ item.title }}</a>
                                                                </td>
                                                        </tr>
                                                {% end %}
                                        </table>
 
-                                       <hr>
-                               {% end %}
+                                       {% if wishlist_items %}
+                                               <hr>
+
+                                               <h3>
+                                                       <a href="http://wishlist.ipfire.org">{{ _("IPFire Wishlist") }}</a>
+                                                       <small>{{ _("The IPFire Crowdfunding Platform") }}</small>
+                                               </h3>
+
+                                               <table class="table-wishlist-widget">
+                                                       {% for item in wishlist_items %}
+                                                               <tr>
+                                                                       <td>
+                                                                               {% if item.is_new() %}
+                                                                                       <span class="label label-success pull-right">{{ _("NEW") }}</span>
+                                                                               {% elif item.remaining_days and item.remaining_days <= 10 %}
+                                                                                       <span class="pull-right">
+                                                                                               {{ _("one day left", "%(num)s days left", item.remaining_days) % { "num" : item.remaining_days } }}
+                                                                                       </span>
+                                                                               {% else %}
+                                                                                       <span class="pull-right">
+                                                                                               {{ _("%d%% funded") % item.percentage }}
+                                                                                       </span>
+                                                                               {% end %}
+
+                                                                               <a href="http://wishlist.ipfire.org/wish/{{ item.slug }}" target="_blank">{{ item.title }}</a>
+
+                                                                               <br class="separator-small">
+
+                                                                               <div class="progress progress-small">
+                                                                                       <div class="progress-bar progress-{{ item.progressbar_colour }}" style="width: {{ "%.2f%%" % item.percentage_bar }};"></div>
+                                                                               </div>
+                                                                       </td>
+                                                               </tr>
+                                                       {% end %}
+                                               </table>
+                                       {% end %}
+                               </div>
 
-                               <div class="row">
-                                       <div class="col-lg-10 col-md-10">
-                                               <a href="/donate"><strong>{{ _("Please support us with your donation!") }}</strong></a>
+                               <div class="panel-footer">
+                                       <div class="pull-right">
+                                               <a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
+                                               <a href="https://twitter.com/ipfire"><img src="{{ static_url("images/icons/social/twitter.png") }}" alt="Twitter"></a>
                                        </div>
 
-                                       <div class="col-lg-2 col-md-2">
-                                               <div class="pull-right">
-                                                       <a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
-                                                       <a href="https://twitter.com/ipfire"><img src="{{ static_url("images/icons/social/twitter.png") }}" alt="Twitter"></a>
-                                               </div>
-                                       </div>
+                                       <a href="/donate"><strong>{{ _("Please support us with your donation!") }}</strong></a>
                                </div>
                        </div>
                </div>
@@ -229,45 +225,42 @@
                <div class="col-lg-offset-2 col-lg-8 col-md-8">
                        <div class="panel panel-default">
                                <div class="panel-body">
-                               <h4>
-                                       {{ _("IPFire Hardware Appliances & Consulting") }} <small>{{ _("by Lightning Wire Labs") }}</small>
-                               </h4>
-
-                               <div class="row">
-                                       <div class="col-lg-6 col-md-6">
-                                               {% if lang == "de" %}
-                                                       <p>
-                                                               Lightning Wire Labs bietet mit IPFire vorinstallierte Hardware-Appliances an.
-                                                               Dazu bieten sie professionellen Service &amp; Support durch qualifizierte Consultants.
-                                                       </p>
-                                               {% else %}
-                                                       <p>
-                                                               Lightning Wire Labs offers hardware appliances that come pre-installed
-                                                               with the latest version of IPFire.
-                                                               They also provide professional services &amp; support through their certified consultants.
-                                                       </p>
-                                               {% end %}
+                                       <h3>
+                                               {{ _("IPFire Hardware Appliances & Consulting") }} <small>{{ _("by Lightning Wire Labs") }}</small>
+                                       </h3>
+
+                                       <div class="row">
+                                               <div class="col-lg-6 col-md-6">
+                                                       {% if lang == "de" %}
+                                                               <p>
+                                                                       Lightning Wire Labs bietet mit IPFire vorinstallierte Hardware-Appliances an.
+                                                                       Dazu bieten sie professionellen Service &amp; Support durch qualifizierte Consultants.
+                                                               </p>
+                                                       {% else %}
+                                                               <p>
+                                                                       Lightning Wire Labs offers hardware appliances that come pre-installed
+                                                                       with the latest version of IPFire.
+                                                                       They also provide professional services &amp; support through their certified consultants.
+                                                               </p>
+                                                       {% end %}
+                                               </div>
+
+                                               <div class="col-lg-6 col-md-6 ac">
+                                                       <a href="http://www.lightningwirelabs.com/products/ipfire/appliances" target="_blank">
+                                                               <img src="{{ static_url("images/LWL/appliance-eco.jpg") }}" alt="Appliance Eco">
+                                                       </a>
+                                               </div>
                                        </div>
 
-                                       <div class="col-lg-6 col-md-6 ac">
+                                       <div class="ac">
                                                <a href="http://www.lightningwirelabs.com/products/ipfire/appliances" target="_blank">
-                                                       <img src="{{ static_url("images/LWL/appliance-eco.jpg") }}" alt="Appliance Eco">
+                                                       <img src="{{ static_url("images/LWL/appliance-pro.jpg") }}" alt="Appliance Professional">
                                                </a>
                                        </div>
                                </div>
-
-                               <div class="ac">
-                                       <a href="http://www.lightningwirelabs.com/products/ipfire/appliances" target="_blank">
-                                               <img src="{{ static_url("images/LWL/appliance-pro.jpg") }}" alt="Appliance Professional">
-                                       </a>
-                               </div>
-
-                               <hr>
-
-                               <p class="ac">
+                               <div class="panel-footer ac">
                                        <a href="http://www.lightningwirelabs.com/" target="_blank">www.lightningwirelabs.com</a>
-                               </p>
-                       </div>
+                               </div>
                        </div>
                </div>
        </div>