diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 7064165d..2521aff4 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -85,11 +85,17 @@ Status: {{ status }}
- {% if status == 'No campaign yet' and fromsupport %} - Wished by {{ work.wished_by.count }} + {% if fromsupport %} + {% if status == 'No campaign yet' or status == 'INITIALIZED' %} + Wished by {{ work.wished_by.count }} + {% else %} +
+ book list status +
+ {% endif %} {% else %}
- book list status + book list status
{% endif %}
{{ work.percent_unglued_number }}%
diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index 597fa68a..8a902ee2 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -135,7 +135,7 @@ how do I integrate the your wishlist thing with the tabs thing?

Links

- + {{ profile_form.home_url }}{{ profile_form.home_url.errors }}
@@ -160,7 +160,7 @@ how do I integrate the your wishlist thing with the tabs thing? {% endif %}
- + {{ profile_form.librarything_id }}{{ profile_form.librarything_id.errors }}
@@ -172,9 +172,10 @@ how do I integrate the your wishlist thing with the tabs thing? {% csrf_token %} {{ goodreads_shelf_load_form.non_field_errors }}
- {{ goodreads_shelf_load_form.goodreads_shelf_name_number.errors }} - {{ goodreads_shelf_load_form.goodreads_shelf_name_number }} -
+
{{ goodreads_shelf_load_form.goodreads_shelf_name_number.errors }} + {{ goodreads_shelf_load_form.goodreads_shelf_name_number }}
+ +
{% else %} @@ -186,7 +187,7 @@ how do I integrate the your wishlist thing with the tabs thing?
{% else %} -
Add your LibraryThing ID to import from LibraryThing.
+
Add your LibraryThing ID to import from LibraryThing:
{% endif %}
diff --git a/frontend/views.py b/frontend/views.py index d4731681..fa4b220b 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -837,7 +837,7 @@ def goodreads_load_shelf(request): ct.description = "Loading Goodread shelf %s to user %s with %s books" % (shelf_name, user, expected_number_of_books) ct.save() - return HttpResponse("Shelf loading placed on task queue.") + return HttpResponse("We're on it! Reload the page to see the books we've snagged so far.") except Exception,e: return HttpResponse("Error in loading shelf: %s " % (e)) logger.info("Error in loading shelf for user %s: %s ", user, e) @@ -869,8 +869,8 @@ def librarything_load(request): ct.user = user ct.description = "Loading LibraryThing collection of %s to user %s." % (lt_username, user) ct.save() - - return HttpResponse("LibraryThing loading placed on task queue.") + + return HttpResponse("We're on it! Reload the page to see the books we've snagged so far.") except Exception,e: return HttpResponse("Error in loading LibraryThing library: %s " % (e)) logger.info("Error in loading LibraryThing for user %s: %s ", user, e) diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index 9de0a520..e8088f39 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -158,17 +158,26 @@ input.profile-save { #loadgr { background: url("/static/images/supporter_icons/goodreads_square.png") left center no-repeat; min-height: 32px; + margin-bottom: 12px; +} +#loadgr span { + display: inline-block; + vertical-align: middle; } #loadgr div, #loadgr input { - margin: 4px 10px 4px 36px; + margin: 2px 10px 2px 36px; } #loadlt { background: url("/static/images/supporter_icons/librarything_square.png") left center no-repeat; min-height: 32px; + padding-top: 4px; } #loadlt div, #loadlt input { margin: auto 10px auto 36px; } +.weareonthat { + background: url("/static/images/checkmark_small.png") left center no-repeat; +} a.my-setting { background: #d6dde0 url("/static/images/header/explane.png") 90% center no-repeat; border-radius: 7px; diff --git a/static/js/import_books.js b/static/js/import_books.js index 95d9df8f..5c4e38db 100644 --- a/static/js/import_books.js +++ b/static/js/import_books.js @@ -3,9 +3,9 @@ jQuery(document).ready(function($) { // post to form_loc and alert with response var post_and_alert = function (form_loc){ - return function(bubble,params) { + return function(bubble,location,params) { $.post(form_loc, params, function (data) { - alert(data); + $(location+' > div').html(data); }); return bubble; @@ -14,12 +14,12 @@ jQuery(document).ready(function($) { $('#load_shelf_form').submit(function(){ - post_and_alert('/goodreads/load_shelf/')(false,$('#load_shelf_form').serialize()); + post_and_alert('/goodreads/load_shelf/')(false,'#load_shelf_form',$('#load_shelf_form').serialize()); return false; }); $('#librarything_load').submit(function(){ - post_and_alert('/librarything/load/')(false,$('#librarything_load').serialize()); + post_and_alert('/librarything/load/')(false,'#librarything_load',$('#librarything_load').serialize()); return false; }); diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less index aee06d57..827b82c9 100644 --- a/static/less/supporter_layout.less +++ b/static/less/supporter_layout.less @@ -182,21 +182,31 @@ input.profile-save { #loadgr { background: url("@{image-base}supporter_icons/goodreads_square.png") left center no-repeat; min-height: 32px; + margin-bottom: 12px; + + span { + display: inline-block; + vertical-align: middle; + } div, input { - margin: 4px 10px 4px 36px; + margin: 2px 10px 2px 36px; } } #loadlt { background: url("@{image-base}supporter_icons/librarything_square.png") left center no-repeat; min-height: 32px; + padding-top: 4px; div, input { margin: auto 10px auto 36px; } } +.weareonthat { + background: url("@{image-base}checkmark_small.png") left center no-repeat; +} a.my-setting { background:@blue-grey url("@{image-base}header/explane.png") 90% center no-repeat; border-radius:7px;