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

Merge branch 'master' of github.com:Gluejar/regluit into payment 

Conflicts:
	settings/please.py
pull/1/head
Raymond Yee 2012-04-18 08:13:38 -07:00
parent 38be468249 98cc04deb8
commit c59923583b
11 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/templates/base.html
View File

@ -57,9 +57,9 @@
<li class="first">
<a href="/supporter/{{user.username}}"><span id="welcome">Welcome, {{ user.username|truncatechars:20 }}</span></a>
{% if unseen_count %}
<a href="/notification" id="unseen_count"><div id="yes">{{ unseen_count }}</div></a>
<a href="/notification" id="unseen_count"><div id="i_haz_notifications">{{ unseen_count }}</div></a>
{% else %}
<a href="/notification" id="unseen_count"><div id="no">0</div></a>
<a href="/notification" id="unseen_count"><div id="no_notifications_for_you">0</div></a>
{% endif %}
</li>
<li><a href="{% url auth_logout %}"><span>Sign Out</span></a></li>

12
frontend/templates/feedback.html
View File

@ -10,14 +10,14 @@
<form method="POST" action="/feedback/">
{% csrf_token %}
{{ form.sender.errors }}
{{ form.sender.label_tag }}</br>
{{ form.sender }}</br><br />
{{ form.sender.label_tag }}<br />
{{ form.sender }}<br /><br />
{{ form.subject.errors }}
{{ form.subject.label_tag }}</br>
{{ form.subject }}</br><br />
{{ form.subject.label_tag }}<br />
{{ form.subject }}<br /><br />
{{ form.message.errors }}
{{ form.message.label_tag }}</br>
{{ form.message }}</br><br />
{{ form.message.label_tag }}<br />
{{ form.message }}<br /><br />
{{ form.notarobot.errors }}
{{ form.non_field_errors }}
Please prove you're not a robot. {{num1}} + {{num2}} =

24
frontend/templates/manage_campaign.html
View File

@ -57,13 +57,13 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
<a href="{% url work_preview campaign.work.id %}" class="manage">Preview This Campaign</a>
</div>
{% endifequal %}
<h3>Description of the work offered for ungluing</h2>
<h3>Description of the work offered for ungluing</h3>
<form action="#" method="POST">
{% csrf_token %}
<p>This will be displayed in the Campaign tab for your work. It's your main pitch to supporters. It should include:</p>
<ul class="terms">
<li>A synopsis of the work.</li>
<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself. <span class="rh_help" id="helpHyperlink">(How do I hyperlink?)</span></li>
<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself. <span class="rh_help" id="helpHyperlink">(How do I hyperlink?)</span>
<div class="rh_answer" id="helpHyperlink2">
<p>Format a hyperlink like this:</p>
<p>&lt;a href="http://your_link_here"&gt;your link title here&lt;/a&gt;</p>
@ -71,9 +71,8 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
<p>&lt;a href="http://www.archive.org"&gt;the Internet Archive&lt;/a&gt;</p>
<p>will display as <a href="http://www.archive.org">the Internet Archive</a>.</p>
<p>Copy-paste the code above and substitute your own values. You will find the link address in the location bar of your browser.</p>
</div>
<li>Anything especially appealing about the work or author: awards, embedded video (460px max), etc. <span class="rh_help" id="helpEmbed">(How do I embed video?)</span></li>
</ul>
</div></li>
<li>Anything especially appealing about the work or author: awards, embedded video (460px max), etc. <span class="rh_help" id="helpEmbed">(How do I embed video?)</span>
<div id="helpEmbed2" class="rh_answer">
<p>To embed a video from YouTube:</p>
<p>Go to the page where you watch the video. Under the video, click "Share".</p>
@ -84,31 +83,32 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
<p>Of course, if you want to include other text in addition to video, you can do that.</p>
<p>If you'd like to change the size of the video, feel free; just don't make it more than 445px wide. Leaving it the default size is fine, too.</p>
<p>If you'd like to embed a video from another source, please talk to us. You certainly can; we just want to make sure we've given you the right instructions.</p>
</div>
</div></li>
</ul>
<p>Make it concise and emotionally appealing. The point here is not to tell ungluers everything about your book; it's to remind them why they love it.</p>
{{ form.description.errors }}{{ form.description }}
<h3>Offer details</h2>
<h3>Offer details</h3>
<p>This will be displayed on the Details tab for your work. It gives additional information for the highly curious. It should include:</p>
<ul class="terms">
<li>Details about the edition being offered.</li>
<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself.</li>
</uL>
{{ form.details.errors }}{{ form.details }}
<h3>Target Price</h2>
<h3>Target Price</h3>
<p> This is the target price for your campaign. Once you launch the campaign, you won't be able to increase it.</p>
{{ form.target.errors }}{{ form.target }}
<h3>License being offered</h2>
<h3>License being offered</h3>
<p> This is the license you are offering to use once the campaign succeeds. For more info on the licenses you can use, see <a href="http://creativecommons.org/">Creative Commons</a></p>
{{ form.license.errors }}{{ form.license }}
<h3>Ending date</h2>
<h3>Ending date</h3>
<p> This is the ending date of your campaign. Once you launch the campaign, you won't be able to change it.
The ending date can't be more than six months away- that's a practical limit for credit card authorizations.</p>
{{ form.deadline.errors }}{{ form.deadline }}
<h3>Paypal collection address</h2>
<h3>Paypal collection address</h3>
<p> If your campaign succeeds, the funds raised (less commission and fees) will be deposited in a paypal account bearing this email address.</p>
{{ form.paypal_receiver.errors }}{{ form.paypal_receiver }}</p>
<p>{{ form.paypal_receiver.errors }}{{ form.paypal_receiver }}</p>
{% ifequal campaign.status 'ACTIVE' %}
<input type="submit" name="save" value="Modify Campaign" />

