Commit 8192965b authored by Daniel W Bond's avatar Daniel W Bond

minor fixes with ands, ors, and nots, and a reordering rewording'

parent 0a653089
......@@ -144,7 +144,7 @@ SRCT Bookshare • {{ student.user.get_full_name }}
</thead>
<tbody>
{% for bid in bids %}
{% if bid.listing.winning_bid %}
{% if bid == bid.listing.winning_bid %}
<tr class="success">
{% else %}
<tr>
......@@ -156,7 +156,7 @@ SRCT Bookshare &bull; {{ student.user.get_full_name }}
<span class="label label-primary"><strong>Exchanged</strong></span>
{% elif bid.listing.cancelled %}
<span class="label label-default"><strong>Cancelled</strong></span>
{% elif not listing.active %}
{% elif listing.active %}
<span class="label label-warning"><strong>Inactive</strong></span>
{% else %}
<span class="label label-info"><strong>Active</strong></span>
......
......@@ -97,7 +97,7 @@ SRCT Bookshare &bull; About
</p>
<p>
Additional thanks are due to the Student-Run Computing and Technology executive
board and our academic advisor, Professor Kinga Dobolyi, from 2013-present.
board from 2013-present, and our academic advisor, Professor Kinga Dobolyi.
</p>
</div>
</div>
......
......@@ -292,7 +292,7 @@ SRCT Bookshare &bull; {{ listing.title }}
</div>
<div class="col-md-2 col-sm-6 col-xs-6 text-center">
{% if request.user == bid.bidder.user and not listing.exchanged or not listing.cancelled %}
{% if request.user == bid.bidder.user and not listing.exchanged and not listing.cancelled %}
<h4><a href="{% url 'edit_bid' listing.slug bid.slug %}"<span class="label label-default">Edit</span></a></h4>
{% endif %}
{% if bid == listing.winning_bid %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment