From 2d80150931c40b7a09e0b30ee372aaef3c43558e Mon Sep 17 00:00:00 2001
From: Akshen
Date: Sat, 22 Jul 2017 15:45:00 +0530
Subject: Handles Multiple Requests for ProposeWorkshopDate

---
 .../workshop_app/password_change_done.html         | 10 ++--
 .../workshop_app/password_reset_done.html          | 10 +++-
 .../workshop_app/password_reset_form.html          |  6 ++-
 workshop_app/templates/workshop_app/register.html  | 53 ----------------------
 .../workshop_app/registration/register.html        | 53 ++++++++++++++++++++++
 5 files changed, 73 insertions(+), 59 deletions(-)
 delete mode 100644 workshop_app/templates/workshop_app/register.html
 create mode 100644 workshop_app/templates/workshop_app/registration/register.html

(limited to 'workshop_app/templates')

diff --git a/workshop_app/templates/workshop_app/password_change_done.html b/workshop_app/templates/workshop_app/password_change_done.html
index 45c8162..fc87389 100644
--- a/workshop_app/templates/workshop_app/password_change_done.html
+++ b/workshop_app/templates/workshop_app/password_change_done.html
@@ -1,6 +1,9 @@
 {% extends "base.html" %}
 
-{% block pagetitle %}Password change successful{% endblock %}
+{% block pagetitle %} 
+	Password change successful
+{% endblock %}
+
 {% block script %}
 <script type="text/javascript">
 	window.setTimeout(function()
@@ -9,7 +12,8 @@
 	}, 2000);
 </script>
 {% endblock %}
+
 {% block content %}
-<h3>Your password has been changed successfully.</h3>
-<h4>Redirecting ...</h4>
+	<h3>Your password has been changed successfully.</h3>
+	<h4>Redirecting ...</h4>
 {% endblock %}
diff --git a/workshop_app/templates/workshop_app/password_reset_done.html b/workshop_app/templates/workshop_app/password_reset_done.html
index 1ac7b60..7b4f09a 100644
--- a/workshop_app/templates/workshop_app/password_reset_done.html
+++ b/workshop_app/templates/workshop_app/password_reset_done.html
@@ -1,3 +1,9 @@
 {% extends "base.html" %}
-{% block title %}Password reset successful{% endblock %}
-{% block pagetitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
+
+{% block title %}
+	Password reset successful
+{% endblock %}
+
+{% block pagetitle %} 
+	Instruction for setting new password has been mailed to your registered email address 
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/password_reset_form.html b/workshop_app/templates/workshop_app/password_reset_form.html
index fa14e9e..8a7c09d 100644
--- a/workshop_app/templates/workshop_app/password_reset_form.html
+++ b/workshop_app/templates/workshop_app/password_reset_form.html
@@ -1,5 +1,9 @@
 {% extends "base.html" %}
-{% block pagetitle %} Email will be send to the registered email address {% endblock %}
+
+{% block pagetitle %} 
+	Email will be send to the registered email address 
+{% endblock %}
+
 {% block content %}
 <form action="" method="post">
     {% csrf_token %}
diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/register.html
deleted file mode 100644
index 6804ad0..0000000
--- a/workshop_app/templates/workshop_app/register.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends 'workshop_app/base.html' %}
-
-	{% block title %}
-		Register
-	{% endblock %}
-
-	{% block header %}
-	 <nav class="navbar navbar-default navbar-custom">
-	  <div class="container-fluid">
-		<div class="navbar-header">
-		  <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
-		</div>
-
-		<ul class="nav navbar-nav navbar-right">
-		  <li class="active"><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>
-	  	</div>
-	  </nav>
-  {% endblock %}
-
- 
-{% block content %}
-
-	<style type="text/css">
-    	label.required::after {
-    	content: "*";
-    	color: red;
-		}
-		
-		.errorlist {
-      color: red;
-    }
-	</style>
-
-	<div class="container" >
-		<br>
-		<h3>Coordinator Registration Form</h3>
-		<br>
-		<form action="" method="post">
-			{% csrf_token %}
-				<table class="table table-bordered">
-					{{ form.as_table }}
-				</table>
-
-				<button class="btn btn-primary" type="submit">Register</button>
-		</form><br>
-		<!-- Activate when Instructor registeration starts -->
-		<!-- <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 %}
diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html
new file mode 100644
index 0000000..6804ad0
--- /dev/null
+++ b/workshop_app/templates/workshop_app/registration/register.html
@@ -0,0 +1,53 @@
+{% extends 'workshop_app/base.html' %}
+
+	{% block title %}
+		Register
+	{% endblock %}
+
+	{% block header %}
+	 <nav class="navbar navbar-default navbar-custom">
+	  <div class="container-fluid">
+		<div class="navbar-header">
+		  <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+		</div>
+
+		<ul class="nav navbar-nav navbar-right">
+		  <li class="active"><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>
+	  	</div>
+	  </nav>
+  {% endblock %}
+
+ 
+{% block content %}
+
+	<style type="text/css">
+    	label.required::after {
+    	content: "*";
+    	color: red;
+		}
+		
+		.errorlist {
+      color: red;
+    }
+	</style>
+
+	<div class="container" >
+		<br>
+		<h3>Coordinator Registration Form</h3>
+		<br>
+		<form action="" method="post">
+			{% csrf_token %}
+				<table class="table table-bordered">
+					{{ form.as_table }}
+				</table>
+
+				<button class="btn btn-primary" type="submit">Register</button>
+		</form><br>
+		<!-- Activate when Instructor registeration starts -->
+		<!-- <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 %}
-- 
cgit