Merge pull request #7 from Akshen/testing

Change Nav-Brand CSS color

4 files changed, 20 insertions, 7 deletions

diff --git a/workshop_app/forms.py b/workshop_app/forms.py
index 3ee457a..5113095 100644
--- a/workshop_app/forms.py
+++ b/workshop_app/forms.py
@@ -44,10 +44,9 @@ class UserRegistrationForm(forms.Form):
                 help_text='Institute/Organization')
     department = forms.CharField(max_length=64, help_text='Department you work/\
                                 study')
-    position = forms.ChoiceField(help_text='Instructors, please wait \
-                                for our admin approval, if your instructor \
-                                account is not activated in 7 days, please\
-                                mail us at workshops[at]fossee[dot]in',
+    position = forms.ChoiceField(help_text='Select Coordinator if you want to organise a workshop\
+                                    in your college/school. <br> Select Instructor if you want to conduct\
+                                    a workshop.',
                                 choices=position_choices
                                  )
 
diff --git a/workshop_app/models.py b/workshop_app/models.py
index 422eee7..70a22ee 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -29,7 +29,10 @@ class Profile(models.Model):
                                 Up to 15 digits allowed.")
                             )]
                 ,null=False)
-    position = models.CharField(max_length=32, choices=position_choices)
+    position = models.CharField(max_length=32, choices=position_choices,
+                    help_text='Select Coordinator if you want to organise a workshop\
+                            in your college/school. <br> Select Instructor if you want to conduct\
+                            a workshop.')
     is_email_verified = models.BooleanField(default=False)
     activation_key = models.CharField(max_length=255, blank=True, null=True)
     key_expiry_time = models.DateTimeField(blank=True, null=True)
diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css
index cb21144..924258c 100644
--- a/workshop_app/static/workshop_app/css/sticky-footer.css
+++ b/workshop_app/static/workshop_app/css/sticky-footer.css
@@ -31,6 +31,11 @@
   background-color: black;
 }
 
+.navbar-custom .navbar-brand:hover{
+  color: black;
+  background-color: #efefef;
+}
+
 /* Footer CSS */
 .footer {
 	position: relative;
diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/register.html
index 6e688d5..fcb0739 100644
--- a/workshop_app/templates/workshop_app/register.html
+++ b/workshop_app/templates/workshop_app/register.html
@@ -18,8 +18,10 @@
 	  	</div>
 	  </nav>
   {% endblock %}
-  
+
+ 
 {% block content %}
+
 	<style type="text/css">
     	label.required::after {
     	content: "*";
@@ -34,7 +36,11 @@
 				<table class="table table-bordered">
 					{{ form.as_table }}
 				</table>
+
 				<button class="btn btn-primary" type="submit">Register</button>
-		</form>
+		</form><br>
+		<div class="alert alert-info">
+  			<strong>Info!</strong> Instructors, please wait for our admin approval, if your instructor account is not activated in 7 days, please mail us at workshops[at]fossee[dot]in
+		</div>
 	</div>
 {% endblock %}