From a2266691095ec55228fea8c63bafea9c69390ceb Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 16 Jul 2012 11:50:31 -0400 Subject: [PATCH] bleah, django-notification fails around the with tags. removed. --- .../comment_on_commented/notice.html | 15 ++++-------- .../notification/notice_template.html | 4 ++-- .../notification/pledge_charged/notice.html | 24 ++++++------------- .../pledge_status_change/notice.html | 12 ++++------ .../pledge_you_have_pledged/full.txt | 19 +++++++-------- .../pledge_you_have_pledged/notice.html | 14 ++++------- .../rights_holder_claim_approved/notice.html | 3 +-- .../notification/wishlist_active/notice.html | 15 ++++-------- .../notification/wishlist_comment/notice.html | 13 +++------- .../wishlist_near_deadline/notice.html | 7 ++---- .../wishlist_near_target/notice.html | 7 ++---- .../wishlist_official_comment/notice.html | 13 +++------- .../notice.html | 6 ++--- .../wishlist_price_drop/notice.html | 18 ++++---------- .../wishlist_successful/notice.html | 12 ++++------ .../notice.html | 9 ++++--- .../wishlist_unsuccessful/full.txt | 10 +++----- .../wishlist_unsuccessful/notice.html | 12 ++++------ .../notification/wishlist_updated/notice.html | 10 +++----- .../wishlist_work_claimed/notice.html | 15 ++++-------- 20 files changed, 73 insertions(+), 165 deletions(-) diff --git a/frontend/templates/notification/comment_on_commented/notice.html b/frontend/templates/notification/comment_on_commented/notice.html index 717b0b08..a51cdb95 100644 --- a/frontend/templates/notification/comment_on_commented/notice.html +++ b/frontend/templates/notification/comment_on_commented/notice.html @@ -1,20 +1,13 @@ {% extends "notification/notice_template.html" %} -{% with comment.content_object.id as id %} -{% with comment.user as user %} -{% url work id as work_url %} -{% url supporter supporter_username=user as supporter_url %} {% block comments_book %} - cover image for {{ comment.content_object.title }} + cover image for {{ comment.content_object.title }} {% endblock %} {% block comments_graphical %} - {{ comment.user.username }} has made a comment on {{ comment.content_object.title }}. + {{ comment.user.username }} has made a comment on {{ comment.content_object.title }}. {% endblock %} {% block comments_textual %} - {{ comment.comment|linebreaksbr }} -{% endblock %} - -{% endwith %} -{% endwith %} + {{ comment.comment|linebreaksbr }} +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/notice_template.html b/frontend/templates/notification/notice_template.html index 6b1795b0..ed265360 100644 --- a/frontend/templates/notification/notice_template.html +++ b/frontend/templates/notification/notice_template.html @@ -1,6 +1,6 @@ {% comment %} -make sure that any urls you use are based off of a {% url foo as bar %} -django-notification can't find the url dispatcher when extending this template +django-notification {% with %} play poorly together. Don't use {% with %} +in child templates. {% endcomment %}
diff --git a/frontend/templates/notification/pledge_charged/notice.html b/frontend/templates/notification/pledge_charged/notice.html index 77d60e9a..1b1cf76f 100644 --- a/frontend/templates/notification/pledge_charged/notice.html +++ b/frontend/templates/notification/pledge_charged/notice.html @@ -1,40 +1,30 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% with transaction.campaign.work as work %} -{% with transaction.campaign.work.title as title %} -{% with transaction.campaign.rightsholder as rightsholder %} -{% with transaction.amount as amount %} -{% url work work.id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ transaction.campaign.work.title }} {% endblock %} {% block comments_graphical %} - Hooray! The campaign for {{ title }} has succeeded. Your credit card is being charged ${{ amount }}. Thank you again for your help. + Hooray! The campaign for {{ transaction.campaign.work.title }} has succeeded. Your credit card is being charged ${{ transaction.amount }}. Thank you again for your help. {% endblock %} {% block comments_textual %}

Congratulations!

-

