From a2abb92038c1c5b9adc399d8376d4495c7ad85c9 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 20 Nov 2012 09:56:04 -0500 Subject: [PATCH] makes pledge action clearer by describing in more contexts and using Pledge rather than Support --- frontend/templates/base.html | 2 +- frontend/templates/book_panel.html | 18 +++++++++++------- frontend/templates/faq_pledge.html | 9 ++++++++- frontend/templates/manage_account.html | 2 +- frontend/templates/work.html | 2 +- static/css/book_list.css | 3 +++ static/less/book_list.less | 4 ++++ 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index f2b99edf..3da91b25 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -104,7 +104,7 @@
  • Profile Settings
    • -
  • Account Settings
    • +
  • Account & Pledges
  • Sign Out
  • diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 52143b80..85b14a1f 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -32,7 +32,7 @@

    ${{ work.last_campaign.current_total|floatformat:0|intcomma }} raised

    ${{ work.last_campaign.target|floatformat:0|intcomma }} needed

    by {{ deadline|naturalday:"M d, Y" }}

    -
    Support
     +
    Pledge
     {% else %}{% if status == 'INITIALIZED' %}

    Campaign coming soon!

    @@ -129,7 +129,7 @@ {% else %}{% ifequal supporter request.user %}
    - Remove This + Un-wishlist
    {% else %}{% if work in wishlist %}
    @@ -137,11 +137,15 @@
    {% else %}
    - {% if on_search_page %} - Add to Wishlist - {% else %} - Add to Wishlist - {% endif %} + {% ifequal status "ACTIVE" %} + Pledge + {% else %} + {% if on_search_page %} + Add to Wishlist + {% else %} + Add to Wishlist + {% endif %} + {% endifequal %}
    {% endif %}{% endifequal %}{% endif %}{% endif %} diff --git a/frontend/templates/faq_pledge.html b/frontend/templates/faq_pledge.html index a09ff63f..722fa71d 100644 --- a/frontend/templates/faq_pledge.html +++ b/frontend/templates/faq_pledge.html @@ -24,10 +24,17 @@
    • +
  • + Will I be charged if the campaign doesn't succeed? + + Nope! + +
    • +
  • What if I want to change my pledge? - You can change or cancel your pledge at any time before the campaign ends. This will be the campaign's deadline ({{ campaign.deadline }}) or midnight (Eastern US time) on the day the campaign succeeds, whichever comes first. Go to this book's page and click on the Modify Pledge button. + You can change or cancel your pledge at any time before the campaign ends. This will be the campaign's deadline ({{ campaign.deadline }}) or midnight (Eastern US time) on the day the campaign succeeds, whichever comes first. Go to your Account & Pledges page (always accessible under "Hi, {{ username }}!" in the upper right corner of the site).
    • diff --git a/frontend/templates/manage_account.html b/frontend/templates/manage_account.html index 3c058c4d..4b725f88 100644 --- a/frontend/templates/manage_account.html +++ b/frontend/templates/manage_account.html @@ -21,7 +21,7 @@ $j(document).ready(function(){ {% include "trans_summary.html" %} {% empty %} -
    You don't have any active pledges.
    +
    You don't have any active pledges. To make one, click on a book you'd like to support among our active campaigns. There's a "Support" button on every campaign page, or just click on your favorite premium to get started.
    {% endfor %}

    Your Payment Info

    diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 6357a00f..bd83254d 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -140,7 +140,7 @@ $j(document).ready(function(){ {% if pledged %}
    {% else %} -
    +
    {% endif %} {% else %} {% if work.first_ebook %} diff --git a/static/css/book_list.css b/static/css/book_list.css index eea9b5b2..bbaefd72 100755 --- a/static/css/book_list.css +++ b/static/css/book_list.css @@ -149,6 +149,9 @@ div.book-list.listview div.add-wishlist span, div.book-list.listview div.create-account span { background: url("/static/images/booklist/add-wishlist.png") left center no-repeat; } +div.book-list.listview div.add-wishlist span.booklist_pledge { + background: none; +} div.book-list.listview div.remove-wishlist span { background: url("/static/images/booklist/remove-wishlist-blue.png") left center no-repeat; } diff --git a/static/less/book_list.less b/static/less/book_list.less index f277cf1f..03922f63 100755 --- a/static/less/book_list.less +++ b/static/less/book_list.less @@ -79,6 +79,10 @@ div.book-list.listview{ background:url("@{image-base}booklist/add-wishlist.png") left center no-repeat; } + &.add-wishlist span.booklist_pledge { + background: none; + } + &.remove-wishlist span { background:url("@{image-base}booklist/remove-wishlist-blue.png") left center no-repeat; }