Merge pull request #52 from Akshen/develop

Fix Minor Bugs

6 files changed, 32 insertions, 34 deletions

diff --git a/workshop_app/forms.py b/workshop_app/forms.py
index 29cedad..306ea8b 100644
--- a/workshop_app/forms.py
+++ b/workshop_app/forms.py
@@ -190,10 +190,10 @@ class UserLoginForm(forms.Form):
     """Creates a form which will allow the user to log into the system."""
 
     username = forms.CharField(max_length=32,
-            widget=forms.TextInput(attrs={'placeholder': 'your username'}))
+            widget=forms.TextInput())
 
     password = forms.CharField(max_length=32,
-            widget=forms.PasswordInput(attrs={'placeholder': 'your password'}))
+            widget=forms.PasswordInput())
 
     def clean(self):
         super(UserLoginForm, self).clean()
diff --git a/workshop_app/models.py b/workshop_app/models.py
index f9585f4..1d0852c 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -20,7 +20,6 @@ department_choices = (
     ("biosciences and bioengineering", "Biosciences and  BioEngineering"),
     ("electronics", "Electronics"),
     ("energy science and engineering", "Energy Science and Engineering"),
-    ("others", "Others"),
     )
 
 title = (
@@ -32,16 +31,13 @@ title = (
     ("Mr", "Mr."),
     ("Mrs", "Mrs."),
     ("Miss", "Ms."),
-    ("other", "Other"),
     )
 
 source = (
-    ("FOSSEE Email", "FOSSEE Email"),
     ("FOSSEE website", "FOSSEE website"),
     ("Google", "Google"),
     ("Social Media", "Social Media"),
     ("From other College", "From other College"),
-    ("Others", "Others"),
     )
 
 states = (
@@ -52,21 +48,21 @@ states = (
     ("IN-CT",	"Chhattisgarh"),
     ("IN-GA",	"Goa"),
     ("IN-GJ",	"Gujarat"),
-    ("IN-HR",	"Haryana"),	
-    ("IN-HP",	"Himachal Pradesh"),	
-    ("IN-JK",	"Jammu and Kashmir"),	
-    ("IN-JH",	"Jharkhand"),	
-    ("IN-KA",	"Karnataka"),	
-    ("IN-KL",	"Kerala"),	
-    ("IN-MP",	"Madhya Pradesh"),	
-    ("IN-MH",	"Maharashtra"),	
-    ("IN-MN",	"Manipur"),	
-    ("IN-ML",	"Meghalaya"),	
-    ("IN-MZ",	"Mizoram"),	
-    ("IN-NL",	"Nagaland"),	
-    ("IN-OR",	"Odisha"),	
-    ("IN-PB",	"Punjab"),	
-    ("IN-RJ",	"Rajasthan"),	
+    ("IN-HR",	"Haryana"),
+    ("IN-HP",	"Himachal Pradesh"),
+    ("IN-JK",	"Jammu and Kashmir"),
+    ("IN-JH",	"Jharkhand"),
+    ("IN-KA",	"Karnataka"),
+    ("IN-KL",	"Kerala"),
+    ("IN-MP",	"Madhya Pradesh"),
+    ("IN-MH",	"Maharashtra"),
+    ("IN-MN",	"Manipur"),
+    ("IN-ML",	"Meghalaya"),
+    ("IN-MZ",	"Mizoram"),
+    ("IN-NL",	"Nagaland"),
+    ("IN-OR",	"Odisha"),
+    ("IN-PB",	"Punjab"),
+    ("IN-RJ",	"Rajasthan"),
     ("IN-SK",	"Sikkim"),
     ("IN-TN",	"Tamil Nadu"),
     ("IN-TG",	"Telangana"),
@@ -74,7 +70,7 @@ states = (
     ("IN-UT",	"Uttarakhand"),
     ("IN-UP",	"Uttar Pradesh"),
     ("IN-WB",	"West Bengal"),
-    ("IN-AN",	"Andaman and Nicobar Islands"),	
+    ("IN-AN",	"Andaman and Nicobar Islands"),
     ("IN-CH",	"Chandigarh"),
     ("IN-DN",	"Dadra and Nagar Haveli"),
     ("IN-DD",	"Daman and Diu"),
@@ -127,7 +123,7 @@ class Profile(models.Model):
                                             self.user.first_name,
                                             self.user.last_name,
                                             self.user.email
-                                            ) 
+                                            )
 
 
 class WorkshopType(models.Model):
@@ -252,7 +248,7 @@ class BookedWorkshop(models.Model):
 
     def __str__(self):
         return u"{0} | {1} |".format(
-                    self.booked_workshop_requested, 
+                    self.booked_workshop_requested,
                     self.booked_workshop_proposed
                     )
 
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index 2444a50..28a912c 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -1,18 +1,19 @@
 /* Responsive layout - when the screen is less than 800px wide, make the two columns stack on top of each other instead of next to each other */
 @media screen and (max-width: 800px) {
-    .leftcolumn, .rightcolumn {   
+    .leftcolumn, .rightcolumn { 
         width: 100%;
         padding: 0;
 
     },
-  
+ 
 }
 
 ul.topnav {
     list-style-type: none;
     margin: 10px;
     padding: 0;
-    overflow: hidden; 
+    overflow: hidden;
+
 }
 
 ul.topnav li {float: right;}
@@ -20,6 +21,7 @@ ul.topnav li {float: right;}
 ul.topnav li a {
     display: block;
     color: black;
+    font-family: "Helvatica", arial, sans-serif;
     text-align: center;
     padding: 14px 16px;
     text-decoration: none;
@@ -49,7 +51,7 @@ ul.topnav li.right {float: right;}
   width: 100%;
   margin: auto;
   align-content: center;
-  
+
 }
 
 @font-face {
@@ -61,17 +63,15 @@ ul.topnav li.right {float: right;}
 
 #r1_c1
 {
-  font-family:  "Bitstream Vera Sans", Helvetica;
-  font-size: 30px;
+  font-size: 27px;
   background-image: url("../img/hd_bg.png");
   background-repeat: no-repeat;
   background-position: bottom;
   padding-top: 15px;
   padding-bottom: 15px;
-  padding-left: 10%;
+  padding-left: 7%;
 }
 
-
 .rslides {
   position: relative;
   list-style: none;
diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html
index f0d4646..80d58c8 100644
--- a/workshop_app/templates/workshop_app/how_to_participate.html
+++ b/workshop_app/templates/workshop_app/how_to_participate.html
@@ -36,6 +36,7 @@
 	  <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
 	</div>
 	<ul class="nav navbar-nav navbar-right">
+	  <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/"><span class="glyphicon glyphicon-user"></span> How to Participate</a></li>
 	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
 	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
 	</ul>
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index bf46616..a714f8f 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -46,7 +46,7 @@
     <div class="col-md-6" id="r1_c1">
         FOSSEE Python Workshop
     </div>
-    <div class="col-md-6">
+    <div class="col-md-6" >
         <ul class="topnav">
           <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
           <li><a href="{{URL_ROOT}}/login">Login</a></li>
@@ -115,7 +115,7 @@
 
 <div class="row" id="r6">
 
-    <div class="col-md-12 tslides" id="r6_c2" >
+    <div class="col-12 tslides" id="r6_c2" >
         <li>{{ testimonials.0.message }} <br> <br>
             <span>~ {{testimonials.0.name}} ~<br>
              {{testimonials.0.institute}} </span></li>
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html
index a60bb54..b86b74e 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_details.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html
@@ -14,6 +14,7 @@
 	</div>
 
 	<ul class="nav navbar-nav navbar-right">
+	  <li><a href="{{ URL_ROOT }}/how_to_participate/"><span class="glyphicon glyphicon-user"></span> How to Participate</a></li>
 	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
 	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
 	</ul>