remove redundant with clauses

pull/1/head
eric 2013-03-11 16:23:52 -04:00
parent 88c2edb58d
commit c724786c97
6 changed files with 9 additions and 29 deletions

View File

@ -35,10 +35,8 @@
<span id="content-block"> <span id="content-block">
{% if work %} {% if work %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% with work.last_campaign.status as status %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %} {% endwith %}
{% endwith %}
{% else %} {% else %}
<p class="classname">No work corresponding to ISBN {{isbn}} available</p> <p class="classname">No work corresponding to ISBN {{isbn}} available</p>
{% endif %} {% endif %}

View File

@ -83,12 +83,10 @@ location.hash = "#2";
{% for campaign in campaign_list %} {% for campaign in campaign_list %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with campaign.status as status %}
{% with campaign.deadline as deadline %}
{% with campaign.work.googlebooks_id as googlebooks_id %} {% with campaign.work.googlebooks_id as googlebooks_id %}
{% with campaign.work as work %} {% with campaign.work as work %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %}{% endwith %} {% endwith %}{% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-1"> <div class="pagination content-block-heading tabs-1">

View File

@ -69,11 +69,9 @@ $j(document).ready(function() {
{% for work in results %} {% for work in results %}
<div class="{% cycle 'row1' 'row2' %} book"> <div class="{% cycle 'row1' 'row2' %} book">
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with 'yes' as on_search_page %} {% with 'yes' as on_search_page %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %}{% endwith %} {% endwith %}{% endwith %}
</div> </div>
{% empty %} {% empty %}
<h2>Sorry, couldn't find that!</h2> <h2>Sorry, couldn't find that!</h2>

View File

@ -355,11 +355,9 @@ there's no tab for seeing ALL my books, only the filters! huh.
{% lazy_paginate 20 works_unglued using "works_unglued" %} {% lazy_paginate 20 works_unglued using "works_unglued" %}
{% for work in works_unglued %} {% for work in works_unglued %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-1"> <div class="pagination content-block-heading tabs-1">
@ -372,11 +370,9 @@ there's no tab for seeing ALL my books, only the filters! huh.
{% lazy_paginate 20 works_active using "works_active" %} {% lazy_paginate 20 works_active using "works_active" %}
{% for work in works_active %} {% for work in works_active %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-2"> <div class="pagination content-block-heading tabs-2">
@ -389,11 +385,9 @@ there's no tab for seeing ALL my books, only the filters! huh.
{% lazy_paginate 20 works_wished using "works_wished" %} {% lazy_paginate 20 works_wished using "works_wished" %}
{% for work in works_wished %} {% for work in works_wished %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-3"> <div class="pagination content-block-heading tabs-3">

View File

@ -91,11 +91,9 @@
{% lazy_paginate 20 work_list using "work_list" %} {% lazy_paginate 20 work_list using "work_list" %}
{% for work in work_list %} {% for work in work_list %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-1"> <div class="pagination content-block-heading tabs-1">

View File

@ -89,11 +89,9 @@
{% lazy_paginate 20 works_unglued using "works_unglued" %} {% lazy_paginate 20 works_unglued using "works_unglued" %}
{% for work in works_unglued %} {% for work in works_unglued %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-1"> <div class="pagination content-block-heading tabs-1">
@ -105,11 +103,9 @@
{% lazy_paginate 20 works_active using "works_active" %} {% lazy_paginate 20 works_active using "works_active" %}
{% for work in works_active %} {% for work in works_active %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-2"> <div class="pagination content-block-heading tabs-2">
@ -122,11 +118,9 @@
{% lazy_paginate 20 works_wished using "works_wished" %} {% lazy_paginate 20 works_wished using "works_wished" %}
{% for work in works_wished %} {% for work in works_wished %}
<div class="{% cycle 'row1' 'row2' %}"> <div class="{% cycle 'row1' 'row2' %}">
{% with work.last_campaign_status as status %}
{% with work.last_campaign.deadline as deadline %}
{% with work.googlebooks_id as googlebooks_id %} {% with work.googlebooks_id as googlebooks_id %}
{% include "book_panel.html" %} {% include "book_panel.html" %}
{% endwith %}{% endwith %}{% endwith %} {% endwith %}
</div> </div>
{% endfor %} {% endfor %}
<div class="pagination content-block-heading tabs-3"> <div class="pagination content-block-heading tabs-3">