From: Michael Tremer Date: Mon, 13 May 2013 09:50:03 +0000 (+0200) Subject: Update index page. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d74a9b9dfb896753eaddff14d514b915c69bab5;p=ipfire.org.git Update index page. Show more news and planet posts and link social networks in a box. Add LWL ad. --- diff --git a/static/css/style.css b/static/css/style.css index 943ce7a8..1a5af1c3 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -15,6 +15,10 @@ body { text-align: center; } +.ar { + text-align: right; +} + .clear { clear: both; } @@ -380,3 +384,12 @@ section > ul li { .planet-table td.author { width: 10em; } + +.news-entries td.date { + width: 8em; + text-align: right; +} + +.well-white { + background-color: white; +} diff --git a/static/images/LWL/appliance-eco.jpg b/static/images/LWL/appliance-eco.jpg new file mode 100644 index 00000000..13105a14 Binary files /dev/null and b/static/images/LWL/appliance-eco.jpg differ diff --git a/static/images/LWL/appliance-pro.jpg b/static/images/LWL/appliance-pro.jpg new file mode 100644 index 00000000..4237ed07 Binary files /dev/null and b/static/images/LWL/appliance-pro.jpg differ diff --git a/templates/index.html b/templates/index.html index 5abc678b..ff40cd94 100644 --- a/templates/index.html +++ b/templates/index.html @@ -21,14 +21,11 @@ @@ -39,19 +36,8 @@ {% block body %}
-

- {{ _("New!") }} - {% if lang == "de" %} - IPFire Wunschliste - Die Crowdfunding-Plattform des IPFire-Projekts. - {% else %} - IPFire wishlist - the crowd funding platform for the IPFire project. - {% end %} -

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

IPFire ist eine gehärtete Linux-Appliance-Distribution @@ -83,23 +69,8 @@

{% end %} -
- -
-

{{ _("What's new?") }}

- -
    - {% for item in latest_news %} -
  • - [{{ locale.format_date(item.date, relative=True, shorter=True) }}] ‐ - {{ item.title }} -
    • - {% end %} -
-
-
+
-
{{ _(

{{ _("Security") }}

@@ -145,7 +116,7 @@ {% else %}

IPFire is free software and developed by an open community, - that makes IPFire better every single day. + that improves it every single day.

{% end %} @@ -154,6 +125,103 @@

{{ _("Read more") }} »

+ +
+ +
+
+

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

+ + + {% for item in latest_news %} + + + + + {% end %} +
+ {{ locale.format_date(item.date, 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 }} +
+ +
+ +
+
+ {{ _("Please support us with your donation!") }} +
+ +
+
+ Facebook + Twitter +
+
+
+
+ +
+

+ {{ _("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 Professional + +
+ + Appliance Eco + +
+ +
+ +

+ www.lightningwirelabs.com +

+
{% end block %} diff --git a/translations/de_DE/LC_MESSAGES/webapp.po b/translations/de_DE/LC_MESSAGES/webapp.po index 12872980..71aed02b 100644 --- a/translations/de_DE/LC_MESSAGES/webapp.po +++ b/translations/de_DE/LC_MESSAGES/webapp.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-04 11:38+0200\n" +"POT-Creation-Date: 2013-05-13 11:46+0200\n" "PO-Revision-Date: 2013-02-19 12:38+0100\n" "Last-Translator: Michael Tremer \n" "Language-Team: LANGUAGE \n" @@ -21,62 +21,62 @@ msgstr "" msgid "Unknown author" msgstr "Unbekannter Autor" -#: webapp/__init__.py:278 +#: webapp/__init__.py:285 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "January" msgstr "Januar" -#: webapp/__init__.py:280 +#: webapp/__init__.py:287 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "February" msgstr "Februar" -#: webapp/__init__.py:282 +#: webapp/__init__.py:289 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "March" msgstr "März" -#: webapp/__init__.py:284 +#: webapp/__init__.py:291 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "April" msgstr "April" -#: webapp/__init__.py:286 +#: webapp/__init__.py:293 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "May" msgstr "Mai" -#: webapp/__init__.py:288 +#: webapp/__init__.py:295 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "June" msgstr "Juni" -#: webapp/__init__.py:290 +#: webapp/__init__.py:297 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "July" msgstr "Juli" -#: webapp/__init__.py:292 +#: webapp/__init__.py:299 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "August" msgstr "August" -#: webapp/__init__.py:294 +#: webapp/__init__.py:301 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "September" msgstr "September" -#: webapp/__init__.py:296 +#: webapp/__init__.py:303 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "October" msgstr "Oktober" -#: webapp/__init__.py:298 +#: webapp/__init__.py:305 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "November" msgstr "November" -#: webapp/__init__.py:300 +#: webapp/__init__.py:307 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "December" msgstr "Dezember" @@ -213,6 +213,14 @@ msgstr "Älter" msgid "Newer" msgstr "Neuer" +#: templates/wishlist/base.html:6 +msgid "IPFire Wishlist" +msgstr "IPFire Wunschliste" + +#: templates/wishlist/base.html:8 +msgid "Crowd funding for the IPFire project" +msgstr "Crowdfunding für das IPFire-Projekt" + #: templates/wishlist/modules/wish.html:6 msgid "Only a few days left!" msgstr "Nur noch wenige Tage!" @@ -220,7 +228,7 @@ msgstr "Nur noch wenige Tage!" #: templates/wishlist/modules/wish.html:26 templates/wishlist/donate.html:3 #: templates/download-splash.html:37 templates/modules/menu.html:47 #: templates/static/getinvolved.html:120 templates/static/donation.html:3 -#: templates/static/donation.html:8 templates/index.html:30 +#: templates/static/donation.html:8 msgid "Donate" msgstr "Spenden" @@ -264,10 +272,6 @@ msgstr "" msgid "Home" msgstr "Startseite" -#: templates/wishlist/index.html:7 -msgid "Crowd funding for the IPFire project" -msgstr "Crowdfunding für das IPFire-Projekt" - #: templates/wishlist/donate.html:13 templates/wishlist/donate.html:23 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7 #: templates/base.html:78 @@ -508,10 +512,26 @@ msgstr "Downloads" msgid "Compose new entry" msgstr "Neuen Beitrag erstellen" -#: templates/admin-planet-compose.html:14 templates/admin-planet.html:14 +#: templates/admin-planet-compose.html:16 templates/admin-planet.html:14 msgid "Title" msgstr "Titel" +#: templates/admin-planet-compose.html:33 templates/planet/posting.html:19 +msgid "Tags" +msgstr "Tags" + +#: templates/admin-planet-compose.html:41 +msgid "Save" +msgstr "Speichern" + +#: templates/admin-planet-compose.html:42 +msgid "Preview" +msgstr "Vorschau" + +#: templates/admin-planet-compose.html:43 +msgid "Cancel" +msgstr "Abbrechen" + #: templates/download-splash.html:3 templates/download-splash.html:7 msgid "Thanks for downloading IPFire!" msgstr "Vielen Dank, für das Herunterladen von IPFire! " @@ -952,7 +972,7 @@ msgstr "Informiere dich" #: templates/news.html:61 templates/planet/year.html:3 #: templates/planet/user.html:3 templates/planet/search.html:3 #: templates/planet/base.html:6 templates/planet/index.html:3 -#: templates/planet/posting.html:3 +#: templates/planet/posting.html:3 templates/index.html:154 msgid "IPFire Planet" msgstr "IPFire Planet" @@ -967,7 +987,7 @@ msgid "About IPFire" msgstr "Über IPFire" #: templates/base-feature.html:9 templates/static/features.html:88 -#: templates/static/features.html:1354 templates/index.html:104 +#: templates/static/features.html:1354 templates/index.html:75 msgid "Security" msgstr "Sicherheit" @@ -1063,13 +1083,13 @@ msgstr "Accountadministrator" #: templates/planet/year.html:6 #, python-format msgid "Year %s" -msgstr "" +msgstr "Jahr %s" -#: templates/planet/user.html:22 templates/planet/index.html:44 +#: templates/planet/user.html:22 templates/planet/index.html:45 msgid "Older posts" msgstr "Ältere Beiträge" -#: templates/planet/user.html:26 templates/planet/index.html:48 +#: templates/planet/user.html:26 templates/planet/index.html:49 msgid "Newer posts" msgstr "Neuere Beiträge" @@ -1087,26 +1107,26 @@ msgstr "Mail" #: templates/planet/search.html:6 #, python-format msgid "Search results for '%s'" -msgstr "" +msgstr "Suchergebnisse für '%s'" #: templates/planet/search.html:16 #, python-format msgid "No results found for '%s'" -msgstr "" +msgstr "Keine Resultate gefunden für '%s'" #: templates/planet/base.html:9 msgid "The official blog of the IPFire team" msgstr "Das offizielle Blog des IPFire-Team" -#: templates/planet/index.html:23 +#: templates/planet/index.html:24 msgid "All posts from" -msgstr "" +msgstr "Alle Posts aus" -#: templates/planet/posting.html:18 templates/modules/planet-entry.html:14 +#: templates/planet/posting.html:24 templates/modules/planet-entry.html:14 msgid "Posted by" msgstr "Erstellt von" -#: templates/planet/posting.html:19 templates/modules/planet-entry.html:15 +#: templates/planet/posting.html:25 templates/modules/planet-entry.html:15 msgid "on" msgstr "am" @@ -1510,26 +1530,34 @@ msgstr "Wofür werden Spenden eingesetzt?" msgid "Research & Development" msgstr "Forschung & Entwicklung" -#: templates/index.html:43 -msgid "New!" -msgstr "Neu!" - -#: templates/index.html:89 -msgid "What's new?" -msgstr "Neuigkeiten" - -#: templates/index.html:121 +#: templates/index.html:92 msgid "Flexibility" msgstr "Flexibilität" -#: templates/index.html:138 +#: templates/index.html:109 msgid "Open Source" msgstr "Open Source" -#: templates/index.html:155 +#: templates/index.html:126 msgid "Read more" msgstr "Mehr erfahren" +#: templates/index.html:134 +msgid "What's new?" +msgstr "Neuigkeiten" + +#: templates/index.html:175 +msgid "Please support us with your donation!" +msgstr "Unterstütze dieses Projekt mit deiner Spende!" + +#: templates/index.html:189 +msgid "IPFire Hardware Appliances & Consulting" +msgstr "IPFire Hardware Appliances & Consulting" + +#: templates/index.html:189 +msgid "by Lightning Wire Labs" +msgstr "von Lightning Wire Labs" + #: templates/admin-mirrors-details.html:8 msgid "All mirrors" msgstr "Alle Mirrors" @@ -1666,6 +1694,15 @@ msgstr "%(weekday)s, %(day)s. %(month_name)s" msgid "%(commas)s and %(last)s" msgstr "%(commas)s und %(last)s" +#~ msgid "Please donate!" +#~ msgstr "Spenden!" + +#~ msgid "Support, Services & Consulting" +#~ msgstr "Support, Services & Consulting" + +#~ msgid "New!" +#~ msgstr "Neu!" + #~ msgid "IPFire nopaste service" #~ msgstr "IPFire nopaste Service" @@ -1735,9 +1772,6 @@ msgstr "%(commas)s und %(last)s" #~ msgid "Donation" #~ msgstr "Spende" -#~ msgid "Support this project with your donation!" -#~ msgstr "Unterstütze dieses Projekt mit deiner Spende!" - #~ msgid "Builds" #~ msgstr "Builds" @@ -1768,9 +1802,6 @@ msgstr "%(commas)s und %(last)s" #~ msgid "Twitter" #~ msgstr "Twitter" -#~ msgid "IPFire Wishlist" -#~ msgstr "IPFire Wunschliste" - #~ msgid "Turning an idea into a new feature" #~ msgstr "Verwandle eine Idee in ein neues Feature" diff --git a/translations/webapp.pot b/translations/webapp.pot index 98246f51..0148d8e9 100644 --- a/translations/webapp.pot +++ b/translations/webapp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-04 11:38+0200\n" +"POT-Creation-Date: 2013-05-13 11:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,62 +22,62 @@ msgstr "" msgid "Unknown author" msgstr "" -#: webapp/__init__.py:278 +#: webapp/__init__.py:285 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "January" msgstr "" -#: webapp/__init__.py:280 +#: webapp/__init__.py:287 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "February" msgstr "" -#: webapp/__init__.py:282 +#: webapp/__init__.py:289 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "March" msgstr "" -#: webapp/__init__.py:284 +#: webapp/__init__.py:291 #: /usr/lib/python2.7/site-packages/tornado/locale.py:225 msgid "April" msgstr "" -#: webapp/__init__.py:286 +#: webapp/__init__.py:293 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "May" msgstr "" -#: webapp/__init__.py:288 +#: webapp/__init__.py:295 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "June" msgstr "" -#: webapp/__init__.py:290 +#: webapp/__init__.py:297 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "July" msgstr "" -#: webapp/__init__.py:292 +#: webapp/__init__.py:299 #: /usr/lib/python2.7/site-packages/tornado/locale.py:226 msgid "August" msgstr "" -#: webapp/__init__.py:294 +#: webapp/__init__.py:301 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "September" msgstr "" -#: webapp/__init__.py:296 +#: webapp/__init__.py:303 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "October" msgstr "" -#: webapp/__init__.py:298 +#: webapp/__init__.py:305 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "November" msgstr "" -#: webapp/__init__.py:300 +#: webapp/__init__.py:307 #: /usr/lib/python2.7/site-packages/tornado/locale.py:227 msgid "December" msgstr "" @@ -212,6 +212,14 @@ msgstr "" msgid "Newer" msgstr "" +#: templates/wishlist/base.html:6 +msgid "IPFire Wishlist" +msgstr "" + +#: templates/wishlist/base.html:8 +msgid "Crowd funding for the IPFire project" +msgstr "" + #: templates/wishlist/modules/wish.html:6 msgid "Only a few days left!" msgstr "" @@ -219,7 +227,7 @@ msgstr "" #: templates/wishlist/modules/wish.html:26 templates/wishlist/donate.html:3 #: templates/download-splash.html:37 templates/modules/menu.html:47 #: templates/static/getinvolved.html:120 templates/static/donation.html:3 -#: templates/static/donation.html:8 templates/index.html:30 +#: templates/static/donation.html:8 msgid "Donate" msgstr "" @@ -262,10 +270,6 @@ msgstr "" msgid "Home" msgstr "" -#: templates/wishlist/index.html:7 -msgid "Crowd funding for the IPFire project" -msgstr "" - #: templates/wishlist/donate.html:13 templates/wishlist/donate.html:23 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7 #: templates/base.html:78 @@ -501,10 +505,26 @@ msgstr "" msgid "Compose new entry" msgstr "" -#: templates/admin-planet-compose.html:14 templates/admin-planet.html:14 +#: templates/admin-planet-compose.html:16 templates/admin-planet.html:14 msgid "Title" msgstr "" +#: templates/admin-planet-compose.html:33 templates/planet/posting.html:19 +msgid "Tags" +msgstr "" + +#: templates/admin-planet-compose.html:41 +msgid "Save" +msgstr "" + +#: templates/admin-planet-compose.html:42 +msgid "Preview" +msgstr "" + +#: templates/admin-planet-compose.html:43 +msgid "Cancel" +msgstr "" + #: templates/download-splash.html:3 templates/download-splash.html:7 msgid "Thanks for downloading IPFire!" msgstr "" @@ -941,7 +961,7 @@ msgstr "" #: templates/news.html:61 templates/planet/year.html:3 #: templates/planet/user.html:3 templates/planet/search.html:3 #: templates/planet/base.html:6 templates/planet/index.html:3 -#: templates/planet/posting.html:3 +#: templates/planet/posting.html:3 templates/index.html:154 msgid "IPFire Planet" msgstr "" @@ -956,7 +976,7 @@ msgid "About IPFire" msgstr "" #: templates/base-feature.html:9 templates/static/features.html:88 -#: templates/static/features.html:1354 templates/index.html:104 +#: templates/static/features.html:1354 templates/index.html:75 msgid "Security" msgstr "" @@ -1054,11 +1074,11 @@ msgstr "" msgid "Year %s" msgstr "" -#: templates/planet/user.html:22 templates/planet/index.html:44 +#: templates/planet/user.html:22 templates/planet/index.html:45 msgid "Older posts" msgstr "" -#: templates/planet/user.html:26 templates/planet/index.html:48 +#: templates/planet/user.html:26 templates/planet/index.html:49 msgid "Newer posts" msgstr "" @@ -1087,15 +1107,15 @@ msgstr "" msgid "The official blog of the IPFire team" msgstr "" -#: templates/planet/index.html:23 +#: templates/planet/index.html:24 msgid "All posts from" msgstr "" -#: templates/planet/posting.html:18 templates/modules/planet-entry.html:14 +#: templates/planet/posting.html:24 templates/modules/planet-entry.html:14 msgid "Posted by" msgstr "" -#: templates/planet/posting.html:19 templates/modules/planet-entry.html:15 +#: templates/planet/posting.html:25 templates/modules/planet-entry.html:15 msgid "on" msgstr "" @@ -1499,24 +1519,32 @@ msgstr "" msgid "Research & Development" msgstr "" -#: templates/index.html:43 -msgid "New!" +#: templates/index.html:92 +msgid "Flexibility" +msgstr "" + +#: templates/index.html:109 +msgid "Open Source" msgstr "" -#: templates/index.html:89 +#: templates/index.html:126 +msgid "Read more" +msgstr "" + +#: templates/index.html:134 msgid "What's new?" msgstr "" -#: templates/index.html:121 -msgid "Flexibility" +#: templates/index.html:175 +msgid "Please support us with your donation!" msgstr "" -#: templates/index.html:138 -msgid "Open Source" +#: templates/index.html:189 +msgid "IPFire Hardware Appliances & Consulting" msgstr "" -#: templates/index.html:155 -msgid "Read more" +#: templates/index.html:189 +msgid "by Lightning Wire Labs" msgstr "" #: templates/admin-mirrors-details.html:8 diff --git a/webapp/handlers.py b/webapp/handlers.py index fea68d48..ba8fe1ab 100644 --- a/webapp/handlers.py +++ b/webapp/handlers.py @@ -57,13 +57,16 @@ class IndexHandler(BaseHandler): """ def get(self): # Get a list of the most recent news items and put them on the page. - latest_news = self.news.get_latest(limit=1, locale=self.locale) + latest_news = self.news.get_latest(limit=3, locale=self.locale) + + # Get a list of the most recent planet posts. + planet_posts = self.planet.get_entries(limit=3) # Get the latest release. latest_release = self.releases.get_latest() return self.render("index.html", latest_news=latest_news, - latest_release=latest_release) + planet_posts=planet_posts, latest_release=latest_release) class StaticHandler(BaseHandler):