Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bookshare
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
30
Issues
30
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
SRCT
bookshare
Commits
8192965b
Commit
8192965b
authored
May 03, 2015
by
Daniel W Bond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes with ands, ors, and nots, and a reordering rewording'
parent
0a653089
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
bookshare/core/templates/profile.html
bookshare/core/templates/profile.html
+2
-2
bookshare/templates/about.html
bookshare/templates/about.html
+1
-1
bookshare/trades/templates/detail_listing.html
bookshare/trades/templates/detail_listing.html
+1
-1
No files found.
bookshare/core/templates/profile.html
View file @
8192965b
...
...
@@ -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 • {{ 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
View file @
8192965b
...
...
@@ -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
View file @
8192965b
...
...
@@ -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 %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment