From 240564e75bc43750520c8feccf8e7c695b5278aa Mon Sep 17 00:00:00 2001 From: eric Date: Wed, 11 May 2016 10:36:20 -0400 Subject: [PATCH] remove template workaround for testing --- frontend/templates/about.html | 2 +- frontend/templates/about_lightbox_footer.html | 2 +- frontend/templates/base.html | 41 +++++++------------ frontend/templates/book_panel.html | 4 +- .../notification/notice_settings.html | 4 +- .../notification/notice_template.html | 7 ---- frontend/templates/rh_tools.html | 2 +- 7 files changed, 21 insertions(+), 41 deletions(-) diff --git a/frontend/templates/about.html b/frontend/templates/about.html index d4408479..db2666d3 100644 --- a/frontend/templates/about.html +++ b/frontend/templates/about.html @@ -11,7 +11,7 @@
  • Books that are out of print, not available as ebooks, or otherwise hard to enjoy will be available for everyone to read, share, learn from, and love -- freely and legally.
    • -

    You can learn more about us in our FAQs and our press page. +

    You can learn more about us in our FAQs and our press page.

    Team

    diff --git a/frontend/templates/about_lightbox_footer.html b/frontend/templates/about_lightbox_footer.html index 8fee2162..2eb9ec0d 100644 --- a/frontend/templates/about_lightbox_footer.html +++ b/frontend/templates/about_lightbox_footer.html @@ -1,5 +1,5 @@ {% load url from future %} -
    Read the FAQ
    +
    Read the FAQ
    Read the FAQ for authors and publishers
    Our press coverage
    {% if not user.is_authenticated %} diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 0e9e4c2f..69cfb6fc 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -1,17 +1,4 @@ -{% load url from future %} -{# raw url references raise test errors in tests for django registration; this is a workaround #} -{% url 'privacy' as privacyurl %} -{% url 'terms' as termsurl %} -{% url 'manage_account' as editurl %} -{% url 'rightsholders' as rhtoolsurl %} -{% url 'faq' as faqurl %} -{% url 'about' as abouturl %} -{% url 'press' as pressurl %} -{% url 'rh_admin' as adminurl %} -{% url 'landing' as landingurl %} -{% url 'new_edition' '' '' as editionurl %} -{% url 'libraries' as librariesurl %} -{% url 'about_specific' 'main' as aboutmainurl %} + {% load truncatechars %} @@ -59,7 +46,7 @@
    {% block search_box %} {% if not suppress_search_box %} @@ -102,7 +89,7 @@
  • Profile Settings
  • Account & Pledges
    • {% if user.rights_holder.all %} -
  • Rights Holder Tools
    • +
  • Rights Holder Tools
    • {% endif %}
  • Sign Out
    • @@ -134,10 +121,10 @@
    About Unglue.it
    @@ -145,28 +132,28 @@ Your account
    Help
    diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 5e0c64d0..780dfedd 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -154,9 +154,9 @@ {% if status == 'INITIALIZED' %}

    Campaign coming soon!

    {% else %}{% if status == 'SUSPENDED' %} -

    This campaign has been suspended.


    See the FAQ for details.

    +

    This campaign has been suspended.


    See the FAQ for details.

    {% else %}{% if status == 'WITHDRAWN' %} -

    This campaign has been withdrawn.


    See the FAQ for details.

    +

    This campaign has been withdrawn.


    See the FAQ for details.

    {% else %}{% if status == 'UNSUCCESSFUL' %}

    {{ deadline }}

    Watch for a new campaign.

    diff --git a/frontend/templates/notification/notice_settings.html b/frontend/templates/notification/notice_settings.html index da711cd1..61a30055 100644 --- a/frontend/templates/notification/notice_settings.html +++ b/frontend/templates/notification/notice_settings.html @@ -200,13 +200,13 @@ $j(document).ready(function() { {{ user.email }}

    - ({% blocktrans %}You can change this under Account.{% endblocktrans %}) + ({% blocktrans %}You can change this under Account.{% endblocktrans %})

    {% else %}
    {% blocktrans %} You do not have a verified email address to which notices can be sent. - You can add one by going to Account. + You can add one by going to Account. {% endblocktrans %}
    {% endif %} diff --git a/frontend/templates/notification/notice_template.html b/frontend/templates/notification/notice_template.html index dd22261e..2f35007b 100644 --- a/frontend/templates/notification/notice_template.html +++ b/frontend/templates/notification/notice_template.html @@ -1,10 +1,3 @@ -{% load url from future %}{% comment %} -django-notification and {% with %} play poorly together. Don't use {% with %} -in child templates. Also don't do {% url 'something' as something %}; it doesn't work and I'm not clear why. - -Exception: you can include notification/sharing_block.html into a notice.html to have -tweet, FB, email sharing show up. Include a {% url 'work' your.local.work.id as work_url %} immediately prior. -{% endcomment %}
    diff --git a/frontend/templates/rh_tools.html b/frontend/templates/rh_tools.html index 4cc47fc3..2183eab0 100644 --- a/frontend/templates/rh_tools.html +++ b/frontend/templates/rh_tools.html @@ -239,7 +239,7 @@ If you're an author, publisher, or other rights holder, you can participate more
    • Use the Claim option on the More... tab of each book's page.
      • -
    • Agree to our Terms on the following page. This includes agreeing that you are making the claim in good faith and can substantiate that you have legal control over worldwide electronic rights to the work.
      • +
    • Agree to our Terms on the following page. This includes agreeing that you are making the claim in good faith and can substantiate that you have legal control over worldwide electronic rights to the work.
    • If you have any questions or you claim a work by mistake, email us.
    • We will review your claim. We may contact you at {{ request.user.email }} if we have any questions. If this is the wrong email address, please change the email address for your account.