summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhardythe12014-09-10 17:52:27 +0530
committerhardythe12014-09-10 17:52:27 +0530
commit4972ae760ff28e451a5c6277539a7333e742ba94 (patch)
treea59f5858d2679f1196b9ffb5ac10597fada7f59a
parentc9832807cbefb28efffd647f5cc13cff4ce89dbc (diff)
downloadscipy2014-4972ae760ff28e451a5c6277539a7333e742ba94.tar.gz
scipy2014-4972ae760ff28e451a5c6277539a7333e742ba94.tar.bz2
scipy2014-4972ae760ff28e451a5c6277539a7333e742ba94.zip
added registration page
-rwxr-xr-xstatic/website/templates/base.html8
-rw-r--r--static/website/templates/contact.html7
-rwxr-xr-xstatic/website/templates/home.html4
-rw-r--r--static/website/templates/register.html16
-rw-r--r--static/website/templates/venue.html7
-rw-r--r--website/urls.py1
-rw-r--r--website/views.py3
7 files changed, 35 insertions, 11 deletions
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index 2a7e5c3..cced7aa 100755
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -36,7 +36,7 @@
<li><a href="{% url 'website:contact' %}">Contact Us</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
- <li><a href="#">Register</a></li>
+ <li><a href="{% url 'website:register' %}">Register</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
@@ -45,7 +45,7 @@
<div id="page-header">
<div id="stage">
<img id="scipy-logo" src="{% static 'website/images/scipy_india_logo.png' %}" width="30">
- <h3 id="brand">Scipy India 2014 &mdash; <span id="current">Schedule</span></h3>
+ <h3 id="brand">Scipy India 2014 &mdash; <span id="current">{% block current %}Schedule{% endblock %}</span></h3>
</div>
</div> <!-- /#page-header -->
</div> <!-- /#header-wrapper -->
@@ -54,11 +54,11 @@
<div id="page-content">
<div class="container-fluid">
<div class="row">
- <div class="col-md-3" id="sidebar">
+ <div class="col-md-0" id="sidebar">
{% block sidebar %}
{% endblock %}
</div>
- <div class="col-md-9 text-justify">
+ <div class="col-md-12 text-justify">
{% block content %}
{% endblock %}
</div> <!-- /.col -->
diff --git a/static/website/templates/contact.html b/static/website/templates/contact.html
index 07450d4..a6959b6 100644
--- a/static/website/templates/contact.html
+++ b/static/website/templates/contact.html
@@ -1,12 +1,13 @@
{% extends 'website/templates/base.html' %}
-{% block sidebar %}
+{% block current %}
+Contact Us
{% endblock %}
{% block content %}
<h3>Contact Us</h3>
<p>For any queries regarding registration, accomodation or any other issues, please feel free to contact us.</p>
-<table>
+<table class="table table-bordered">
<tr>
<td>
FOSSEE (cfd-lab)
@@ -30,7 +31,7 @@
</td>
</tr>
</table>
-<table>
+<table class="table table-bordered">
<tr>
<td>
Alternatively you may write us on
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index e2136c8..3871b34 100755
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -36,7 +36,7 @@
<li><a href="{% url 'website:contact' %}">Contact Us</a></li-->
</ul>
<ul class="nav navbar-nav navbar-right">
- <li><a href="#">Register</a></li>
+ <li><a href="{% url 'website:register' %}">Register</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
@@ -48,7 +48,7 @@
<h1 id="shout">Scipy India 2014</h1>
<h4 id="subtle">Dec 5<sup>th</sup> and 6<sup>th</sup> IIT Bombay</h4>
<hr style="width:250px;">
- <a class="btn btn-default" href="#">Register Now</a>
+ <a class="btn btn-default" href="{% url 'website:register' %}">Register Now</a>
<!--a class="btn btn-default" href="#">Submit Paper</a-->
</div>
</div> <!-- /#header -->
diff --git a/static/website/templates/register.html b/static/website/templates/register.html
new file mode 100644
index 0000000..5a49505
--- /dev/null
+++ b/static/website/templates/register.html
@@ -0,0 +1,16 @@
+{% extends 'website/templates/base.html' %}
+
+{% block sidebar %}
+{% endblock %}
+
+{% block current %}
+Register
+{% endblock %}
+
+{% block content %}
+<div>
+<h4>
+ We will soon start registration for the conference. Stay tuned with us !!
+</h4>
+</div>
+{% endblock %}
diff --git a/static/website/templates/venue.html b/static/website/templates/venue.html
index b7e64a1..5e1935c 100644
--- a/static/website/templates/venue.html
+++ b/static/website/templates/venue.html
@@ -3,9 +3,12 @@
{% block sidebar %}
{% endblock %}
+{% block current %}
+Venue
+{% endblock %}
+
{% block content %}
<div>
-
-<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d942.3681463328357!2d72.916895!3d19.130779999999998!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3be7c7f4215f57bf%3A0xcf0c03ea45a113e1!2sLecture+Hall+Complex+(LHC)!5e0!3m2!1sen!2sin!4v1410350543516" width="600" height="450" frameborder="0" style="border:0"></iframe>
+<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d942.3681463328357!2d72.916895!3d19.130779999999998!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3be7c7f4215f57bf%3A0xcf0c03ea45a113e1!2sLecture+Hall+Complex+(LHC)!5e0!3m2!1sen!2sin!4v1410350543516" width="930" height="450" frameborder="0" style="border:0"></iframe>
</div>
{% endblock %}
diff --git a/website/urls.py b/website/urls.py
index 4b212e6..b6d8244 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -5,4 +5,5 @@ urlpatterns = patterns('',
url(r'^page/$', 'website.views.page', name='page'),
url(r'^venue/$', 'website.views.venue', name='venue'),
url(r'^contact/$', 'website.views.contact', name='contact'),
+ url(r'^register/$', 'website.views.register', name='register'),
)
diff --git a/website/views.py b/website/views.py
index 24ca6ad..4f66a21 100644
--- a/website/views.py
+++ b/website/views.py
@@ -14,3 +14,6 @@ def venue(request):
def contact(request):
return render(request, 'website/templates/contact.html')
+
+def register(request):
+ return render(request, 'website/templates/register.html')