Update wishlist templates

diff --git a/templates/wishlist/donate.html b/templates/wishlist/donate.html
index 5d659706a7b948801e47a71d1a8261b68dd522df..f0b4b15985f7c3bf3a8d36e8948a5476314b975c 100644 (file)
--- a/templates/wishlist/donate.html
+++ b/templates/wishlist/donate.html
@@ -31,7 +31,7 @@
        <hr>
 
        <div class="row">
-               <div class="span10 offset1">
+               <div class="col-lg-10 col-md-10 col-lg-offset-1">
                        {% module DonationBox(wish.tag) %}
                </div>
        </div>

diff --git a/templates/wishlist/index.html b/templates/wishlist/index.html
index 127984eacfb45368393dfc27e1f5a967b8bd8ead..75cb05b9706282b097cf2c1e09d1429fdfc2ce8e 100644 (file)
--- a/templates/wishlist/index.html
+++ b/templates/wishlist/index.html
@@ -52,7 +52,7 @@
        <hr>
 
        <div class="row">
-               <div class="span4 ac">
+               <div class="col-lg-4 col-md-4 ac">
                        {% if lang == "de" %}
                                Wenn du dich nicht entscheiden kannst für was
                                deine Spende verwendet werden soll, klicke
@@ -64,20 +64,20 @@
                        {% end %}
                </div>
 
-               <div class="span4 ac">
+               <div class="col-lg-4 col-md-4 ac">
                        {% 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:<br>
-                               <i class="icon-envelope"></i> <a href="mailto:wishlist@ipfire.org">wishlist@ipfire.org</a>
+                               <i class="glyphicon glyphicon-envelope"></i> <a href="mailto:wishlist@ipfire.org">wishlist@ipfire.org</a>
                        {% else %}
                                Do you think we are missing a great feature that could be
                                funded by the community? Write us an email about it to:<br>
-                               <i class="icon-envelope"></i> <a href="mailto:wishlist@ipfire.org">wishlist@ipfire.org</a>
+                               <i class="glyphicon glyphicon-envelope"></i> <a href="mailto:wishlist@ipfire.org">wishlist@ipfire.org</a>
                        {% end %}
                </div>
 
-               <div class="span4 ac">
+               <div class="col-lg-4 col-md-4 ac">
                        {% if lang == "de" %}
                                Bereits abgelaufene Sammlungen finden sich
                                <a href="/closed">hier</a>.

diff --git a/templates/wishlist/wish.html b/templates/wishlist/wish.html
index 15fa6233778fc6d8e1a4f54aa2c2bdfec289de87..82f3688fa20633a42661e5a097f7bb810a3b02b4 100644 (file)
--- a/templates/wishlist/wish.html
+++ b/templates/wishlist/wish.html
@@ -1,29 +1,73 @@
-{% extends "base.html" %}
+<li class="col-lg-12 col-md-12">
+       <div class="thumbnail">
+               {% if not short %}
+                       {% if wish.remaining_days <= 10 and wish.remaining_days >= 0 %}
+                               <span class="label label-failure pull-right">
+                                       {{ _("Only a few days left!") }}
+                               </span>
+                       {% end %}
 
-{% block title %}{{ wish.title }} - {{ _("Wish") }}{% end block %}
+                       <h3>
+                               <a href="/wish/{{ wish.slug }}">{{ escape(wish.title) }}</a>
+                       </h3>
 
-{% block body %}
-       <div class="page-header">
-               <h1>{{ wish.title }}</h1>
-       </div>
+                       {% raw wish.description %}
+                       <hr>
+               {% end %}
 
-       {% module Wishlist([wish,], short=True) %}
+               <div class="progress {{ progress_bar }}">
+                       <div class="progress-bar" style="width: {{ "%.2f%%" % wish.percentage_bar }};"></div>
+               </div>
 
-       {% raw wish.description %}
+               <div class="row">
+                       <div class="col-lg-3 col-md-3 ac">
+                               <br><br>
+                               <a class="btn btn-lg btn-primary" href="/wish/{{ wish.slug }}/donate">
+                                       {{ _("Donate") }}
+                               </a>
+                               <br><br>
+                       </div>
 
-       <hr>
+                       <div class="col-lg-6 col-md-6">
+                               <div class="well">
+                                       <div class="row">
+                                               <div class="col-lg-4 col-md-4 ac">
+                                                       <p class="lead">{{ "%d%%" % wish.percentage }}</p>
+                                                       <p>{{ _("funded") }}</p>
+                                                       </div>
 
-       <p class="ac">
-               <i class="icon-calendar"></i>
-               {{ _("Launched: %s") % locale.format_date(wish.date_start, full_format=True) }}
+                                               <div class="col-lg-4 col-md-4 ac">
+                                                       <p class="lead">{% raw _("%s &euro;") % wish.donated %}</p>
+                                                       <p>{{ _("donated") }}</p>
+                                               </div>
 
-               &bull;
+                                               <div class="col-lg-4 col-md-4 ac">
+                                                       {% if wish.status == "running" %}
+                                                               {% if wish.remaining_days %}
+                                                                       <p class="lead">{{ wish.remaining_days }}</p>
+                                                                       <p>{{ _("day to go", "days to go", wish.remaining_days) }}</p>
+                                                               {% else %}
+                                                                       <p class="lead">{% raw _("%s &euro;") % (wish.goal - wish.donated) %}</p>
+                                                                       <p>{{ _("to go") }}</p>
+                                                               {% end %}
+                                                       {% elif wish.status == "in_progress" %}
+                                                               <p class="lead">{{ _("In progress") }}</p>
+                                                       {% elif wish.status == "finished" %}
+                                                               <p class="lead">{{ _("Finished") }}</p>
+                                                       {% else %}
+                                                               <p class="lead">{{ _("Funding ended") }}</p>
+                                                       {% end %}
+                                               </div>
+                                       </div>
+                               </div>
+                       </div>
 
-               {% if wish.date_end %}
-                       <i class="icon-time"></i>
-                       {{ _("Funding ends: %s") % locale.format_date(wish.date_end, full_format=True) }}
-               {% else %}
-                       {{ _("This funding runs until the goal is reached.") }}
-               {% end %}
-       </p>
-{% end block %}
+                       <div class="col-lg-3 col-md-3">
+                               <br>
+                               <p class="ac">
+                                       {{ _("Share this wish with your friends and help us promote it!") }}
+                               </p>
+                       </div>
+               </div>
+       </div>
+</li>