Fix design of wishlist.

diff --git a/static/css/style.css b/static/css/style.css
index a03430fe3b546e6449cc6adfaf2181e80d5ad5d7..bd5144507e795b676ea07e997bfbb519a189de9e 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -44,9 +44,6 @@ width: 20%;
 table.table-fireinfo td.val {
 width: 10%;
 }
-.wishes div.thumbnail {
-padding: 1em;
-}
 .objectives .icon {
 padding: 1.2em;
 }

diff --git a/templates/wishlist/modules/wish.html b/templates/wishlist/modules/wish.html
index 66c9056bb0279996bd1e5a81f41a7dd8fc5b12e9..8d8009c26f4c6f89adee24f2da57f83ebafb4fcf 100644 (file)
--- a/templates/wishlist/modules/wish.html
+++ b/templates/wishlist/modules/wish.html
@@ -1,24 +1,28 @@
-       <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 %}
+<div class="panel panel-default">
+       <div class="panel-body">
+               {% if wish.remaining_days <= 10 and wish.remaining_days >= 0 %}
+                       <span class="label label-primary pull-right">
+                               {{ _("Only a few days left!") }}
+                       </span>
+               {% end %}
+
+               <h3>
+                       <a href="/wish/{{ wish.slug }}">{{ wish.title }}</a>
+               </h3>
 
-                       <h3>
-                               <a href="/wish/{{ wish.slug }}">{{ escape(wish.title) }}</a>
-                       </h3>
+               <hr>
 
+               {% if not short %}
                        {% raw wish.description %}
                        <hr>
                {% end %}
 
-               <div class="progress {{ progress_bar }}">
-                       <div class="progress-bar" style="width: {{ "%.2f%%" % wish.percentage_bar }};"></div>
+               <div class="progress">
+                       <div class="progress-bar {{ progress_bar }}" style="width: {{ "%.2f%%" % wish.percentage_bar }};"></div>
                </div>
+       </div>
 
+       <div class="panel-footer">
                <div class="row">
                        <div class="col-lg-3 col-md-3 ac">
                                <br><br>
@@ -70,4 +74,4 @@
                        </div>
                </div>
        </div>
-</li>
+</div>

diff --git a/templates/wishlist/modules/wishlist.html b/templates/wishlist/modules/wishlist.html
index 6856703b11db1e69f3bce093ca36d103d9de21ed..a1e6593f92c77df54b4b59fc58eb98d8015f678d 100644 (file)
--- a/templates/wishlist/modules/wishlist.html
+++ b/templates/wishlist/modules/wishlist.html
@@ -1,5 +1,3 @@
-<div class="row wishes">
-       {% for wish in wishes %}
-               {% module Wish(wish, short=short) %}
-       {% end %}
-</div>
+{% for wish in wishes %}
+       {% module Wish(wish, short=short) %}
+{% end %}

diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index da0f25b2b1ccd84b5332c88ac8fa303192314eeb..41d681d687ba18a0288514f368ebdc69d398fd25 100644 (file)
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -334,10 +334,10 @@ class WishlistModule(UIModule):
 
 class WishModule(UIModule):
        def render(self, wish, short=False):
-               progress_bar = "progress-warning"
+               progress_bar = "progress-bar-warning"
 
                if wish.percentage >= 100:
-                       progress_bar = "progress-success"
+                       progress_bar = "progress-bar-success"
 
                return self.render_string("wishlist/modules/wish.html",
                        wish=wish, short=short, progress_bar=progress_bar)