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

pull/1/head
Raymond Yee 2011-11-22 14:32:55 -08:00
commit 544fb536bc
2 changed files with 10 additions and 4 deletions

View File

@ -13,12 +13,13 @@
{% endfor %}
<h2>The work</h2>
<div class="book-detail-info">
<h2 class="book-name">Title: {{ campaign.work.title }}</h2>
<h2 class="book-name">Title: <a href="{% url work campaign.work.id %}">{{ campaign.work.title }}</a></h2>
<h3 class="book-author">Authors: {{ campaign.work.author }}</h3>
<h3 class="book-year">Published: {{ campaign.work.editions.all.0.publication_date }}</h3>
<h3 class="book-author">Language: {{ campaign.work.editions.all.0.language }}</h3>
<p>Target Price: {{ campaign.pretarget }}</p>
<p>End Date: {{ campaign.predeadline }}</p>
<p>Campaign status: {{ campaign.status }}</p>
</div>
<h3>Description of the offering</h2>

View File

@ -24,8 +24,10 @@ $(document).ready(function(){
<div class="js-main">
<div id="js-leftcol">
<div class="jsmodule rounded">
<div class="jsmod-content">
<div class="jsmod-content"> {{ work.last_campaign.id }} {{ work.campaigns.0.id }}
{% if work.last_campaign %}
{% with work.last_campaign_status as status %}
{{ work.last_campaign_status}}
{% if status == 'ACTIVE' %}
Campaign in Progress: <br />${{ work.last_campaign.current_total }}/${{ work.last_campaign.target }}
{% else %}{% if status == 'SUCCESSFUL' %}
@ -41,11 +43,14 @@ $(document).ready(function(){
{% else %}
{{ wishers }} Ungluers are WISHING<br />&nbsp;
{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}
{% else %}{% if wishers == 1 %}
{% endwith %}
{% else %}
{% if wishers == 1 %}
{{ wishers }} Ungluer is WISHING<br />&nbsp;
{% else %}
{{ wishers }} Ungluers are WISHING<br />&nbsp;
{% endif %}{% endif %}
{% endif %}
{% endif %}
</div>
</div>
{% include "explore.html" %}