pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
parent
1aa9b5e550
commit
911f6f6212
|
@ -41,7 +41,11 @@
|
|||
|
||||
<div class="jsmodule rounded">
|
||||
<div class="jsmod-content">
|
||||
|
||||
|
||||
{% if faqmenu == 'modify' %}
|
||||
<p>You have pledged ${{preapproval_amount}}. If you would like to modify your pledge, please use the following form.</p>
|
||||
{% endif %}
|
||||
|
||||
{% comment %}
|
||||
Even there is a CampaignPledgeForm in frontend/forms.py , the "widget" for premium_id is implemented in HTML here for now.
|
||||
{% endcomment %}
|
||||
|
@ -73,7 +77,7 @@
|
|||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<input type="submit" value="Pledge" id="pledgesubmit" />
|
||||
<input type="submit" {% if faqmenu == 'modify' %}value="Modify Pledge"{% else %}value="Pledge"{% endif %} id="pledgesubmit" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ we need the share options and also something like the home page slide show to gi
|
|||
|
||||
<h2 class="thank-you">Thank you!</h2>
|
||||
|
||||
<p class="pledge_complete">You're now ungluing <I>{{work.title}}</I>.</p>
|
||||
<p class="pledge_complete">You're now ungluing <a href="{% url work work.id %}">{{work.title}}</a>.</p>
|
||||
<p class="pledge_complete">You can help even more by sharing this campaign with your friends:</p>
|
||||
|
||||
<div id="widgetcode">Copy/paste this into your site:<br /><textarea rows="7" cols="22"><iframe src="https://{{request.META.HTTP_HOST}}/api/widget/{{work.first_isbn_13}}/" width="152" height="325" frameborder="0"></iframe></textarea></div>
|
||||
|
|
|
@ -1,97 +0,0 @@
|
|||
{% extends "basepledge.html" %}
|
||||
|
||||
{% block title %}Pledge (Modify){% endblock %}
|
||||
|
||||
{% 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" />
|
||||
{% endblock %}
|
||||
|
||||
{% block doccontent %}
|
||||
<div style="height:10px";></div>
|
||||
<div class="book-detail">
|
||||
<div class="book-detail-img">
|
||||
<a href="#"><img src="{{ work.cover_image_thumbnail }}" alt="{{ work.title }}" title="{{ work.title }}" width="131" height="192" /></a>
|
||||
</div>
|
||||
|
||||
<div class="book-detail-info">
|
||||
<h2 class="book-name">{{ work.title }}</h2>
|
||||
<h3 class="book-author">{{ work.author }}</h3>
|
||||
<h3 class="book-year">{{ work.publication_date }}</h3>
|
||||
|
||||
<div class="find-book">
|
||||
<label>Find it here</label>
|
||||
|
||||
<div class="find-link">
|
||||
<a class="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>
|
||||
<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>
|
||||
{% 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>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pledged-info">
|
||||
<div class="pledged-group">
|
||||
{{ work.last_campaign.supporters.count }} Ungluers have pledged ${{ work.last_campaign.current_total }}
|
||||
</div>
|
||||
<div class="status">
|
||||
<img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" title="book list status" alt="book list status" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="jsmodule rounded pledge">
|
||||
<div class="jsmod-content">
|
||||
${{ work.last_campaign.target }} needed by<br />
|
||||
{{ work.last_campaign.deadline }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="jsmodule rounded">
|
||||
<div class="jsmod-content">
|
||||
|
||||
<p>You have pledged ${{preapproval_amount}}. If you would like to modify your pledge, please use the following form.</p>
|
||||
{% comment %}
|
||||
Even there is a CampaignPledgeForm in frontend/forms.py , the "widget" for premium_id is implemented in HTML here for now.
|
||||
{% endcomment %}
|
||||
|
||||
<form method="POST" action="{% url pledge_modify work_id=work.id %}">
|
||||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div class="pledge_amount">{{ form.preapproval_amount.label_tag }}: {{ form.preapproval_amount.errors }}${{ form.preapproval_amount }}</div>
|
||||
|
||||
{% comment %}
|
||||
not supported yet; don't display
|
||||
{{ form.anonymous.label_tag }}: {{ form.anonymous.errors }}{{ form.anonymous }}
|
||||
{% endcomment %}
|
||||
|
||||
<ul class="support menu">
|
||||
{% for premium in premiums %}
|
||||
<label for="{{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 form.premium_id.value premium.id %}checked="checked"{% endifequal %} />
|
||||
<span class="menu-item-price">
|
||||
${{ premium.amount }}
|
||||
</span>
|
||||
<span class="menu-item-desc">
|
||||
{{ premium.description }}
|
||||
</span>
|
||||
</a></li></label>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<input type="submit" value="Modify Pledge" id="pledgesubmit" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ $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="Change Pledge" /></form></div>
|
||||
<div class="btn_support modify"><form action="{% url pledge_modify work_id=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>
|
||||
{% endif %}
|
||||
|
|
|
@ -479,7 +479,7 @@ class PledgeModifyView(FormView):
|
|||
"""
|
||||
A view to handle request to change an existing pledge
|
||||
"""
|
||||
template_name="pledge_modify.html"
|
||||
template_name="pledge.html"
|
||||
form_class = CampaignPledgeForm
|
||||
embedded = False
|
||||
|
||||
|
@ -529,7 +529,7 @@ class PledgeModifyView(FormView):
|
|||
form_class = self.get_form_class()
|
||||
form = form_class(initial=data)
|
||||
|
||||
context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form,'preapproval_amount':preapproval_amount, 'premium_id':premium_id, 'faqmenu': 'pledge'})
|
||||
context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form,'preapproval_amount':preapproval_amount, 'premium_id':premium_id, 'faqmenu': 'modify'})
|
||||
return context
|
||||
|
||||
|
||||
|
|
|
@ -570,7 +570,7 @@ h2.thank-you {
|
|||
font-size: 34px;
|
||||
color: #8dc63f;
|
||||
}
|
||||
.pledge_complete {
|
||||
.pledge_complete, .pledge_complete a {
|
||||
font-size: 14px;
|
||||
line-height: 17px;
|
||||
margin-bottom: 14px;
|
||||
|
@ -579,7 +579,7 @@ h2.thank-you {
|
|||
width: 960px !important;
|
||||
}
|
||||
h3 .pledge_indent {
|
||||
margin-left: 215px;
|
||||
margin-left: 240px;
|
||||
}
|
||||
ul.social.pledge {
|
||||
margin-bottom: 150px;
|
||||
|
|
|
@ -294,10 +294,10 @@ h2.thank-you {
|
|||
color: @call-to-action;
|
||||
}
|
||||
|
||||
.pledge_complete {
|
||||
.pledge_complete, .pledge_complete a {
|
||||
font-size: 14px;
|
||||
line-height: 17px;
|
||||
margin-bottom: 14px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
#js-slide .jsmodule.pledge {
|
||||
|
@ -305,7 +305,7 @@ h2.thank-you {
|
|||
}
|
||||
|
||||
h3 .pledge_indent {
|
||||
margin-left: 215px;
|
||||
margin-left: 240px;
|
||||
}
|
||||
|
||||
ul.social.pledge {
|
||||
|
|
Loading…
Reference in New Issue