From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 15:54:32 +0000 (+0100)
Subject: Fix design of wishlist.
X-Git-Url: http://git.ipfire.org/?p=people%2Fshoehn%2Fipfire.org.git;a=commitdiff_plain;h=3907b320299774eb10a2b13cde353074f442f691

Fix design of wishlist.
---

diff --git a/static/css/style.css b/static/css/style.css
index a03430f..bd51445 100644
--- 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 66c9056..8d8009c 100644
--- 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 6856703..a1e6593 100644
--- 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 da0f25b..41d681d 100644
--- 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)