From 71b2b649629de30ef133ce2dd9c8e855abe66a31 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Wed, 20 Sep 2017 15:17:28 +0530
Subject: Fixes State Field Bug

- State field bug in registration form fixed
- Test cases updated for the same
- my_workshops page titles changed
---
 workshop_app/templates/workshop_app/my_workshops.html        | 12 ++++++++++--
 .../templates/workshop_app/registration/register.html        |  1 +
 workshop_app/templates/workshop_app/workshop_stats.html      |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'workshop_app/templates')

diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 740e28f..d652502 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -81,7 +81,11 @@
 	
 	<!-- Pending View -->
 	<div class="container">
-	<h3 align="center"><strong><u>My Requests</u></strong></h3>
+	{% if request.user.profile.position == 'instructor' %}
+	 <h3 align="center"><strong><u>Requests for Me</u></strong></h3>
+	{% else %}
+	 <h3 align="center"><strong><u>My Requests</u></strong></h3>
+	{% endif %}
 		<table class="table table-striped">
 			<thead>
 				<tr>
@@ -171,7 +175,11 @@
 
 <!-- Proposed View -->
 <div class="container">
-	<h3 align="center"><strong><u>Proposed Workshops</u></strong></h3>
+      {% if request.user.profile.position == 'instructor' %}
+	<h3 align="center"><strong><u>Workshops Proposed By Coordinators</u></strong></h3>
+      {% else %}
+	<h3 align="center"><strong><u>Workshops Proposed By Me</u></strong></h3>
+      {% endif %}
 		<table class="table table-striped">
 			<thead>
 				<tr>
diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html
index 6804ad0..abca610 100644
--- a/workshop_app/templates/workshop_app/registration/register.html
+++ b/workshop_app/templates/workshop_app/registration/register.html
@@ -49,5 +49,6 @@
 		<!-- <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> -->
+		<br>
 	</div>
 {% endblock %}
diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html
index d923c92..ba597dc 100644
--- a/workshop_app/templates/workshop_app/workshop_stats.html
+++ b/workshop_app/templates/workshop_app/workshop_stats.html
@@ -359,7 +359,7 @@
 					    domain: 'IN',
 					    displayMode: 'regions',
 					    resolution: 'provinces',
-					    colorAxis: {colors: ['orange']},
+					    colorAxis: {colors: ['lightyellow', 'orange']},
 					    legend: {position: 'top'},
 					   	};
 
-- 
cgit