summaryrefslogtreecommitdiff
path: root/project/templates/_menu.html
diff options
context:
space:
mode:
authorAmit Sethi2010-12-24 16:02:21 +0530
committerAmit Sethi2010-12-24 16:02:21 +0530
commit8ef01f45ff2ed4a13bf00d97103ddf94872cdadb (patch)
treeccceced26891a3703ebd844d691101235f3fbc20 /project/templates/_menu.html
parent90a83c1bd2b6c6be1300ab850916a587c2e6c3a2 (diff)
parent85947db58ea7cbe9101ac13cff1e438f3968c150 (diff)
downloadscipycon-8ef01f45ff2ed4a13bf00d97103ddf94872cdadb.tar.gz
scipycon-8ef01f45ff2ed4a13bf00d97103ddf94872cdadb.tar.bz2
scipycon-8ef01f45ff2ed4a13bf00d97103ddf94872cdadb.zip
Merging heads
Diffstat (limited to 'project/templates/_menu.html')
-rw-r--r--project/templates/_menu.html25
1 files changed, 8 insertions, 17 deletions
diff --git a/project/templates/_menu.html b/project/templates/_menu.html
index 715f051..d869067 100644
--- a/project/templates/_menu.html
+++ b/project/templates/_menu.html
@@ -69,28 +69,19 @@
<li>
About
<ul>
-
- <li>
- <a href="/{{ params.scope }}/about/accommodation/">
- Accommodation
- </a>
- </li>
<li>
- <!--
- <a href="/{{ params.scope }}/about/food/">
- Food
+ <a href="/{{ params.scope }}/about/accommodation/">
+ Accommodation
</a>
</li>
- -->
+ <li>
+ <a href="/{{ params.scope }}/about/food/">Food</a>
+ </li>
<li><a href="/{{ params.scope }}/about/venue/">The Venue</a></li>
<li><a href="{% url scipycon_city params.scope %}">Host City - Hyderabad</a></li>
- <!--
- <li>
- <a href="/{{ params.scope }}/about/reaching/">
- Reaching the venue
- </a>
- </li>
- -->
+ <li>
+ <a href="/{{ params.scope }}/about/reaching/">Reaching the venue</a>
+ </li>
</ul>
</li>
<li><a href="/{{ params.scope }}/publicity/">Publicity</a></li>