summaryrefslogtreecommitdiff
path: root/website
diff options
context:
space:
mode:
authorkomalsheth2862016-10-04 17:52:16 +0530
committerkomalsheth2862016-10-04 17:52:16 +0530
commit9c8d71542a63c789bf69d8e9ced9b94ed69f4c75 (patch)
tree9f35725352f34d4077be24b47ad8f46ff527742e /website
parent7f9b376ff18fa23d36a23da8ea192916891f9e9d (diff)
downloadSciPy2016-9c8d71542a63c789bf69d8e9ced9b94ed69f4c75.tar.gz
SciPy2016-9c8d71542a63c789bf69d8e9ced9b94ed69f4c75.tar.bz2
SciPy2016-9c8d71542a63c789bf69d8e9ced9b94ed69f4c75.zip
/2016/ removed from links
Diffstat (limited to 'website')
-rwxr-xr-xwebsite/templates/cfp.html2
-rwxr-xr-xwebsite/templates/view-abstracts.html21
2 files changed, 11 insertions, 12 deletions
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 8886937..e0eb537 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -101,7 +101,7 @@
{{ form.as_p }}
<button class="button special" style="background:#D44727" name ="login"type="submit">Login</button><br><br>
<a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account</a>
- <a href="/2016/forgotpassword/">Forgot Password?</a>
+ <a href="/forgotpassword/">Forgot Password?</a>
{% csrf_token %}
</form>
<!-- </div> -->
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 4933244..8979363 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -61,13 +61,11 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
<colgroup>
{% if user.is_superuser %}
<col width="10%" />
- <col width="30%" />
<col width="20%" />
- <col width="60%" />
- <!-- <col width="10%" /> -->
- <col width="10%" />
- <col width="10%" />
<col width="20%" />
+ <col width="20%" />
+ <col width="40%" />
+ <col width="10%" />
{% else %}
<col width="20%" />
<col width="70%" />
@@ -88,7 +86,9 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
{% if not user.is_superuser %}
<th> View
{% endif %}
+ {% if user.is_superuser %}
<th> Ratings
+ {% endif %}
<th> Status
{% for proposal in proposals %}
<tr>
@@ -107,13 +107,12 @@ 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 %}
-
- <td> {% for rating in ratings %}
- {{rating.rating}}
+{% if user.is_superuser %}
+ <td> {% for rating in proposal.ratings_set.all %}
+ {{ rating.rating}} by {{rating.user}}<br>
{% endfor %}
-
- <!-- <center> {{ proposal.comments_set.count }} </center> --></td>
-
+ </td>
+{% endif %}
<td>
{% if proposal.status = 'Accepted' %}
<h5 style="color:green;">{{proposal.status}}</h5>