summaryrefslogtreecommitdiff
path: root/website/templates
diff options
context:
space:
mode:
Diffstat (limited to 'website/templates')
-rwxr-xr-xwebsite/templates/base.html4
-rwxr-xr-xwebsite/templates/cfp.html4
-rwxr-xr-xwebsite/templates/view-abstracts.html14
3 files changed, 13 insertions, 9 deletions
diff --git a/website/templates/base.html b/website/templates/base.html
index fb3d745..a9ac680 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -89,10 +89,10 @@
<col width="40%" />
</colgroup>
<tr>
-<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=90% width=60% alt="">
+<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=90% width=80% alt="">
</td>
<td></td>
-<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=90% width=60% alt="">
+<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=90% width=80% alt="">
</td>
</tr>
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index e0eb537..9c8f3dc 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -64,7 +64,7 @@
</center>
{% endif %}
{% if user and not user.is_anonymous and not login_required %}
- <p>We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+ <p>We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
</p>
<span><h2><u>Important Dates</u></h2></span>
<ul>
@@ -85,7 +85,7 @@
{% endif %}
{% else %}
- <p align = "justify">We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+ <p align = "justify">We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
</p><hr>
<ul class="features">
<li>
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 8979363..6a9a72b 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -71,7 +71,6 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
<col width="70%" />
<col width="10%" />
<col width="10%" />
- <col width="10%" />
<col width="20%" />
{% endif %}
@@ -88,6 +87,8 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
{% endif %}
{% if user.is_superuser %}
<th> Ratings
+ {% else %}
+ <th> Comments
{% endif %}
<th> Status
{% for proposal in proposals %}
@@ -107,12 +108,15 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
<td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> {{proposal.title}}</td>
<td ><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td>
{% endif %}
-{% if user.is_superuser %}
- <td> {% for rating in proposal.ratings_set.all %}
- {{ rating.rating}} by {{rating.user}}<br>
+ <td>{% if user.is_superuser %}
+ {% for rating in proposal.ratings_set.all %}
+ {{ rating.rating}} - {{rating.user}}<br>
{% endfor %}
+ {% else %}
+ {{proposal.comments_set.count}}
+ {% endif %}
+
</td>
-{% endif %}
<td>
{% if proposal.status = 'Accepted' %}
<h5 style="color:green;">{{proposal.status}}</h5>