EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove template workaround for testing

pull/1/head
eric 2016-05-11 10:36:20 -04:00
parent 4f9a23cbc0
commit 240564e75b
7 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/templates/about.html
View File

@ -11,7 +11,7 @@
<li>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.</li>
</ul>
<p>You can learn more about us in our <a href="{{ faqurl }}">FAQs</a> and our <a href="{{ pressurl }}">press page</a>.
<p>You can learn more about us in our <a href="{% url 'faq' %}">FAQs</a> and our <a href="{% url 'press' %}">press page</a>.
<h3>Team</h3>
<div class="pressimages">
<div class="outer">

2
frontend/templates/about_lightbox_footer.html
View File

@ -1,5 +1,5 @@
{% load url from future %}
<div class="right_border"><a href="{{ faqurl }}">Read the FAQ</a></div>
<div class="right_border"><a href="{% url 'faq' %}">Read the FAQ</a></div>
<div class="right_border"><a href="{% url 'faq_location' 'rightsholders' %}">Read the FAQ for authors and publishers</a></div>
<div class="right_border"><a href="{% url 'press' %}">Our press coverage</a></div>
{% if not user.is_authenticated %}

41
frontend/templates/base.html
View File

@ -1,17 +1,4 @@
{% load url from future %}<!DOCTYPE html>
{# 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 %}
<!DOCTYPE html>
{% load truncatechars %}
<html>
@ -59,7 +46,7 @@
<div id="js-header">
<div class="js-main">
<div class="js-logo">
<a href="{{ landingurl }}"><img src="/static/images/logo.png" alt="unglue.it" title="unglue.it" /></a>
<a href="{% url 'landing' %}"><img src="/static/images/logo.png" alt="unglue.it" title="unglue.it" /></a>
</div>
{% block search_box %}
{% if not suppress_search_box %}
@ -102,7 +89,7 @@
<li><a class="notbutton" href="{% url 'supporter' user %}#edit" id="profile_edit"><span>Profile Settings</span></a></li>
<li><a class="notbutton" href="{% url 'manage_account' %}"><span>Account &amp; Pledges</span></a></li>
{% if user.rights_holder.all %}
<li><a class="notbutton" href="{{ rhtoolsurl }}">Rights Holder Tools</a></li>
<li><a class="notbutton" href="{% url 'rightsholders' %}">Rights Holder Tools</a></li>
{% endif %}
<li><a class="notbutton" href="{% url 'auth_logout' %}"><span>Sign Out</span></a></li>
</ul>
@ -134,10 +121,10 @@
<div class="column">
<span>About Unglue.it</span>
<ul>
<li><a href="{{ aboutmainurl }}" class="hijax">Concept</a></li>
<li><a href="{{ abouturl }}">Team</a></li>
<li><a href="{% url 'about_specific' 'main' %}" class="hijax">Concept</a></li>
<li><a href="{% url 'about' %}">Team</a></li>
<li><a href="https://blog.unglue.it">Blog</a></li>
<li><a href="{{ pressurl }}">Press</a></li>
<li><a href="{% url 'press' %}">Press</a></li>
<li><a href="http://eepurl.com/fKLfI">Newsletter</a></li>
</ul>
</div>
@ -145,28 +132,28 @@
<span>Your account</span>
<ul>
{% if user.is_authenticated %}
<li><a href="{{ editurl }}">Account Settings</a></li>
<li><a href="{% url 'manage_account' %}">Account Settings</a></li>
{% endif %}
<li><a href="{{ rhtoolsurl }}">Rights Holder Tools</a></li>
<li><a href="{{ privacyurl }}">Privacy</a></li>
<li><a href="{{ termsurl }}">Terms of Use</a></li>
<li><a href="{% url 'rightsholders' %}">Rights Holder Tools</a></li>
<li><a href="{% url 'privacy' %}">Privacy</a></li>
<li><a href="{% url 'terms' %}">Terms of Use</a></li>
{% for library in user.libraries.all %}
<li><a href="{% url 'library_admin' library.id %}">{{ library }} Administration</a></li>
{% endfor %}
{% if user.is_staff %}
<li><a href="{{ adminurl }}">Unglue.it Administration</a></li>
<li><a href="{{ editionurl }}">Create New Editions</a></li>
<li><a href="{% url 'rh_admin' %}">Unglue.it Administration</a></li>
<li><a href="{% url 'new_edition' '' '' %}">Create New Editions</a></li>
{% endif %}
</ul>
</div>
<div class="column">
<span>Help</span>
<ul>
<li><a href="{{ faqurl }}">General FAQ</a></li>
<li><a href="{% url 'faq' %}">General FAQ</a></li>
<li><a href="{% url 'faq_location' 'rightsholders' %}">Author/Publisher FAQ</a></li>
<li><a href="{% url 'api_help' %}">API</a></li>
<li><a href="{% url 'feedback' %}?page={{request.build_absolute_uri|urlencode:""}}">Support</a>
<li><a href="{{ librariesurl }}">Unglue.it &hearts; Libraries</a>
<li><a href="{% url 'libraries' %}">Unglue.it &hearts; Libraries</a>
</ul>
</div>
<div class="column">

4
frontend/templates/book_panel.html
View File

@ -154,9 +154,9 @@
{% if status == 'INITIALIZED' %}
<p>Campaign coming soon!</p>
{% else %}{% if status == 'SUSPENDED' %}
<p>This campaign has been suspended.</p><br /><p>See the <a href="{{faqurl}}">FAQ</a> for details.</p>
<p>This campaign has been suspended.</p><br /><p>See the <a href="{% url 'faq' %}">FAQ</a> for details.</p>
{% else %}{% if status == 'WITHDRAWN' %}
<p>This campaign has been withdrawn.</p><br /><p>See the <a href="{{faqurl}}">FAQ</a> for details.</p>
<p>This campaign has been withdrawn.</p><br /><p>See the <a href="{% url 'faq' %}">FAQ</a> for details.</p>
{% else %}{% if status == 'UNSUCCESSFUL' %}
<p>{{ deadline }}</p>
<p>Watch for a new campaign.</p>

4
frontend/templates/notification/notice_settings.html
View File

@ -200,13 +200,13 @@ $j(document).ready(function() {
{{ user.email }}<br />
</p>
<p>
({% blocktrans %}You can change this under <a href="{{ editurl }}">Account</a>.{% endblocktrans %})
({% blocktrans %}You can change this under <a href="{% url 'manage_account' %}">Account</a>.{% endblocktrans %})
</p>
{% else %}
<div class="errorlist">
{% blocktrans %}
You do not have a verified email address to which notices can be sent.
You can add one by going to <a href="{{ editurl }}">Account</a>.
You can add one by going to <a href="{% url 'manage_account' %}">Account</a>.
{% endblocktrans %}
</div>
{% endif %}

7
frontend/templates/notification/notice_template.html
View File

@ -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 %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">

2
frontend/templates/rh_tools.html
View File

@ -239,7 +239,7 @@ If you're an author, publisher, or other rights holder, you can participate more
</form>
<ul class="bullets">
<li>Use the Claim option on the More... tab of each book's page.</li>
<li>Agree to our <a href="{{ termsurl }}">Terms</a> 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.</li>
<li>Agree to our <a href="{% url 'terms' %}">Terms</a> 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.</li>
<li>If you have any questions or you claim a work by mistake, <a href="mailto:rights@gluejar.com?subject=claiming%20works">email us</a>.</li>
<li>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 <a href="{% url 'regluit.frontend.views.edit_user' %}">change the email address</a> for your account.</li>
</ul>