Merge branch 'master' of https://github.com/FOSSEE/SciPy2013

4 files changed, 42 insertions, 0 deletions

diff --git a/website/templates/abstract_details.html b/website/templates/abstract_details.html
new file mode 100644
index 0000000..3abf02e
--- /dev/null
+++ b/website/templates/abstract_details.html
@@ -0,0 +1,22 @@
+{% extends 'page.html'%}
+{% load static %}
+
+{% block breadcrumbs %}
+<li><a href="{% url 'website:invited-speakers'%}">Invited Speakers</a></li>
+<li><a href="{% url 'website:list-abstracts'%}">List of Abstracts</a></li>
+{% endblock %}
+
+{% block content %}
+<center><h4>{{ paper.title }}</h4></center>
+
+<p><strong>{{ paper.user.first_name }} {{ paper.user.last_name }}</strong></p>
+<p><strong>{{ paper.bio }}</strong></p>
+<p><strong>Abstract: </strong></p>
+<div id="abstract">
+<p>{{ paper.abstract }}</p>
+</div>
+<p>Affiliation: <strong>{{ paper.affiliation }}</strong></p>
+<p>Links: {{ paper.links }}</p>
+<p><a href="/downloads/{{ paper.attachments }}">Attachment</a></p>
+
+{% endblock %}
diff --git a/website/templates/index.html b/website/templates/index.html
index 2675c4f..b30a60e 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -51,6 +51,7 @@
               <ul class="dropdown">
                 <!-- <li><a href="{% url 'website:schedule' %}">Schedule</a></li> -->
                 <li><a href="{% url 'website:invited-speakers' %}">Invited Speakers</a></li>
+                <li><a href="{% url 'website:list-abstracts' %}">List of Abstracts</a></li>
                 <!-- <li><a href="{% url 'website:accepted-abstracts' %}">Accepted Abstracts</a></li> -->
               </ul>
             </li>
diff --git a/website/templates/list_abstracts.html b/website/templates/list_abstracts.html
new file mode 100644
index 0000000..4389d2d
--- /dev/null
+++ b/website/templates/list_abstracts.html
@@ -0,0 +1,18 @@
+{% extends 'page.html'%}
+
+{% block breadcrumbs %}
+<li><a href="{% url 'website:invited-speakers'%}">Invited Speakers</a></li>
+<li><a href="{% url 'website:list-abstracts'%}">List of Abstracts</a></li>
+{% endblock %}
+
+{% block content %}
+<center><h4>List of Abstracts</h4></center>
+
+<table align="center">
+<th>Title
+<th>Speaker
+{% for paper in papers %}
+    <tr><td><a href="{% url 'website:abstract-details' paper.id %}">{{ paper.title }}</a></td><td>{{ paper.user.first_name }} {{ paper.user.last_name }}</td></tr>
+{% endfor %}
+</table>
+{% endblock %}
diff --git a/website/templates/page.html b/website/templates/page.html
index 67b770e..08416a4 100644
--- a/website/templates/page.html
+++ b/website/templates/page.html
@@ -51,6 +51,7 @@
               <ul class="dropdown">
                <!--  <li><a href="{% url 'website:schedule' %}">Schedule</a></li> -->
                 <li><a href="{% url 'website:invited-speakers' %}">Invited Speakers</a></li>
+                <li><a href="{% url 'website:list-abstracts' %}">List of Abstracts</a></li>
                <!--  <li><a href="{% url 'website:accepted-abstracts' %}">Accepted Abstracts</a></li> -->
               </ul>
             </li>