improve gift notifications

put line breaks in the html notices
try to make subject line less spammy
move ungluit description down in the email message

frontend/templates/gift_duplicate.html

@@ -22,7 +22,7 @@
 <p>
 An email has been sent to <a href="mailto:{{ gift.acq.user.email }}">{{ gift.acq.user.email }}</a> with this message:</p>
 <p style="margin:2em">
-{{ gift.message }}
+{{ gift.message|linebreaksbr }}
 </p>
 <p>along with instructions for obtaining the ebook. Here's the URL that the recipient (and ONLY the recipient) should use to collect the book: 
 </p>

frontend/templates/gift_welcome.html

@@ -5,7 +5,7 @@
 <p> Your new book, "<a href="{% url work work.id %}">{{ work.title }}</a>" from <a href="{% url supporter gift.giver %}">{{ gift.giver.username }}</a>, is waiting for you. <a href="{% url download work.id %}">Download it here</a>.</p>
 
     <div><p>From {{ gift.giver.username }}:</p>
-    <p style="margin:1em">{{ gift.message }}</p>
+    <p style="margin:1em">{{ gift.message|linebreaksbr }}</p>
     </div>
 {% ifequal message 'newuser' %}
     {% if passmessage %}

frontend/templates/notification/purchase_complete/notice.html

@@ -21,7 +21,7 @@
 {% endifequal %}
 {% ifequal transaction.offer.license 1 %}{% if gift %}An email has been sent to <a href="mailto:{{ gift.acq.user.email }}">{{ gift.acq.user.email }}</a> with this message:
 <pre>
-{{ gift.message }}
+{{ gift.message|linebreaksbr }}
 </pre>
 along with instructions for obtaining the ebook. Here's the URL that the recipient (and ONLY the recipient) should use to collect the book: 
 <pre>

frontend/templates/notification/purchase_gift/full.txt

@@ -5,15 +5,15 @@
 
 
 From Unglue.it:
-Unglue.it is a website whose purpose is to help ebooks become free. Thanks to "{{ gift.giver }}" and other "ungluers", "{{ gift.acq.work.title }}" will be eventually be released in an "unglued" ebook edition, i.e. free to everyone. Purchases of "{{ gift.acq.work.title }}" are helping to make that free edition financially possible.
-
-To get the ebook {{ gift.giver }} has given you, please click on this link (or copy and paste it into your web browser):
+To pick up "{{ gift.acq.work.title }}", the ebook {{ gift.giver }} has bought for you, please click on this link (or copy and paste it into your web browser):
 https://{{ current_site.domain }}{% url receive_gift gift.acq.nonce %}
 
 Choose a password if you want to access your ebooks in the future.
 
 The ebook will be licensed to you personally, and the license will be embedded in the ebook file. You may download it as many times as you need to, but you can't make copies for the use of others until the ungluing date, when it becomes free to everyone. You can make that date come sooner by encouraging your friends to buy a copy.
 
+Unglue.it is a website whose purpose is to help ebooks become free. Thanks to "{{ gift.giver }}" and other "ungluers", "{{ gift.acq.work.title }}" will be eventually be released in an "unglued" ebook edition, i.e. free to everyone. Purchases of "{{ gift.acq.work.title }}" are helping to make that free edition financially possible.
+
 
 For more information about the book, visit the book's unglue.it page at 
 https://{{ current_site.domain }}{% url work gift.acq.work.id %}

frontend/templates/notification/purchase_gift/notice.html

@@ -6,22 +6,22 @@
 {% endblock %}
 
 {% block comments_graphical %}
-To accept your ebook, visit <a href="{% url receive_gift gift.acq.nonce %}">the gift page.</a>
+To pick up <i>{{ gift.acq.work.title }}</i>, the ebook that <a href="{% url supporter gift.giver %}">{{ gift.giver }}</a> has bought for you,  visit <a href="{% url receive_gift gift.acq.nonce %}">the gift page.</a>
 
 {% endblock %}
 
 {% block comments_textual %}
 <p style="margin:2em">
-{{ gift.message }}
+{{ gift.message|linebreaksbr }}
 </p>
 <p>
 <a href="{% url receive_gift gift.acq.nonce %}">Click here</a> to receive your ebook.
 </p>
 <p>
-Thanks to <a href="{% url supporter gift.giver %}">{{ gift.giver }}</a> and other ungluers, <a href="{% url work gift.acq.work.id %}">{{ gift.acq.work.title }}</a> will be eventually be released to the world in an unglued ebook edition. 
+The ebook will be licensed to you personally, and your license has been embedded in the ebook file. You may download as many times as you need to, but you can't make copies for the use of others until the ungluing date. You can make that date come sooner by encouraging your friends to buy a copy.
 </p>
 <p>
-The ebook will be licensed to you personally, and your license has been embedded in the ebook file. You may download as many times as you need to, but you can't make copies for the use of others until the ungluing date. You can make that date come sooner by encouraging your friends to buy a copy.
+Thanks to <a href="{% url supporter gift.giver %}">{{ gift.giver }}</a> and other ungluers, <a href="{% url work gift.acq.work.id %}">{{ gift.acq.work.title }}</a> will be eventually be released to the world in an unglued ebook edition. 
 </p>
 <p>
 For more information about the book, visit the book's <a href="{% url work gift.acq.work.id %}">unglue.it page</a>

frontend/templates/notification/purchase_gift/short.txt

@@ -1 +1 @@
-You have been given an ebook, "{{ gift.acq.work.title }}"
+{{ gift.giver.username }} is giving you an ebook, "{{ gift.acq.work.title }}"