progress icon replaced by wished-by-N text for books on supporter page with no campaign yet

pull/1/head
Andromeda Yelton 2011-12-22 09:51:49 -05:00
parent ddcee58eeb
commit 7130ee5625
4 changed files with 35 additions and 11 deletions

View File

@ -85,9 +85,13 @@
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">{{ status }}</span> <span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">{{ status }}</span>
</div> </div>
<div class="listview panelfront side1 icons"> <div class="listview panelfront side1 icons">
{% if status == 'No campaign yet' and fromsupport %}
<span class="rounded"><span class="grey">Wished by {{ work.wished_by.count }}</span></span>
{% else %}
<div class="booklist-status-img"> <div class="booklist-status-img">
<img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" title="book list status" alt="book list status" /> <img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" title="book list status" alt="book list status" />
</div> </div>
{% endif %}
<div class="booklist-status-label">{{ work.percent_unglued_number }}%</div> <div class="booklist-status-label">{{ work.percent_unglued_number }}%</div>
<div class="right_add"><img src="/static/images/book-panel/add_gray.png" alt="Add"/></div> <div class="right_add"><img src="/static/images/book-panel/add_gray.png" alt="Add"/></div>
</div> </div>

View File

@ -464,6 +464,7 @@ def supporter(request, supporter_username, template_name):
supporter = get_object_or_404(User, username=supporter_username) supporter = get_object_or_404(User, username=supporter_username)
wishlist = supporter.wishlist wishlist = supporter.wishlist
works = wishlist.works.all() works = wishlist.works.all()
fromsupport = 1
backed = 0 backed = 0
backing = 0 backing = 0
transet = Transaction.objects.all().filter(user = supporter) transet = Transaction.objects.all().filter(user = supporter)
@ -533,6 +534,7 @@ def supporter(request, supporter_username, template_name):
"supporter": supporter, "supporter": supporter,
"wishlist": wishlist, "wishlist": wishlist,
"works": works, "works": works,
"fromsupport": fromsupport,
"backed": backed, "backed": backed,
"backing": backing, "backing": backing,
"wished": wished, "wished": wished,

View File

@ -245,12 +245,21 @@ ul.tabs li.tabs3 a:hover, ul.tabs li.active a {
background: #d6dde0; background: #d6dde0;
color: #3d4e53; color: #3d4e53;
} }
.book-list span.rounded > span { /*
line-height: normal; .book-list span.rounded {
width: 75px;
> span {
.height(15px);
a {
text-transform:capitalize;
}
}
} }
.book-list span.rounded > span a { */
text-transform: capitalize; .listview .rounded {
line-height: normal;
margin-right: 0;
} }
div.content-block-content { div.content-block-content {
padding-left: 10px; padding-left: 10px;

View File

@ -285,15 +285,24 @@ ul.tabs {
} }
} }
/*
.book-list span.rounded > span { .book-list span.rounded {
line-height:normal;
width:75px;
a { > span {
text-transform:capitalize; .height(15px);
a {
text-transform:capitalize;
}
} }
} }
*/
.listview .rounded {
// cancelling out styles that would otherwise apply
line-height: normal;
margin-right: 0;
}
div.content-block-content { div.content-block-content {
padding-left: 10px; padding-left: 10px;