Thanks to you and other ungluers, {{ title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will now charge your credit card.

+

Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will now charge your credit card.

Pledge Summary :
Amount pledged: {{ amount|intcomma }}
Premium: {{ transaction.premium.description }}

-

We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium. +

We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ transaction.campaign.rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.

-

For more information, visit the visit the project page. +

For more information, visit the visit the project page.

Thank you again for your support.

-

{{ rightsholder }} and the Unglue.it team +

{{ transaction.campaign.rightsholder }} and the Unglue.it team

-{% endblock %} - -{% endwith %} -{% endwith %} -{% endwith %} -{% endwith %} +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/pledge_status_change/notice.html b/frontend/templates/notification/pledge_status_change/notice.html index c2fb26b8..fe1be75b 100644 --- a/frontend/templates/notification/pledge_status_change/notice.html +++ b/frontend/templates/notification/pledge_status_change/notice.html @@ -1,14 +1,12 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% with transaction.campaign.work.title as title %} -{% url work transaction.campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ transaction.campaign.work.title }} {% endblock %} {% block comments_book %} - Your pledge for the campaign to unglue {{ title }} has been {% if up_or_down == 'canceled'%}canceled{% else %}modified{% endif %}. + Your pledge for the campaign to unglue {{ transaction.campaign.work.title }} has been {% if up_or_down == 'canceled'%}canceled{% else %}modified{% endif %}. {% endblock %} {% if up_or_down == 'canceled' %} @@ -23,8 +21,6 @@ Your new pledge is as follows:
Amount: ${{ transaction.amount|intcomma }}
Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
- Thank you for your continued support of {{ title }}. + Thank you for your continued support of {{ transaction.campaign.work.title }}. {% endblock %} -{% endif %} - -{% endwith %} \ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/frontend/templates/notification/pledge_you_have_pledged/full.txt b/frontend/templates/notification/pledge_you_have_pledged/full.txt index 90a88b8b..cbc78825 100644 --- a/frontend/templates/notification/pledge_you_have_pledged/full.txt +++ b/frontend/templates/notification/pledge_you_have_pledged/full.txt @@ -1,5 +1,5 @@ -{% load humanize %}{% with transaction.campaign.work.title as title %}{% with site.domain as domain %}{% with transaction.campaign.work.id as work_id %} -Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ title }}. If this campaign successfully raises ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy. +{% load humanize %} +Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ transaction.campaign.work.title }}. If this campaign successfully raises ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy. Pledge summary Amount pledged: ${{ transaction.amount|intcomma }} @@ -7,22 +7,19 @@ Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% els You can help even more by sharing this campaign with your friends. -Facebook: https://www.facebook.com/sharer.php?u=https://{{ domain }}{% url work work_id %} +Facebook: https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work transaction.campaign.work.id %} -Twitter: https://twitter.com/intent/tweet?url=https://{{ domain }}{% url work work_id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21" +Twitter: https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work transaction.campaign.work.id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21" -You can also embed a widget for {{ title }} in your web site by copy/pasting the following: - +You can also embed a widget for {{ transaction.campaign.work.title }} in your web site by copy/pasting the following: + Or the best idea: talk about it with those you love. We'll need lots of help from lots of people to make this a success. -If you want to change your pledge, just use the button at https://{{ domain }}{% url work work_id %} +If you want to change your pledge, just use the button at https://{{ site.domain }}{% url work transaction.campaign.work.id %} If you have any problems with your pledge, don't hesitate to contact us at support@gluejar.com Thanks for being part of Unglue.it. -{{ transaction.campaign.rightsholder }} (rights holder for {{ title }}) and the Unglue.it team -{% endwith %} -{% endwith %} -{% endwith %} \ No newline at end of file +{{ transaction.campaign.rightsholder }} (rights holder for {{ transaction.campaign.work.title }}) and the Unglue.it team \ No newline at end of file diff --git a/frontend/templates/notification/pledge_you_have_pledged/notice.html b/frontend/templates/notification/pledge_you_have_pledged/notice.html index c4d7e298..d4aa8854 100644 --- a/frontend/templates/notification/pledge_you_have_pledged/notice.html +++ b/frontend/templates/notification/pledge_you_have_pledged/notice.html @@ -1,27 +1,21 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% with transaction.campaign.work.title as title %} -{% with transaction.campaign.work.id as work_id %} -{% with transaction.amount as amount %} -{% url work work_id as work_url %} -{% url emailshare 'pledge' as pledge_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ transaction.campaign.work.title }} {% endblock %} {% block comments_graphical %} - You've just pledged ${{ amount|intcomma }} to {{ title }}. + You've just pledged ${{ transaction.amount|intcomma }} to {{ transaction.campaign.work.title }}. {% endblock %} {% block comments_textual %}

Thank you, {{ transaction.user.username }}!

-

You've just pledged ${{ amount|intcomma }} to {{ title }}. If it reaches its goal of ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.

+

You've just pledged ${{ transaction.amount|intcomma }} to {{ transaction.campaign.work.title }}. If it reaches its goal of ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.

You can help even more by sharing this campaign with your friends!

{% include "notification/sharing_block.html" %}

Thanks for being part of Unglue.it.

The unglue.it team.

-{% endblock %} -{% endwith %}{% endwith %}{% endwith %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_claim_approved/notice.html b/frontend/templates/notification/rights_holder_claim_approved/notice.html index fb257fb1..1e30ab69 100644 --- a/frontend/templates/notification/rights_holder_claim_approved/notice.html +++ b/frontend/templates/notification/rights_holder_claim_approved/notice.html @@ -1,8 +1,7 @@ {% extends "notification/notice_template.html" %} -{% url work claim.work.id as work_url %} {% block comments_book %} - cover image for {{ claim.work.title }} + cover image for {{ claim.work.title }} {% endblock %} {% block comments_graphical %} diff --git a/frontend/templates/notification/wishlist_active/notice.html b/frontend/templates/notification/wishlist_active/notice.html index 82ad523f..2332ad80 100644 --- a/frontend/templates/notification/wishlist_active/notice.html +++ b/frontend/templates/notification/wishlist_active/notice.html @@ -1,22 +1,15 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% with campaign.work.id as id %} -{% with campaign.work.title as title %} -{% url pledge work_id=id as pledge_url %} -{% url work id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} - The rights holder, {{ active_claim.rights_holder.rights_holder_name }}, has launched a campaign for {{ title }}! + The rights holder, {{ active_claim.rights_holder.rights_holder_name }}, has launched a campaign for {{ title }}! {% endblock %} {% block comments_textual %}
Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d, Y" }}, {{ title }} will be released under a Creative Commons license for all to enjoy.
-
You can help! Pledge any amount, and use the sharing options on the campaign page to tell your friends.
-{% endblock %} - -{% endwith %} -{% endwith %} \ No newline at end of file +
You can help! Pledge any amount, and use the sharing options on the campaign page to tell your friends.
+{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_comment/notice.html b/frontend/templates/notification/wishlist_comment/notice.html index 64893d54..916adc15 100644 --- a/frontend/templates/notification/wishlist_comment/notice.html +++ b/frontend/templates/notification/wishlist_comment/notice.html @@ -1,20 +1,13 @@ {% extends "notification/notice_template.html" %} -{% with comment.content_object.id as id %} -{% with comment.user as user %} -{% url work id as work_url %} -{% url supporter supporter_username=user as supporter_url %} {% block comments_book %} - cover image for {{ comment.content_object.title }} + cover image for {{ comment.content_object.title }} {% endblock %} {% block comments_graphical %} - {{ comment.user.username }} has made a comment on {{ comment.content_object.title }} + {{ comment.user.username }} has made a comment on {{ comment.content_object.title }} {% endblock %} {% block comments_textual %} {{ comment.comment|linebreaksbr }} -{% endblock %} - -{% endwith %} -{% endwith %} +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_near_deadline/notice.html b/frontend/templates/notification/wishlist_near_deadline/notice.html index ea5a554d..9dc7a965 100644 --- a/frontend/templates/notification/wishlist_near_deadline/notice.html +++ b/frontend/templates/notification/wishlist_near_deadline/notice.html @@ -1,10 +1,7 @@ {% extends "notification/notice_template.html" %} -{% url pledge work_id=campaign.work.id as pledge_url %} -{% url emailshare 'pledge' as emailshare_url %} -{% url work campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ campaign.work.title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} @@ -17,7 +14,7 @@ {% if pledged %} Your pledge is helping us reach that goal. Will you help again by sharing this campaign with your friends? {% else %} - You can help us give this book to the world by pledging or by sharing this campaign with your friends. + You can help us give this book to the world by pledging or by sharing this campaign with your friends. {% endif %} {% include "notification/sharing_block.html" %} diff --git a/frontend/templates/notification/wishlist_near_target/notice.html b/frontend/templates/notification/wishlist_near_target/notice.html index 1ca19932..7be045a8 100644 --- a/frontend/templates/notification/wishlist_near_target/notice.html +++ b/frontend/templates/notification/wishlist_near_target/notice.html @@ -1,11 +1,8 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% url work campaign.work.id as work_url %} -{% url pledge work_id=campaign.work.id as pledge_url %} -{% url emailshare 'pledge' as emailshare_url %} {% block comments_book %} - cover image for {{ campaign.work.title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} @@ -17,7 +14,7 @@ {% if pledged %} Your pledge is helping us reach the campaign's target price of {{ campaign.target }}. Will you help again by sharing this campaign with your friends? {% else %} - You can help us give this book to the world by pledging or by sharing this campaign with your friends. + You can help us give this book to the world by pledging or by sharing this campaign with your friends. {% endif %} {% include "notification/sharing_block.html" %} diff --git a/frontend/templates/notification/wishlist_official_comment/notice.html b/frontend/templates/notification/wishlist_official_comment/notice.html index 2663b1d3..a899c697 100644 --- a/frontend/templates/notification/wishlist_official_comment/notice.html +++ b/frontend/templates/notification/wishlist_official_comment/notice.html @@ -1,20 +1,13 @@ {% extends "notification/notice_template.html" %} -{% with comment.content_object.id as id %} -{% with comment.user as user %} -{% url work id as work_url %} -{% url supporter supporter_username=user as supporter_url %} {% block comments_book %} - cover image for {{ comment.content_object.title }} + cover image for {{ comment.content_object.title }} {% endblock %} {% block comments_graphical %} - {{ comment.user.username }} has made an official comment on {{ comment.content_object.title }} + {{ comment.user.username }} has made an official comment on {{ comment.content_object.title }} {% endblock %} {% block comments_textual %} {{ comment.comment|linebreaksbr }} -{% endblock %} - -{% endwith %} -{% endwith %} +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_premium_limited_supply/notice.html b/frontend/templates/notification/wishlist_premium_limited_supply/notice.html index 226d1205..fae6d89c 100644 --- a/frontend/templates/notification/wishlist_premium_limited_supply/notice.html +++ b/frontend/templates/notification/wishlist_premium_limited_supply/notice.html @@ -1,10 +1,8 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% url pledge work_id=campaign.work.id as pledge_url %} -{% url work campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ campaign.work.title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} @@ -17,5 +15,5 @@ Premium: {{ premium.description }} Minimum pledge: {{ premium.amount|intcomma }} - If you'd like to claim the last one, pledge here: https://{{ site.domain }}{{ pledge_url }} + If you'd like to claim the last one, pledge here: https://{{ site.domain }}{% url pledge work_id=campaign.work.id %} {% endblock %} diff --git a/frontend/templates/notification/wishlist_price_drop/notice.html b/frontend/templates/notification/wishlist_price_drop/notice.html index dd1a4c13..f11a0d8b 100644 --- a/frontend/templates/notification/wishlist_price_drop/notice.html +++ b/frontend/templates/notification/wishlist_price_drop/notice.html @@ -1,28 +1,20 @@ {% extends "notification/notice_template.html" %} {% load humanize %} -{% with campaign.work.id as work_id %} -{% with campaign.work.title as title %} -{% url pledge work_id=work_id as pledge_url %} -{% url work work_id as work_url %} -{% url emailshare 'pledge' as emailshare_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} - Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target|intcomma }} for {{ title }}. + Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target|intcomma }} for {{ campaign.work.title }}. {% endblock %} {% block comments_textual %} {% if pledged %} - Your pledge of {{ amount|intcomma }} is now going even farther toward helping {{ title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help again by sharing this campaign: + Your pledge of {{ amount|intcomma }} is now going even farther toward helping {{ campaign.work.title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help again by sharing this campaign: {% else %} - The target may be lower, but we still need your help to reach it. Pledges of any amount help. You can chip in towards giving this book to the world at https://{{ site.domain }}{{ pledge_url }} . You can also help by sharing this campaign: + The target may be lower, but we still need your help to reach it. Pledges of any amount help. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge campaign.work.id %} . You can also help by sharing this campaign: {% endif %} {% include "notification/sharing_block.html" %} -{% endblock %} - -{% endwith %} -{% endwith %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_successful/notice.html b/frontend/templates/notification/wishlist_successful/notice.html index 6f41b5a9..be08ee8f 100644 --- a/frontend/templates/notification/wishlist_successful/notice.html +++ b/frontend/templates/notification/wishlist_successful/notice.html @@ -1,18 +1,14 @@ {% extends "notification/notice_template.html" %} -{% with campaign.work.title as title %} -{% url work campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} - Hooray! We're going to give {{ title }} to the world! + Hooray! We're going to give {{ campaign.work.title }} to the world! {% endblock %} {% block comments_textual %} - A book on your wishlist, {{ title }}, has met its goal price of {{ campaign.target }}, thanks to the support of ungluers like you. Unglue.it and the book's rights holder, {{ campaign.rightsholder }}, will be converting it to an unglued ebook edition and making it available for all the world to enjoy. If you've asked us to in your notification settings, we'll tell you when the unglued ebook is ready.

+ A book on your wishlist, {{ campaign.work.title }}, has met its goal price of {{ campaign.target }}, thanks to the support of ungluers like you. Unglue.it and the book's rights holder, {{ campaign.rightsholder }}, will be converting it to an unglued ebook edition and making it available for all the world to enjoy. If you've asked us to in your notification settings, we'll tell you when the unglued ebook is ready.

Thank you again! -{% endblock %} - -{% endwith %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_unglued_book_released/notice.html b/frontend/templates/notification/wishlist_unglued_book_released/notice.html index d9b844b5..7adabf7a 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/notice.html +++ b/frontend/templates/notification/wishlist_unglued_book_released/notice.html @@ -1,23 +1,22 @@ {% extends "notification/notice_template.html" %} {% load truncatechars %} -{% url work work.id as work_url %} {% block comments_book %} - cover image for {{ work.title }} + cover image for {{ work.title }} {% endblock %} {% block comments_graphical %} - {{ work.title }} is now available for download + {{ work.title }} is now available for download {% endblock %} {% block comments_textual %} {% if work.last_campaign_status == 'SUCCESSFUL' %}

- Great News! {{ work.title }} which you have supported is now available for download as an Unglued Ebook. + Great News! {{ work.title }} which you have supported is now available for download as an Unglued Ebook.

{% else %}

- Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook. + Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.

{% if work.ebooks.0.user %}

diff --git a/frontend/templates/notification/wishlist_unsuccessful/full.txt b/frontend/templates/notification/wishlist_unsuccessful/full.txt index 80bf8de6..b0f78b24 100644 --- a/frontend/templates/notification/wishlist_unsuccessful/full.txt +++ b/frontend/templates/notification/wishlist_unsuccessful/full.txt @@ -1,15 +1,11 @@ -{% with campaign.work.title as title %} -{% with campaign.rightsholder as rightsholder %} -Alas. The campaign to unglue {{ title }} (https://{{site.domain}}{% url work campaign.work.id %}) has not succeeded. +Alas. The campaign to unglue {{ campaign.work.title }} (https://{{site.domain}}{% url work campaign.work.id %}) has not succeeded. If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. You'll also receive an email from Amazon notifying you that your payment to Gluejar has been cancelled. -Still want to give {{ title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ title }}. +Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}. There are also other books with active campaigns that need your help: https://unglue.it/campaigns/ending . Thank you for your support. -{{ rightsholder }} (rights holder for {{ title }}) and the Unglue.it team - -{% endwith %}{% endwith %} \ No newline at end of file +{{ campaign.rightsholder }} (rights holder for {{ campaign.work.title }}) and the Unglue.it team \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_unsuccessful/notice.html b/frontend/templates/notification/wishlist_unsuccessful/notice.html index 874657d7..5b2bc25d 100644 --- a/frontend/templates/notification/wishlist_unsuccessful/notice.html +++ b/frontend/templates/notification/wishlist_unsuccessful/notice.html @@ -1,23 +1,19 @@ {% extends "notification/notice_template.html" %} -{% with campaign.work.title as title %} -{% url work campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ campaign.work.title }} {% endblock %} {% block comments_graphical %} - Alas. The campaign to unglue {{ title }} did not succeed. + Alas. The campaign to unglue {{ campaign.work.title }} did not succeed. {% endblock %} {% block comments_textual %} If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. - Still want to give {{ title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ title }}. + Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}. There are also other books with active campaigns that need your help. Thank you for your support. -{% endblock %} - -{% endwith %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_updated/notice.html b/frontend/templates/notification/wishlist_updated/notice.html index c0f27436..bc07de11 100644 --- a/frontend/templates/notification/wishlist_updated/notice.html +++ b/frontend/templates/notification/wishlist_updated/notice.html @@ -1,13 +1,9 @@ {% extends "notification/notice_template.html" %} -{% with campaign.work.title as title %} -{% url work campaign.work.id as work_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ cmapaign.work.title }} {% endblock %} {% block comments_graphical %} - The rights holder, {{ campaign.rightsholder }}, has updated the campaign to unglue {{ title }}. For details, see the campaign page. -{% endblock %} - -{% endwith %} \ No newline at end of file + The rights holder, {{ campaign.rightsholder }}, has updated the campaign to unglue {{ campaign.work.title }}. For details, see the campaign page. +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_work_claimed/notice.html b/frontend/templates/notification/wishlist_work_claimed/notice.html index ef4fa4c8..e67e44a8 100644 --- a/frontend/templates/notification/wishlist_work_claimed/notice.html +++ b/frontend/templates/notification/wishlist_work_claimed/notice.html @@ -1,28 +1,21 @@ {% extends "notification/notice_template.html" %} -{% with claim.work.id as work_id %} -{% with claim.work.title as title %} -{% url work work_id as work_url %} -{% url emailshare 'pledge' as emailshare_url %} {% block comments_book %} - cover image for {{ title }} + cover image for {{ claim.work.title }} {% endblock %} {% block comments_graphical %} - Hooray! {{ rightsholder }} is now an approved rights holder for {{ title }}. + Hooray! {{ rightsholder }} is now an approved rights holder for {{ claim.work.title }}. {% endblock %} {% block comments_textual %} What does this mean for you? Rights holders are the people who are legally authorized to license works. This means they're the only people who can run campaigns on Unglue.it. - {{ rightsholder }} may be running a campaign soon, or later, but isn't obligated to. Want to make that campaign happen? Leave a comment and tell your friends: + {{ rightsholder }} may be running a campaign soon, or later, but isn't obligated to. Want to make that campaign happen? Leave a comment and tell your friends: {% include "notification/sharing_block.html" %} Make sure {{ rightsholder }} knows how much you want to give this book to the world. Thanks for your help! -{% endblock %} - -{% endwith %} -{% endwith %} \ No newline at end of file +{% endblock %} \ No newline at end of file