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

bookshare/core/templates/profile.html

@@ -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>

bookshare/templates/about.html

@@ -97,7 +97,7 @@ SRCT Bookshare • 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>

bookshare/trades/templates/detail_listing.html

@@ -292,7 +292,7 @@ SRCT Bookshare • {{ 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 %}