From 53664d15c32391885fd0a23f9df41089ff7efeef Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 26 Mar 2014 15:01:16 +0100 Subject: [PATCH] Fix some broken layout on index page. --- static/css/style.css | 5 +- templates/index.html | 211 +++++++++++++++++++++---------------------- 2 files changed, 105 insertions(+), 111 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 85049a2..98aeb4e 100644 --- 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 82c8da5..0ba1e25 100644 --- a/templates/index.html +++ b/templates/index.html @@ -129,95 +129,91 @@
-
-

- {{ _("What's new?") }} - [RSS] -

- - - {% for item in latest_news %} - - - - - {% end %} -
- {{ locale.format_date(item.published, relative=True, shorter=True) }} ‐ - - {{ item.title }} -
- -
- -

- {{ _("IPFire Planet") }} - [RSS] -

- - - {% for item in planet_posts %} - - - - - {% end %} -
- {{ locale.format_date(item.published, relative=True, shorter=True) }} ‐ - - {{ item.title }} -
+
+
+

+ {{ _("What's new?") }} + [RSS] +

-
+ + {% for item in latest_news %} + + + + + {% end %} +
+ {{ locale.format_date(item.published, relative=True, shorter=True) }} ‐ + + {{ item.title }} +
+ +
- {% if wishlist_items %} -

- {{ _("IPFire Wishlist") }} - {{ _("The IPFire Crowdfunding Platform") }} -

+

+ {{ _("IPFire Planet") }} + [RSS] +

- - {% for item in wishlist_items %} +
+ {% for item in planet_posts %} - + {% end %}
- {% if item.is_new() %} - {{ _("NEW") }} - {% elif item.remaining_days and item.remaining_days <= 10 %} - - {{ _("one day left", "%(num)s days left", item.remaining_days) % { "num" : item.remaining_days } }} - - {% else %} - - {{ _("%d%% funded") % item.percentage }} - - {% end %} - - {{ item.title }} - -
- -
-
-
+ 		+ {{ locale.format_date(item.published, relative=True, shorter=True) }} ‐ + + {{ item.title }}
-
- {% end %} + {% if wishlist_items %} +
+ +

+ {{ _("IPFire Wishlist") }} + {{ _("The IPFire Crowdfunding Platform") }} +

+ + + {% for item in wishlist_items %} + + + + {% end %} +
+ {% if item.is_new() %} + {{ _("NEW") }} + {% elif item.remaining_days and item.remaining_days <= 10 %} + + {{ _("one day left", "%(num)s days left", item.remaining_days) % { "num" : item.remaining_days } }} + + {% else %} + + {{ _("%d%% funded") % item.percentage }} + + {% end %} + + {{ item.title }} + +
+ +
+
+
+
+ {% end %} +
-
-
- {{ _("Please support us with your donation!") }} +
+
+ Facebook + Twitter
-
-
- Facebook - Twitter -
-
+ {{ _("Please support us with your donation!") }}
@@ -229,45 +225,42 @@
-

- {{ _("IPFire Hardware Appliances & Consulting") }} {{ _("by Lightning Wire Labs") }} -

- -
-
- {% if lang == "de" %} -

- Lightning Wire Labs bietet mit IPFire vorinstallierte Hardware-Appliances an. - Dazu bieten sie professionellen Service & Support durch qualifizierte Consultants. -

- {% else %} -

- Lightning Wire Labs offers hardware appliances that come pre-installed - with the latest version of IPFire. - They also provide professional services & support through their certified consultants. -

- {% end %} +

+ {{ _("IPFire Hardware Appliances & Consulting") }} {{ _("by Lightning Wire Labs") }} +

+ +
+
+ {% if lang == "de" %} +

+ Lightning Wire Labs bietet mit IPFire vorinstallierte Hardware-Appliances an. + Dazu bieten sie professionellen Service & Support durch qualifizierte Consultants. +

+ {% else %} +

+ Lightning Wire Labs offers hardware appliances that come pre-installed + with the latest version of IPFire. + They also provide professional services & support through their certified consultants. +

+ {% end %} +
+ +
+ + Appliance Eco + +
-
+
- Appliance Eco + Appliance Professional
- -
- - Appliance Professional - -
- -
- -

+

www.lightningwirelabs.com -

-
+
-- 2.39.2