fix wishlist templates

diff --git a/templates/wishlist/modules/wish.html b/templates/wishlist/modules/wish.html
index 82f3688fa20633a42661e5a097f7bb810a3b02b4..1c9538e0dcbea8342518e479d679addd553c04f6 100644 (file)
--- a/templates/wishlist/modules/wish.html
+++ b/templates/wishlist/modules/wish.html
@@ -22,7 +22,7 @@
                <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">
+                               <a class="btn btn-large btn-primary" href="/wish/{{ wish.slug }}/donate">
                                        {{ _("Donate") }}
                                </a>
                                <br><br>

diff --git a/templates/wishlist/wish.html b/templates/wishlist/wish.html
index 82f3688fa20633a42661e5a097f7bb810a3b02b4..fd4bb5b31a78f4596a7c38455600e35eb30dc3ae 100644 (file)
--- a/templates/wishlist/wish.html
+++ b/templates/wishlist/wish.html
@@ -1,73 +1,29 @@
-<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 %}
+{% extends "base.html" %}
 
-                       <h3>
-                               <a href="/wish/{{ wish.slug }}">{{ escape(wish.title) }}</a>
-                       </h3>
+{% block title %}{{ wish.title }} - {{ _("Wish") }}{% end block %}
 
-                       {% raw wish.description %}
-                       <hr>
-               {% end %}
+{% block body %}
+       <div class="page-header">
+               <h1>{{ wish.title }}</h1>
+       </div>
 
-               <div class="progress {{ progress_bar }}">
-                       <div class="progress-bar" style="width: {{ "%.2f%%" % wish.percentage_bar }};"></div>
-               </div>
+       {% module Wishlist([wish,], short=True) %}
 
-               <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>
+       {% raw wish.description %}
 
-                       <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>
+       <hr>
 
-                                               <div class="col-lg-4 col-md-4 ac">
-                                                       <p class="lead">{% raw _("%s &euro;") % wish.donated %}</p>
-                                                       <p>{{ _("donated") }}</p>
-                                               </div>
+       <p class="ac">
+               <i class="glyphicon glyphicon-calendar"></i>
+               {{ _("Launched: %s") % locale.format_date(wish.date_start, full_format=True) }}
 
-                                               <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>
+               &bull;
 
-                       <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>
+               {% if wish.date_end %}
+                       <i class="glyphicon glyphicon-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 %}