From c939421fca0d71bdd9fb1af1b6b3f8e267a742ec Mon Sep 17 00:00:00 2001 From: pebosi Date: Tue, 14 Jan 2014 23:10:28 +0100 Subject: [PATCH] Update wishlist templates --- templates/wishlist/donate.html | 2 +- templates/wishlist/index.html | 10 ++-- templates/wishlist/wish.html | 86 +++++++++++++++++++++++++--------- 3 files changed, 71 insertions(+), 27 deletions(-) diff --git a/templates/wishlist/donate.html b/templates/wishlist/donate.html index 5d659706..f0b4b159 100644 --- a/templates/wishlist/donate.html +++ b/templates/wishlist/donate.html @@ -31,7 +31,7 @@
-
+
{% module DonationBox(wish.tag) %}
diff --git a/templates/wishlist/index.html b/templates/wishlist/index.html index 127984ea..75cb05b9 100644 --- a/templates/wishlist/index.html +++ b/templates/wishlist/index.html @@ -52,7 +52,7 @@
-
+
{% if lang == "de" %} Wenn du dich nicht entscheiden kannst für was deine Spende verwendet werden soll, klicke @@ -64,20 +64,20 @@ {% end %}
-
+
{% if lang == "de" %} Du hast eine Idee, oder glaubst ein wichtiges Feature fehlt und wäre ideal von der Community finanziert? Sende eine E-Mail an:
- wishlist@ipfire.org + wishlist@ipfire.org {% else %} Do you think we are missing a great feature that could be funded by the community? Write us an email about it to:
- wishlist@ipfire.org + wishlist@ipfire.org {% end %}
-
+
{% if lang == "de" %} Bereits abgelaufene Sammlungen finden sich hier. diff --git a/templates/wishlist/wish.html b/templates/wishlist/wish.html index 15fa6233..82f3688f 100644 --- a/templates/wishlist/wish.html +++ b/templates/wishlist/wish.html @@ -1,29 +1,73 @@ -{% extends "base.html" %} +
  • +
    + {% if not short %} + {% if wish.remaining_days <= 10 and wish.remaining_days >= 0 %} + + {{ _("Only a few days left!") }} + + {% end %} -{% block title %}{{ wish.title }} - {{ _("Wish") }}{% end block %} +

    + {{ escape(wish.title) }} +

    -{% block body %} -
    -

    {{ wish.title }}

    -
    + {% raw wish.description %} +
    + {% end %} - {% module Wishlist([wish,], short=True) %} +
    +
    +
    - {% raw wish.description %} +
    +
    +

    + + {{ _("Donate") }} + +

    +
    -
    +
    +
    +
    +
    +

    {{ "%d%%" % wish.percentage }}

    +

    {{ _("funded") }}

    +
    -

    - - {{ _("Launched: %s") % locale.format_date(wish.date_start, full_format=True) }} +

    +

    {% raw _("%s €") % wish.donated %}

    +

    {{ _("donated") }}

    +
    - • +
    + {% if wish.status == "running" %} + {% if wish.remaining_days %} +

    {{ wish.remaining_days }}

    +

    {{ _("day to go", "days to go", wish.remaining_days) }}

    + {% else %} +

    {% raw _("%s €") % (wish.goal - wish.donated) %}

    +

    {{ _("to go") }}

    + {% end %} + {% elif wish.status == "in_progress" %} +

    {{ _("In progress") }}

    + {% elif wish.status == "finished" %} +

    {{ _("Finished") }}

    + {% else %} +

    {{ _("Funding ended") }}

    + {% end %} +
    +
    +
    +
    - {% if wish.date_end %} - - {{ _("Funding ends: %s") % locale.format_date(wish.date_end, full_format=True) }} - {% else %} - {{ _("This funding runs until the goal is reached.") }} - {% end %} -

    -{% end block %} +
    +
    +

    + {{ _("Share this wish with your friends and help us promote it!") }} +

    +
    +
    +
    +
    • -- 2.47.3