From 6bc4ead40fc40ae1e7f8ad37627e0e976a97b072 Mon Sep 17 00:00:00 2001
From: Jayaram R Pai
Date: Fri, 19 Sep 2014 12:00:59 +0530
Subject: fixed current tags, modified page css

---
 static/website/css/main.css        | 11 +++++------
 static/website/templates/base.html | 14 +++++++-------
 static/website/templates/home.html | 16 ++++++++--------
 website/templatetags/tags.py       |  3 +--
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/static/website/css/main.css b/static/website/css/main.css
index 103a816..351f024 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -6,18 +6,17 @@
     font-family: 'EB Garamond', serif;
 }
 body {
-    background: #f2f2f2;
+    background: #f3f1ea;
 }
 #page-wrapper {
     width: 960px;
     margin: 25px auto 10px;
     padding: 0 0 35px 0;
     background: #ffffff;
-    -webkit-box-shadow: 0 0 10px #cccccc;
-       -moz-box-shadow: 0 0 10px #cccccc;
-         -o-box-shadow: 0 0 10px #cccccc;
-            box-shadow: 0 0 10px #cccccc;
-    border-radius: 4px;
+    -webkit-box-shadow: 0 0 7px #7a7a7a;
+       -moz-box-shadow: 0 0 7px #7a7a7a;
+         -o-box-shadow: 0 0 7px #7a7a7a;
+            box-shadow: 0 0 7px #7a7a7a;
     /*remove later*/
     min-height: 700px;
 }
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index db5a3e1..02e685c 100755
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -29,15 +29,15 @@
                     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                         <ul class="nav navbar-nav">
                             <li><a href="{% url 'website:home'%}">Home</a></li>
-                            <li class="{% active request '^/call-for-proposals/$' %}"><a href="{% url 'website:call_for_proposals' %}">Call for Proposals</a></li>
-                            <li class="{% active request '^/schedule/$' %}"><a href="{% url 'website:schedule' %}">Schedule</a></li>
-                            <li class="{% active request '^/invited-speakers/$' %}"><a href="{% url 'website:invited_speakers' %}">Invited Speakers</a></li>
-                            <li class="{% active request '^/sponsors/$' %}"><a href="{% url 'website:sponsors' %}">Sponsors</a></li>
-                            <li class="{% active request '^/venue/$' %}"><a href="{% url 'website:venue' %}">Venue</a></li>
-                            <li class="{% active request '^/contact/$' %}"><a href="{% url 'website:contact' %}">Contact Us</a></li-->
+                            <li class="{% active request 'call-for-proposals' %}"><a href="{% url 'website:call_for_proposals' %}">Call for Proposals</a></li>
+                            <li class="{% active request 'schedule' %}"><a href="{% url 'website:schedule' %}">Schedule</a></li>
+                            <li class="{% active request 'invited-speakers' %}"><a href="{% url 'website:invited_speakers' %}">Invited Speakers</a></li>
+                            <li class="{% active request 'sponsors' %}"><a href="{% url 'website:sponsors' %}">Sponsors</a></li>
+                            <li class="{% active request 'venue' %}"><a href="{% url 'website:venue' %}">Venue</a></li>
+                            <li class="{% active request 'contact' %}"><a href="{% url 'website:contact' %}">Contact Us</a></li-->
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
-                            <li><a href="{% url 'website:register' %}">Register</a></li>
+                            <li class="{% active request 'register' %}"><a href="{% url 'website:register' %}">Register</a></li>
                         </ul>
                     </div><!-- /.navbar-collapse -->
                 </div><!-- /.container-fluid -->
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index 1d353dc..8285ccb 100755
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -28,16 +28,16 @@
                     <!-- Collect the nav links, forms, and other content for toggling -->
                     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                         <ul class="nav navbar-nav">
-                            <li class="{% active request '^/$' %}"><a href="{% url 'website:home'%}">Home</a></li>
-                            <li><a href="{% url 'website:call_for_proposals' %}">Call for Proposals</a></li>
-                            <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:sponsors' %}">Sponsors</a></li>
-                            <li><a href="{% url 'website:venue' %}">Venue</a></li>
-                            <li><a href="{% url 'website:contact' %}">Contact Us</a></li-->
+                            <li class="active"><a href="{% url 'website:home'%}">Home</a></li>
+                            <li class="{% active request 'call-for-proposals' %}"><a href="{% url 'website:call_for_proposals' %}">Call for Proposals</a></li>
+                            <li class="{% active request 'schedule' %}"><a href="{% url 'website:schedule' %}">Schedule</a></li>
+                            <li class="{% active request 'invited-speakers' %}"><a href="{% url 'website:invited_speakers' %}">Invited Speakers</a></li>
+                            <li class="{% active request 'sponsors' %}"><a href="{% url 'website:sponsors' %}">Sponsors</a></li>
+                            <li class="{% active request 'venue' %}"><a href="{% url 'website:venue' %}">Venue</a></li>
+                            <li class="{% active request 'contact' %}"><a href="{% url 'website:contact' %}">Contact Us</a></li-->
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
-                            <li><a href="{% url 'website:register' %}">Register</a></li>
+                            <li class="{% active request 'register' %}"><a href="{% url 'website:register' %}">Register</a></li>
                         </ul>
                     </div><!-- /.navbar-collapse -->
                 </div><!-- /.container-fluid -->
diff --git a/website/templatetags/tags.py b/website/templatetags/tags.py
index 6e23f7b..8861f95 100644
--- a/website/templatetags/tags.py
+++ b/website/templatetags/tags.py
@@ -4,7 +4,6 @@ register = template.Library()
 
 @register.simple_tag
 def active(request, pattern):
-    import re
-    if re.search(pattern, request.path):
+    if pattern in request.path:
         return 'active'
     return ''
-- 
cgit