Made changes for bootstrap

3 files changed, 47 insertions, 25 deletions

diff --git a/template/allotter/apply.html b/template/allotter/apply.html
index 201e1f2..ee0c19a 100644
--- a/template/allotter/apply.html
+++ b/template/allotter/apply.html
@@ -47,14 +47,15 @@ Listing the options for first test paper.
 <form action="/allotter/{{user.username}}/submit/" method="post">
 {% csrf_token %}
 
-<table>
-<tr>
+<table class="table table-bordered table-striped ">
+<thead>
 <td><p>Programme Code </p></td>
 <td><p>Programme Name </p></td>
 <td><p>Insitute </p></td>
 <td><p>Preference </p></td>
-</tr>
+</thead>
 
+<tbody>
 {% for option in options_available_first %}     
     <tr> 
     <td><p> {{ option.opt_code }} </p></td>
@@ -69,6 +70,7 @@ Listing the options for first test paper.
     </td>
     </tr>                
 {% endfor %}
+</tbody>
 </table>
 
 {% if np == 2  %}
@@ -76,13 +78,14 @@ Listing the options for first test paper.
 <h3>Options available for {{second_paper}} </h3>
 
 <table>
-<tr>
+<thead>
 <td><p>Programme Code </p></td>
 <td><p>Programme Name </p></td>
 <td><p>Insitute </p></td>
 <td><p>Preference </p></td>
-</tr>
+</thead>
 
+<tbody>
 {% for option in options_available_second %}     
     <tr> 
     <td><p> {{option.opt_code }} </p></td>
@@ -97,13 +100,18 @@ Listing the options for first test paper.
     </td>
     </tr>                
 {% endfor %}
+</tbody>
 </table>
 
 {% endif %}
 
-<p><label for="check">I am responsible for my own choices.</label> 
-<input type="checkbox" name="check" id="check" /></p>
-<input type="submit" name="save" value="Save" />
+
+<div class="alert">
+
+<p><input type="checkbox" name="check" id="check" /><label for="check">I am responsible for my own choices.</label> 
+</p>
+<input type="submit" name="save" value="Save" class="btn" />
+</div>
 </form>
 
 {% endblock content %}
diff --git a/template/allotter/login.html b/template/allotter/login.html
index 72769a0..df6fb5c 100644
--- a/template/allotter/login.html
+++ b/template/allotter/login.html
@@ -1,21 +1,16 @@
 {% extends "base.html" %}
 
+
 {% block title %}Login{% endblock title %}
 
 {% block content %}
-<h2> Welcome to the Allotment.
-Please login to proceed.</h2>
-
-<form action="" method="post">
-{% csrf_token %}
+<h2> Welcome to the JAM 2012 Allotment</h2>
+<h2>Please fill in the required details to continue</h2>
+<hr>
 
-<table>
-{{ form.as_table }}
-</table>
-
-<br/>
-<input type="submit" value="Login" />
-</form>
+{% load crispy_forms_tags %}
+{% crispy form %}
 <!-- <a href="{{URL_ROOT}}/exam/forgotpassword/">Forgot Password</a> <br /> -->
 
 {% endblock content %}
+
diff --git a/template/base.html b/template/base.html
index d5848db..fdaa230 100644
--- a/template/base.html
+++ b/template/base.html
@@ -19,6 +19,7 @@
       }
     </style>
     <link href="{{ STATIC_URL }}css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="{{ STATIC_URL }}css/style.css" rel="stylesheet">
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
@@ -43,6 +44,9 @@
               <li><a href="#faq">FAQs</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
+            {% if user.is_authenticated %}
+            <p class="navbar-text pull-right">Application for registration number {{ user }}</a></p>
+            {% endif %}
             {% block navbar %}{% endblock %}
           </div><!--/.nav-collapse -->
         </div>
@@ -50,8 +54,8 @@
     </div>
 
 
-<div class="container">
-    <div class="span9 well">
+<div class="container-fluid">
+    <div class="span8 well">
         <div id="content">
             {% block content %}{% endblock %}
             {% block main_content %}{% endblock %}
@@ -59,12 +63,27 @@
     </div>
     <div class="span3">
         <div id="sidebar">
+            <div class="well sidebar-nav">
+                <ul class="nav nav-list">
+                  <li class="nav-header">Notices</li>
+                  <li><hr></li>              
+                  <li><span class="label label-important pull-right">Important</span></li>
+                  <li>Supported Browsers : <br />Google chrome >12 and FF >5</li>
+                  <li><hr></li>
+                  <li><span class="label label-info pull-right">Info</span></li>              
+                  <li>JAM 2012 allotment online form filling starts from : 10-4-2012.</li>
+                  <li><hr></li>
+                  <li><span class="label label-info pull-right">Info</span></li>
+                  <li>Last date of receipt of completed application form : 30-4-2012.</li>
+                  <li><hr></li>
+                </ul>
+            </div><!--/.well -->
             {% block sidebar %}{% endblock %}
         </div>
     </div>
-    
-
-
+    <footer>
+        <p>Copyright &copy; 2012 <a href="http://fossee.in">FOSSEE</a> for IIT Bombay</p>
+    </footer>
 </div> <!-- /container -->
     
 </body>