9
frontend/templates/notification/comment_on_commented/notice.html
View File

@ -8,14 +8,7 @@
<div class="comments_info">
<div class="comments_graphical">
<a href="{% url supporter supporter_username=user %}">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ comment.user.profile.pic_url }}" height="50" width="50" alt="Picture of {{ comment.user }}" title="{{ comment.user }}" />
{% else %}
<img class="user-avatar" src="/static/images/header/avatar.png" height="50" width="50" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
</a>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
</div>
<div class="comments_textual">
{{ comment.comment|linebreaksbr }}

9
frontend/templates/notification/wishlist_comment/notice.html
View File

@ -8,14 +8,7 @@
<div class="comments_info">
<div class="comments_graphical">
<a href="{% url supporter supporter_username=user %}">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ comment.user.profile.pic_url }}" height="50" width="50" alt="Picture of {{ comment.user }}" title="{{ comment.user }}" />
{% else %}
<img class="user-avatar" src="/static/images/header/avatar.png" height="50" width="50" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
</a>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
</div>
<div class="comments_textual">
{{ comment.comment|linebreaksbr }}

8
frontend/templates/pledge.html
View File

@ -5,6 +5,8 @@
{% block extra_extra_head %}
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
<script type="text/javascript" src="/static/js/prefill_pledge.js"></script>
{% endblock %}
{% block doccontent %}
@ -54,12 +56,12 @@
{{ form.anonymous.label_tag }}: {{ form.anonymous.errors }}{{ form.anonymous }}
{% endcomment %}
<ul class="support menu">
<ul class="support menu" id="premiums_list">
{% for premium in premiums %}
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
<label for="{{premium.id}}">
<label for="premium_{{premium.id}}">
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<input type="radio" name="premium_id" value="{{premium.id}}" {% ifequal request.REQUEST.premium_id premium.id|stringformat:"s" %}checked="checked"{% endifequal %} />
<input type="radio" name="premium_id" id="premium_{{premium.id}}" value="{{premium.id}}" {% ifequal request.REQUEST.premium_id premium.id|stringformat:"s" %}checked="checked"{% endifequal %} />
<span class="menu-item-price">
${{ premium.amount }}
</span>

2
frontend/templates/work.html
View File

@ -271,7 +271,7 @@ $j(document).ready(function(){
{% endif %}
{% endif %}
<p>Need to talk to us about the rights status of this work? Please email <a href="mailto:rights@gluejar.com">rights@gluejar.com</a>.</p>
<p>If you'd like to contact us regarding rights for this work, please email <a href="mailto:rights@gluejar.com">rights@gluejar.com</a>.</p>
{% if work.subjects.all.count > 0 %}
<h4>Subjects</h4>

2
settings/please.py
View File

@ -121,7 +121,7 @@ IS_PREVIEW = False
# decide which of the period tasks to add to the schedule
#CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
# Amazon credentials (for fps)
AWS_ACCESS_KEY = ''

4
static/css/sitewide.css
View File

@ -355,12 +355,12 @@ ul.menu {
cursor: pointer;
text-align: center;
}
.js-topmenu ul li #unseen_count div#yes {
.js-topmenu ul li #unseen_count div#i_haz_notifications {
background-color: #8dc63f;
color: white;
border-color: #8dc63f;
}
.js-topmenu ul li #unseen_count div#no {
.js-topmenu ul li #unseen_count div#no_notifications_for_you {
border-color: #d6dde0;
background-color: #d6dde0;
color: #edf3f4;

12
static/js/prefill_pledge.js Normal file
View File

@ -0,0 +1,12 @@
// This autofills the pledge box when users select a premium tier.
var $j = jQuery.noConflict();
$j().ready(function() {
var inputbox = $j('#id_preapproval_amount');
$j('#premiums_list input').click(function() {
amount = $j(this).siblings('span.menu-item-price').html();
amount = amount.split('$')[1]
inputbox.val(amount);
});
});

4
static/less/sitewide.less
View File

@ -250,13 +250,13 @@ ul.menu{
cursor: pointer;
text-align: center;
&#yes {
&#i_haz_notifications {
background-color: @call-to-action;
color: white;
border-color: @call-to-action;
}
&#no {
&#no_notifications_for_you {
border-color: @blue-grey;
background-color: @blue-grey;
color: @pale-blue;