Merge branch 'master' of github.com:Gluejar/regluit into ry
Raymond Yee
commit
4a9b9b1f31
|
|
@ -11,7 +11,7 @@ You can help even more by sharing this campaign with your friends.
|
|||
|
||||
Facebook: https://www.facebook.com/sharer.php?u=http://{{ domain }}{% url work work_id %}
|
||||
|
||||
Twitter: https://twitter.com/intent/tweet?url=http://{{ domain }}{% url work work_id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21"
|
||||
Twitter: https://twitter.com/intent/tweet?url=http://{{ domain }}{% url work work_id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21"
|
||||
|
||||
You can also embed this widget for {{ title }} in your web site:
|
||||
<iframe src="https://{{ domain }}/api/widget/{{ work.first_isbn_13 }}/" width="152" height="325" frameborder="0"></iframe>
|
||||
|
|
|
|||
|
|
@ -45,14 +45,17 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="jsmodule rounded">
|
||||
<div class="jsmodule rounded clearfix">
|
||||
<div class="jsmod-content">
|
||||
|
||||
{% if faqmenu == 'modify' %}
|
||||
<div>You've already pledged to this campaign.<hr/>
|
||||
<div class="modify_notification clearfix"><h4>You've already pledged to this campaign:</h4>
|
||||
<div>
|
||||
Amount: ${{preapproval_amount}}.<br />
|
||||
Your premium: {% if premium_description %}{{ premium_description }}{% else %}You did not request a premium for this campaign.{% endif %}<br/>
|
||||
If you would like to modify your pledge, please use the following form.</div>
|
||||
</div>
|
||||
<br /> You can modify your pledge below.
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% comment %}
|
||||
|
|
@ -89,8 +92,8 @@
|
|||
<input type="submit" {% if faqmenu == 'modify' %}value="Modify Pledge"{% else %}value="Pledge"{% endif %} id="pledgesubmit" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{% if faqmenu == 'modify' %}<div>We hope you won't, but of course you're also free to <a href="{% url pledge_cancel %}?tid={{ tid }}">cancel your pledge</a>.</div>{% endif %}
|
||||
</div>
|
||||
{% if faqmenu == 'modify' %}<div class="spacer"></div><div>We hope you won't, but of course you're also free to <a href="{% url pledge_cancel %}?tid={{ tid }}">cancel your pledge</a>.</div>{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ $j(document).ready(function(){
|
|||
|
||||
{% block content %}
|
||||
{% with work.last_campaign_status as status %}
|
||||
{% with work.id as work_id %}
|
||||
<div id="main-container">
|
||||
<div class="js-main">
|
||||
<div id="js-leftcol">
|
||||
|
|
@ -122,9 +123,9 @@ $j(document).ready(function(){
|
|||
</div>
|
||||
{% if status == 'ACTIVE' %}
|
||||
{% if pledged %}
|
||||
<div class="btn_support modify"><form action="{% url pledge_modify work_id=work.id %}" method="get"><input type="submit" value="Modify Pledge" /></form></div>
|
||||
<div class="btn_support modify"><form action="{% url pledge_modify work_id %}" method="get"><input type="submit" value="Modify Pledge" /></form></div>
|
||||
{% else %}
|
||||
<div class="btn_support"><form action="{% url pledge work_id=work.id %}" method="get"><input type="submit" value="Support" /></form></div>
|
||||
<div class="btn_support"><form action="{% url pledge work_id %}" method="get"><input type="submit" value="Support" /></form></div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
@ -159,13 +160,13 @@ $j(document).ready(function(){
|
|||
{% if work.googlebooks_id %}
|
||||
<a id="find-google" href="{{ work.googlebooks_url }}"><img src="/static/images/supporter_icons/googlebooks_square.png" title="Find on Google Books" alt="Find on Google Books" /></a>
|
||||
{% endif %}
|
||||
<a rel="nofollow" class="find-openlibrary" href="{% url work_openlibrary work.id %}"><img src="/static/images/supporter_icons/openlibrary_square.png" title="Find on OpenLibrary" alt="Find on OpenLibrary" /></a>
|
||||
<a rel="nofollow" class="find-openlibrary" href="{% url work_openlibrary work_id %}"><img src="/static/images/supporter_icons/openlibrary_square.png" title="Find on OpenLibrary" alt="Find on OpenLibrary" /></a>
|
||||
{% if not request.user.is_anonymous %}
|
||||
{% if request.user.profile.goodreads_user_link %}
|
||||
<a rel="nofollow" class="find-goodreads" href="{% url work_goodreads work.id %}"><img src="/static/images/supporter_icons/goodreads_square.png" title="Find on GoodReads" alt="Find on GoodReads" /></a>
|
||||
<a rel="nofollow" class="find-goodreads" href="{% url work_goodreads work_id %}"><img src="/static/images/supporter_icons/goodreads_square.png" title="Find on GoodReads" alt="Find on GoodReads" /></a>
|
||||
{% endif %}
|
||||
{% if request.user.profile.librarything_id %}
|
||||
<a rel="nofollow" class="find-librarything" href="{% url work_librarything work.id %}"><img src="/static/images/supporter_icons/librarything_square.png" title="Find on LibraryThing" alt="Find on LibraryThing" /></a>
|
||||
<a rel="nofollow" class="find-librarything" href="{% url work_librarything work_id %}"><img src="/static/images/supporter_icons/librarything_square.png" title="Find on LibraryThing" alt="Find on LibraryThing" /></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
@ -197,7 +198,7 @@ $j(document).ready(function(){
|
|||
<div class="btn_wishlist" id="wishlist_actions">
|
||||
{% if request.user.is_anonymous %}
|
||||
<div class="create-account">
|
||||
<span title="{% url work work.id %}">Login to Add</span>
|
||||
<span title="{% url work work_id %}">Login to Add</span>
|
||||
</div>
|
||||
{% else %}{% if request.user.id in work.last_campaign.supporters %}
|
||||
<div class="add-wishlist">
|
||||
|
|
@ -205,11 +206,11 @@ $j(document).ready(function(){
|
|||
</div>
|
||||
{% else %}{% if work in request.user.wishlist.works.all %}
|
||||
<div class="remove-wishlist-workpage">
|
||||
<span id="w{{ work.id }}">Remove This</span>
|
||||
<span id="w{{ work_id }}">Remove This</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="add-wishlist">
|
||||
<span class="work_id" id="w{{ work.id }}">Add to Wishlist</span>
|
||||
<span class="work_id" id="w{{ work_id }}">Add to Wishlist</span>
|
||||
</div>
|
||||
{% endif %}{% endif %}{% endif %}
|
||||
</div>
|
||||
|
|
@ -321,7 +322,7 @@ $j(document).ready(function(){
|
|||
|
||||
<h4>Editions</h4>
|
||||
{% if user.is_staff %}
|
||||
<div><a href="{% url new_edition work.id edition.id %}">Create a new edition for this work</a><br /><br /></div>
|
||||
<div><a href="{% url new_edition work_id edition.id %}">Create a new edition for this work</a><br /><br /></div>
|
||||
{% endif %}
|
||||
|
||||
{% if alert %}<div class="alert"><b>Ebook Contribution:</b><br />{{ alert }}</div>{% endif %}
|
||||
|
|
@ -336,7 +337,7 @@ $j(document).ready(function(){
|
|||
OCLC: <a href="http://www.worldcat.org/oclc/{{ edition.oclc }}">{{ edition.oclc }}</a><br />
|
||||
{% endif %}
|
||||
{% if user.is_staff %}
|
||||
<a href="{% url new_edition work.id edition.id %}">Edit this edition</a><br />
|
||||
<a href="{% url new_edition work_id edition.id %}">Edit this edition</a><br />
|
||||
{% endif %}
|
||||
{% if edition.googlebooks_id %}
|
||||
See <a href="https://encrypted.google.com/books?id={{ edition.googlebooks_id }}">this edition on Google Books</a>
|
||||
|
|
@ -391,16 +392,29 @@ $j(document).ready(function(){
|
|||
<h3 class="jsmod-title"><span>Support</span></h3>
|
||||
<div class="jsmod-content">
|
||||
<ul class="support menu">
|
||||
{% if pledged %}
|
||||
{% for premium in premiums %}
|
||||
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
|
||||
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
|
||||
<a href="{% url pledge work_id=work.id %}?premium_id={{premium.id}}">
|
||||
<a href="{% url pledge_modify work_id %}?premium_id={{premium.id}}">
|
||||
<span class="menu-item-price">${{ premium.amount }}</span>
|
||||
<span class="menu-item-desc">{{ premium.description }}</span>
|
||||
{% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
|
||||
</a></li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{% for premium in premiums %}
|
||||
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
|
||||
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
|
||||
<a href="{% url pledge work_id %}?premium_id={{premium.id}}">
|
||||
<span class="menu-item-price">${{ premium.amount }}</span>
|
||||
<span class="menu-item-desc">{{ premium.description }}</span>
|
||||
{% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
|
||||
</a></li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -410,4 +424,5 @@ $j(document).ready(function(){
|
|||
</div>
|
||||
</div>
|
||||
{% endwith %}
|
||||
{% endwith %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -124,3 +124,15 @@ p {
|
|||
.jsmodule.pledge .jsmod-content {
|
||||
float: right !important;
|
||||
}
|
||||
.modify_notification {
|
||||
width: 452px;
|
||||
margin-bottom: 7px;
|
||||
border: solid 2px #8dc63f;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
padding: 7px;
|
||||
}
|
||||
.modify_notification h4 {
|
||||
margin: 0 0 5px 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,3 +43,15 @@ p {
|
|||
float: right !important;
|
||||
}
|
||||
}
|
||||
|
||||
.modify_notification {
|
||||
width: 452px;
|
||||
margin-bottom: 7px;
|
||||
border: solid 2px @call-to-action;
|
||||
.one-border-radius(5px);
|
||||
padding: 7px;
|
||||
|
||||
h4 {
|
||||
margin: 0 0 5px 0;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue