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

Conflicts:
	scipy2016/urls.pyc
	website/forms.pyc
	website/urls.pyc
	website/views.pyc

1 files changed, 18 insertions, 11 deletions

diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html
index b0413b8..f43b378 100755
--- a/website/templates/submit-cfw.html
+++ b/website/templates/submit-cfw.html
@@ -18,29 +18,36 @@
 
     
       {% block header %}
-       <header id="header">
+       <header id="header1">
             <h1>Scipy India 2016</h1>
-            <h2 style= "color:black;">Submit Workshop Proposal</h2>
+            <h2>Submit Workshop Proposal</h2>
 </header> 
 {% endblock %}
 
 
 <div id="wrapper">
 {% block nav %}
-          <nav id="nav" class="alt">
-            <ul>
-              <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-              
-              {%   if user and not user.is_anonymous %}
+<div id="navbar-main"> 
+  <!-- Fixed navbar -->
+  <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+         <li><a href="{% url 'website:home' %}" class="active">Home</a></li>        
+               {% if user and not user.is_anonymous %}
                <li class="dropdown">
-               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
+               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
                    <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
-               </ul>           
+               </ul>   
+               {% else %}       
+                <li><a href="{% url 'website:cfp' %}" >Login</a></li>
            {% endif %}
-            </ul>
-          </nav>
+        </ul>
+      </div>
+      <!--/.nav-collapse --> 
+  </div>
+</div>
 {% endblock %}