From 3d923407e482a0caeb6fda56b516806a3e03174e Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 18 Aug 2015 11:03:49 -0400 Subject: [PATCH] replace email support links with form --- frontend/templates/404.html | 4 ++-- frontend/templates/500.html | 4 ++-- frontend/templates/503.html | 4 ++-- frontend/templates/base.html | 4 ++-- frontend/templates/download.html | 2 +- frontend/templates/faq.html | 6 +++--- frontend/templates/feedback.html | 6 ++++-- frontend/templates/gift_error.html | 4 ++-- frontend/templates/gift_user_error.html | 2 +- frontend/templates/gift_welcome.html | 2 +- frontend/templates/manage_campaign.html | 2 +- frontend/templates/notification/account_active/notice.html | 4 ++-- frontend/templates/notification/account_expired/notice.html | 3 +-- .../templates/notification/account_expiring/notice.html | 3 +-- .../templates/notification/rights_holder_claim/notice.html | 2 +- .../notification/wishlist_unglued_book_released/notice.html | 4 ++-- frontend/templates/pledge_card_error.html | 2 +- frontend/templates/pledge_user_error.html | 2 +- frontend/templates/registration/welcome.html | 2 +- frontend/templates/rh_tools.html | 4 ++-- frontend/templates/supporter.html | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-) diff --git a/frontend/templates/404.html b/frontend/templates/404.html index 36560903..05ff4bf9 100644 --- a/frontend/templates/404.html +++ b/frontend/templates/404.html @@ -1,10 +1,10 @@ {% extends "base.html" %} - +{% load url from future %} {% block content %}

Oops! This page does not exist.

-

Should it? Send us feedback: support@gluejar.com.

+

Should it? Send us feedback .

{% endblock %} diff --git a/frontend/templates/500.html b/frontend/templates/500.html index ee545938..64b5e0a5 100644 --- a/frontend/templates/500.html +++ b/frontend/templates/500.html @@ -1,10 +1,10 @@ {% extends "base.html" %} - +{% load url from future %} {% block content %}

Whoops, an error occurred.

-

Help us fix it by sending us feedback: support@gluejar.com.

+

Help us fix it by sending us feedback.

{% endblock %} diff --git a/frontend/templates/503.html b/frontend/templates/503.html index 63549d3f..acca3052 100644 --- a/frontend/templates/503.html +++ b/frontend/templates/503.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - +{% load url from future %} {% block news %}
We estimate that we will be back online at 2:00 pm EDT on Saturday, March 30, 2013. @@ -14,7 +14,7 @@ While you wait, why not like us on Facebook, follow us on Twitter, or subscribe to our blog? We'll keep you up to date there with our progress fixing things.

-

You can also help us by sending us feedback: support@gluejar.com.

+

You can also help us by sending us feedback.

Thank you, and we're sorry for the inconvenience.

diff --git a/frontend/templates/base.html b/frontend/templates/base.html index f9b87bfe..ad77623f 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -45,7 +45,7 @@
-

Feedback

+

Feedback

@@ -170,7 +170,7 @@
  • General FAQ
  • Author/Publisher FAQ
  • API
    • -
  • support@gluejar.com +
  • Support
  • Unglue.it ♥ Libraries
    • diff --git a/frontend/templates/download.html b/frontend/templates/download.html index 7fa0ccb4..9285d64d 100644 --- a/frontend/templates/download.html +++ b/frontend/templates/download.html @@ -401,7 +401,7 @@ $j(document).ready(function() {

    Need more help?

    -

    Email us at support@gluejar.com.

    +

    Ask us a question!

    DefectiveByDesign.org All downloads from Unglue.it are DRM free. Hooray! diff --git a/frontend/templates/faq.html b/frontend/templates/faq.html index bbef2e68..010f14c5 100644 --- a/frontend/templates/faq.html +++ b/frontend/templates/faq.html @@ -12,7 +12,7 @@
    Help! My question isn't covered in the FAQs!
    -
    Please email us at support@gluejar.com. We want to make sure everything on the site runs as smoothly as possible. Thanks for helping us do that.
    +
    Let us know!. We want to make sure everything on the site runs as smoothly as possible. Thanks for helping us do that.
    {% endif %} {% if location == 'basics' or location == 'faq' %} @@ -122,7 +122,7 @@ Click on this for
    I never received an activation email after I signed up, or my activation email isn't working. What do I do?
    -
    Check your spam folder for mail from notices@gluejar.com. If that doesn't work, contact us at support@gluejar.com.
    +
    Check your spam folder for mail from notices@gluejar.com. If that doesn't work, Let us know!
    How do I connect my Twitter, Facebook, GoodReads, and/or LibraryThing accounts? How can I link to my personal web site?
    @@ -157,7 +157,7 @@ If you receive our newsletter, there's a link at the bottom of every message to
    How can I contact Unglue.it?
    -
    For support requests, support@gluejar.com. For general inquiries, use our Ask Questions Frequently account, aqf@gluejar.com. For rights inquiries, rights@gluejar.com. Media requests, press@gluejar.com
    +
    For support requests, use our feedback form. For general inquiries, use our Ask Questions Frequently account, aqf@gluejar.com. For rights inquiries, rights@gluejar.com. Media requests, press@gluejar.com
    Who is Unglue.it?
    diff --git a/frontend/templates/feedback.html b/frontend/templates/feedback.html index 172533fa..9f47b78c 100644 --- a/frontend/templates/feedback.html +++ b/frontend/templates/feedback.html @@ -1,5 +1,5 @@ {% extends "basedocumentation.html" %} - +{% load url from future %} {% block title %}Feedback{% endblock %} {% block doccontent %} @@ -7,7 +7,7 @@

    Love something? Hate something? Found something broken or confusing? Thanks for telling us!

    To: support@gluejar.com

    -
    + {% csrf_token %} {{ form.sender.errors }} {{ form.sender.label_tag }}
    @@ -28,4 +28,6 @@ {{ form.page }}
    + +

    If for some reason this form doesn't work, you can send email to unglue.it support at support@gluejar.com.

    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/gift_error.html b/frontend/templates/gift_error.html index fe6fd41c..b01e557a 100644 --- a/frontend/templates/gift_error.html +++ b/frontend/templates/gift_error.html @@ -5,10 +5,10 @@

    Invalid Gift Code

    {% if gift %} -

    Sorry, the gift code you tried to use for "{{ work.title }}" has already been redeemed. If you think it should still be valid, don't hesitate to contact unglue.it support. +

    Sorry, the gift code you tried to use for "{{ work.title }}" has already been redeemed. If you think it should still be valid, don't hesitate to contact us.

    {% else %} -

    Sorry, your gift code is invalid. Perhaps there was a problem cutting and pasting the URL? If you're having trouble, don't hesitate to contact unglue.it support. +

    Sorry, your gift code is invalid. Perhaps there was a problem cutting and pasting the URL? If you're having trouble, don't hesitate to contact contact us.

    {% endif %}
    diff --git a/frontend/templates/gift_user_error.html b/frontend/templates/gift_user_error.html index ece1910d..b5774644 100644 --- a/frontend/templates/gift_user_error.html +++ b/frontend/templates/gift_user_error.html @@ -12,7 +12,7 @@

    Wrong user for gift credit

    -

    Unglue.it would like to process your gift credit, but you are currently logged in as {{request.user.username}}. Your gift credit from {{nonprofit.name}} for ${{ envelope.amount }}.{{ envelope.cents }} is designated for {{ envelope.username }}. To record your credit, you need to log out, and then log in as {{ envelope.username }}. If you have any problem, don't hesitate to contact unglue.it support. +

    Unglue.it would like to process your gift credit, but you are currently logged in as {{request.user.username}}. Your gift credit from {{nonprofit.name}} for ${{ envelope.amount }}.{{ envelope.cents }} is designated for {{ envelope.username }}. To record your credit, you need to log out, and then log in as {{ envelope.username }}. If you have any problem, don't hesitate to contact us.

    diff --git a/frontend/templates/gift_welcome.html b/frontend/templates/gift_welcome.html index be035310..7c76de17 100644 --- a/frontend/templates/gift_welcome.html +++ b/frontend/templates/gift_welcome.html @@ -29,7 +29,7 @@ {% endifequal %}
    -Or you can change your username — browse free books — send us feedback — manage your contact preferences +Or you can change your username — browse free books — send us feedback — manage your contact preferences
    {% endblock %} diff --git a/frontend/templates/manage_campaign.html b/frontend/templates/manage_campaign.html index 7ac9e107..cc501c88 100644 --- a/frontend/templates/manage_campaign.html +++ b/frontend/templates/manage_campaign.html @@ -488,7 +488,7 @@ Please fix the following before launching your campaign:
  • Have you previewed your campaign? Does it look how you want it to?
    • -

    If it doesn't look exactly the way you like, or you're having any trouble with your description, we're happy to help; please email unglue.it support (support@gluejar.com).

    +

    If it doesn't look exactly the way you like, or you're having any trouble with your description, we're happy to help; please contact us.

    If you're happy with your campaign, here's your moment of truth!

    diff --git a/frontend/templates/notification/account_active/notice.html b/frontend/templates/notification/account_active/notice.html index 718d6dad..cb57f256 100644 --- a/frontend/templates/notification/account_active/notice.html +++ b/frontend/templates/notification/account_active/notice.html @@ -1,4 +1,5 @@ {% extends "notification/notice_template.html" %} +{% load url from future %} {% load humanize %} {% block comments_graphical %} @@ -8,8 +9,7 @@ {% block comments_textual %}

    As you requested, we've updated your account with the payment method you provided.

    -

    If you have any questions, we are happy to help. Simply email us at -support@gluejar.com.

    +

    If you have any questions, we are happy to help. Simply contact us.

    {% if user.profile.account %}

    The current card we have on file:

    diff --git a/frontend/templates/notification/account_expired/notice.html b/frontend/templates/notification/account_expired/notice.html index 7277e60b..2109e46b 100644 --- a/frontend/templates/notification/account_expired/notice.html +++ b/frontend/templates/notification/account_expired/notice.html @@ -13,8 +13,7 @@ When you receive your new card, simply go to Accounts & Pledges to enter your card information. Thank you!

    -

    If you have any questions, we are happy to help. Simply email us at -support@gluejar.com.

    +

    If you have any questions, we are happy to help. Simply contact us.

    {% if user.profile.account %}

    The current card we have on file:

    diff --git a/frontend/templates/notification/account_expiring/notice.html b/frontend/templates/notification/account_expiring/notice.html index 9371741c..d21b0520 100644 --- a/frontend/templates/notification/account_expiring/notice.html +++ b/frontend/templates/notification/account_expiring/notice.html @@ -14,8 +14,7 @@ When you receive your new card, simply go to Accounts & Pledges to enter your card information. Thank you!

    -

    If you have any questions, we are happy to help. Simply email us at -support@gluejar.com.

    +

    If you have any questions, we are happy to help. Simply contact us.

    {% if user.profile.account %}

    The current card we have on file:

    diff --git a/frontend/templates/notification/rights_holder_claim/notice.html b/frontend/templates/notification/rights_holder_claim/notice.html index 4e04038a..721355d8 100644 --- a/frontend/templates/notification/rights_holder_claim/notice.html +++ b/frontend/templates/notification/rights_holder_claim/notice.html @@ -28,7 +28,7 @@ Finally, think about how you're going to publicize your campaign: social media, We're thrilled to be working with you. {% endifequal %} {% ifequal claim.status 'pending' %} - The claim for {{ claim.work }} will be examined, and we'll email you. Contact us at support@gluejar.com if you need any help. + The claim for {{ claim.work }} will be examined, and we'll email you. Contact us if you need any help. {% endifequal %} {% ifequal claim.status 'release' %} The claim for {{ claim.work }} has been released. Contact us at rights@gluejar.com if you have questions. diff --git a/frontend/templates/notification/wishlist_unglued_book_released/notice.html b/frontend/templates/notification/wishlist_unglued_book_released/notice.html index a70f6315..244d14b4 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/notice.html +++ b/frontend/templates/notification/wishlist_unglued_book_released/notice.html @@ -54,9 +54,9 @@

    {% if work.last_campaign_status == 'SUCCESSFUL' %} - If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing. + If you have any problems with this unglued ebook, please don't hesitate to contact us. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing. {% else %} - If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble. + If you have any problems with these ebook files, please don't hesitate to contact us. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble. {% endif %}

    diff --git a/frontend/templates/pledge_card_error.html b/frontend/templates/pledge_card_error.html index d3ad8803..db24aa1d 100644 --- a/frontend/templates/pledge_card_error.html +++ b/frontend/templates/pledge_card_error.html @@ -14,7 +14,7 @@

    Unglue.it would like to accept your credit card, but we encountered a problem: {{transaction.error}} {% if request.user.account_set %}Please Update your credit card, {% else %}Please try again,{% endif %} - or contact unglue.it support. + or contact us.

    diff --git a/frontend/templates/pledge_user_error.html b/frontend/templates/pledge_user_error.html index 227d0437..75229a4b 100644 --- a/frontend/templates/pledge_user_error.html +++ b/frontend/templates/pledge_user_error.html @@ -12,7 +12,7 @@

    Error: Wrong user for a {{ action }} transaction

    -

    Unglue.it would like to process your {{ action }}, but you are currently logged in as {{request.user.username}}. To complete your {{ action }}, you need to log out, and then log in as {{ transaction.user.username }}. If you have any problem, don't hesitate to contact unglue.it support. +

    Unglue.it would like to process your {{ action }}, but you are currently logged in as {{request.user.username}}. To complete your {{ action }}, you need to log out, and then log in as {{ transaction.user.username }}. If you have any problem, don't hesitate to contact us.

    diff --git a/frontend/templates/registration/welcome.html b/frontend/templates/registration/welcome.html index 2dc07d90..1ecd0eaf 100644 --- a/frontend/templates/registration/welcome.html +++ b/frontend/templates/registration/welcome.html @@ -13,7 +13,7 @@

    -Or you can change your username — see the site's favorite books — send us feedback — manage your contact preferences +Or you can change your username — see the site's favorite books — send us feedback — manage your contact preferences
    {% endblock %} diff --git a/frontend/templates/rh_tools.html b/frontend/templates/rh_tools.html index bfd0c7e3..2097af5b 100644 --- a/frontend/templates/rh_tools.html +++ b/frontend/templates/rh_tools.html @@ -244,7 +244,7 @@ If you're an author, publisher, or other rights holder, you can participate more
  • Use this form to enter the metadata.
  • Your ebooks must have ISBNs or OCLC numbers assigned.
  • Your metadata should have title, authors, language, description.
    • -
  • If you have a lot of books to enter, contact us to load ONIX or CSV files for you.
    • +
  • If you have a lot of books to enter, contact us to load ONIX or CSV files for you.
    • {% if campaigns %}
  • You've set up {{ campaigns.count }} campaign(s). Manage them above.
    • @@ -284,5 +284,5 @@ Any print book can be scanned to create a digital file that can then become an e

    More Questions

    -

    Check the FAQ to the left, or send us feedback. +

    Check the FAQ to the left, or send us feedback. {% endblock %} \ No newline at end of file diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index 1f13b4a8..d3babffc 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -311,7 +311,7 @@ function highlightTarget(targetdiv) { -

    We'd also love to hear your feedback. +

    We'd also love to hear your feedback. {% else %}