UI Changes

todo on previous logs
author: Akshen 2017-05-08 16:57:10 +0530
committer: Akshen 2017-05-19 15:30:31 +0530
commit: 7cd05edb5953eda0b0f52ca87347e53ac50d1ae3 (patch)
tree: f5197170f65b34f3f2b632461f48bfcfe94ccfab /workshop_app
parent: addf34769b448194a5d5be7f98821df26d185aee (diff)
download: workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.tar.gz
workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.tar.bz2
workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.zip
18 files changed, 143 insertions, 86 deletions
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index c7b07fb..72f6c44 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -3,20 +3,19 @@ body {
 }
 
 .fossee-label {
-  padding-top: 90px;
-  margin-left: 200px;
+  padding-top: 20%;
+  margin-left: 60%;
   color: #6D5847;
-  font-size: 70px;
+  font-size: 450%;
 }
 
 
 .logo {
-    width: 600px;
-    height: 70px;
-    background: white;
+    width: 200%;
+    height: 100%;
     float: left;
-    margin-top: 40px;
-    margin-left: 85px;
+    margin-top: 9%;
+    margin-left: 75%;
 }
 
 .label-bar {
diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css
index 42471ee..cb21144 100644
--- a/workshop_app/static/workshop_app/css/sticky-footer.css
+++ b/workshop_app/static/workshop_app/css/sticky-footer.css
@@ -1,8 +1,42 @@
+/* Navbar */
+.navbar-custom {
+	background-color:#6D5847;
+    color:black;
+  	border-radius:0;
+}
+
+/* Text color */
+.navbar-custom .navbar-nav > li > a {
+  	color:#fff;
+}
+
+/* OnActive Tab */
+.navbar-custom .navbar-nav > .active > a {
+    color: black;
+    background: white;	
+}
+
+.navbar-custom .navbar-nav > li > a:hover,
+.navbar-custom .navbar-nav > li > a:focus,
+.navbar-custom .navbar-nav > .active > a:hover,
+.navbar-custom .navbar-nav > .active > a:focus,
+.navbar-custom .navbar-nav > .open >a {
+    text-decoration: none;
+    background-color: #fff;
+}
+
+/* Brand-CompanyName */
+.navbar-custom .navbar-brand {
+	color:#efefef;
+  background-color: black;
+}
+
+/* Footer CSS */
 .footer {
-	position: absolute;
-  	bottom: 0;
-  	padding-left: 75px;
-  	
+	position: relative;
+  bottom: 0;
+  right: 0;
+  left: 0;  	
 }
 
 .hiddenRow {
diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html
index 49efb5f..069a397 100644
--- a/workshop_app/templates/workshop_app/activation.html
+++ b/workshop_app/templates/workshop_app/activation.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block header %}
-	<nav class="navbar navbar-inverse">
+	<nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
 		  <a class="navbar-brand" href="#">SiteName</a>
@@ -16,7 +16,6 @@
 		{% endif %}
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
-
 	  	</div>
     </nav>
 {% endblock %}
diff --git a/workshop_app/templates/workshop_app/base.html b/workshop_app/templates/workshop_app/base.html
index 0e702e5..391fa9b 100644
--- a/workshop_app/templates/workshop_app/base.html
+++ b/workshop_app/templates/workshop_app/base.html
@@ -24,7 +24,7 @@
 <body style="overflow: scroll;">
 
  {% block header %}
- <nav class="navbar navbar-inverse">
+ <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
 	  <a class="navbar-brand" href="#">Booking</a>
diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html
index e94fa6b..6729684 100644
--- a/workshop_app/templates/workshop_app/booking.html
+++ b/workshop_app/templates/workshop_app/booking.html
@@ -8,14 +8,12 @@
 {% block extra %}
 	 
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ 	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-
-	 <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
-	 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>	
+	<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>	
 
 	<script>
-
 	// Button function
 		function sendData(d){
 			var check_count;		
@@ -60,7 +58,6 @@
 						}
 					}
 				});
-
 			$dialog.dialog('open');	
 		}
 
@@ -86,15 +83,15 @@
 
 {% block header %}
 
-	<nav class="navbar navbar-inverse">
+	<nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
-		  <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a>
+		  <a class="navbar-brand" href="#">Coordinator Profile</a>
 		</div>
 		<ul class="nav navbar-nav">
-		  <li class="active"><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
-		  <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-		  <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+		  <li class="active"><a href="{{ URL_ROOT}}/book/">Book</a></li>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
+		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
 		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
@@ -108,7 +105,7 @@
 	<h4 align="center">This is the list of events available, if you haved booked a workshop please goto My Workshops and check your workshop status.</h4>
 	<br>
 	<div class="container">
-		<table class="table table-hover">
+		<table class="table table-hover ">
 			<thead>
 				<tr>
 					<th>Instructor Name</th>
@@ -125,7 +122,9 @@
 						<tr >
 							<td id="instructor-name">{{ workshop.1 }}</td>
 							<td class="accordion-toggle"  data-toggle="collapse" href="#collapseOne{{ forloop.counter }}"
-							id="workshop-name">{{ workshop.2 }}</td>
+							id="workshop-name">{{ workshop.2 }}<a href="#">
+          					<span class="glyphicon glyphicon-info-sign"></span>
+        					</a></td>
 							<td id="workshop-date{{ forloop.counter }}">{{ workshop.0 }}</td>
 							<td><button class="btn btn-primary btn-sm" id="book-btn" onClick="sendData('{{workshop.0}},{{workshop.3}},{{workshop.4}}')" > Book</button></td>
 						</tr>
diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html
index d057be8..588c4e3 100644
--- a/workshop_app/templates/workshop_app/create_workshop.html
+++ b/workshop_app/templates/workshop_app/create_workshop.html
@@ -12,14 +12,16 @@
   {% endblock %}
 
 {% block header %}
-  <nav class="navbar navbar-inverse">
+  <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand" href="{{ URL_ROOT}}/manage/">WebSiteName</a>
+        <a class="navbar-brand" href="#">Instructor Profile</a>
       </div>
       <ul class="nav navbar-nav">
-        <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-       <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+        <li ><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+        <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+        <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+       <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html
index 1cb2a52..323d554 100644
--- a/workshop_app/templates/workshop_app/edit_profile.html
+++ b/workshop_app/templates/workshop_app/edit_profile.html
@@ -5,21 +5,23 @@
 {% endblock %}
 
 {% block header %}
-  <nav class="navbar navbar-inverse">
+  <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
         <a class="navbar-brand" href="#">WebSiteName</a>
       </div>
       {% if request.user.profile.position == 'instructor' %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+            <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
           </ul>
         {% else %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/book/">Home</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
           </ul>
         {% endif %}
       <ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index 5fd17bf..44e2692 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -20,11 +20,8 @@
       <div class="col-md-4">
         <div class="fossee-label">FOSSEE Workshop</div>
         <div class="logo">
-          <img src="{{ URL_ROOT }}/static/workshop_app/img/python_logo.png" style="margin-left: 50px;margin-top:6px;width:60px ;height: 60px">
-          <img src="{{ URL_ROOT }}/static/workshop_app/img/sandhi_logo.png" style="margin-left: 50px;margin-top:6px;width:60px ;height: 60px">
-          <img src="{{ URL_ROOT }}/static/workshop_app/img/Scilab_logo.png" style="margin-left: 50px;margin-top:6px;width:90px ;height: 60px">
-          <img src="{{ URL_ROOT }}/static/workshop_app/img/OR_logo.png" style="margin-left: 30px;margin-top:6px;width:60px ;height: 60px">
-          <img src="{{ URL_ROOT }}/static/workshop_app/img/Dwsim_logo.png" style="margin-left: 50px;margin-top:6px;width:60px ;height: 60px">
+          <img src="{{ URL_ROOT }}/static/workshop_app/img/python_logo.png" style="width:20% ;height: 18%">
+          
         </div>
 
         </div>
diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html
index 9ac9a93..47f5827 100644
--- a/workshop_app/templates/workshop_app/login.html
+++ b/workshop_app/templates/workshop_app/login.html
@@ -5,7 +5,7 @@
 	{% endblock %}
 
 {% block header %}
- <nav class="navbar navbar-inverse">
+ <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
 	  <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a>
diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html
index ba33d61..8c07822 100644
--- a/workshop_app/templates/workshop_app/logout.html
+++ b/workshop_app/templates/workshop_app/logout.html
@@ -5,7 +5,7 @@
 	{% endblock %}
 
 {% block header %}
- <nav class="navbar navbar-inverse">
+ <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
 	  <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a>
diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html
index 23c15e3..411023b 100644
--- a/workshop_app/templates/workshop_app/manage.html
+++ b/workshop_app/templates/workshop_app/manage.html
@@ -1,15 +1,16 @@
 {% extends 'workshop_app/base.html' %}
 
 {% block header %}
-   <nav class="navbar navbar-inverse">
+   <nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
 		  <a class="navbar-brand" href="#">Instructor Profile</a>
 		</div>
 		<ul class="nav navbar-nav">
-		  <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-		   <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-		   <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+		  <li class="active"><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+		  <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+		   <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+		   <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
 		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 6c6a756..4aaab85 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -39,23 +39,23 @@
 {% endblock %}
 
 {% block header %}
-    <nav class="navbar navbar-inverse">
+    <nav class="navbar navbar-default navbar-custom">
       <div class="container-fluid">
         <div class="navbar-header">
-        {% if request.user.profile.position == 'instructor' %}
-          <a class="navbar-brand" href="{{ URL_ROOT}}/manage/">WebSiteName</a>
-        {% endif %}
+       		<a class="navbar-brand" href="#">WebSiteName</a>
         </div>
         {% if request.user.profile.position == 'instructor' %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+          	<li><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+            <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
           </ul>
         {% else %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/book/">Home</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+            <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
           </ul>
         {% endif %}
         
diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html
index 19c3fb1..0bea78c 100644
--- a/workshop_app/templates/workshop_app/profile_updated.html
+++ b/workshop_app/templates/workshop_app/profile_updated.html
@@ -5,18 +5,22 @@
 {% endblock %}
 
 {% block header %}
-  <nav class="navbar navbar-inverse">
+  <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
         <a class="navbar-brand" href="#">WebSiteName</a>
       </div>
       <ul class="nav navbar-nav">
       {% if request.user.profile.position == 'instructor' %}
-        <li class="active"><a href="{{ URL_ROOT }}/manage/">Home</a></li>
+        <li><a href="{{ URL_ROOT }}/manage/">Manage</a>
+        </li>
+        <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
       {% else %}
-        <li class="active"><a href="{{ URL_ROOT }}/book/">Home</a></li>
+        <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+        <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
       {% endif %}
-        <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+        <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop Details</a></li>
+        <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
@@ -27,6 +31,10 @@
 {% endblock %}
 
 {% block content %}
-  <h3>Your Profile has changed {{ user.first_name }}</h3>
+  <div class="container">
+    <div class="jumbotron">
+      <h3>Your Profile has changed {{ user.first_name }}</h3>
+    </div>
+  </div>
 {% endblock %}
 
diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html
index 07267d7..ab5faee 100644
--- a/workshop_app/templates/workshop_app/propose_workshop.html
+++ b/workshop_app/templates/workshop_app/propose_workshop.html
@@ -23,14 +23,15 @@
   {% endblock %}
 
 {% block header %}
-  <nav class="navbar navbar-inverse">
+  <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
         <a class="navbar-brand" href="{{ URL_ROOT}}/book/">WebSiteName</a>
       </div>
       <ul class="nav navbar-nav">
-        <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-       <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+        <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+       <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+       <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/register.html
index 1798f57..8163fef 100644
--- a/workshop_app/templates/workshop_app/register.html
+++ b/workshop_app/templates/workshop_app/register.html
@@ -5,29 +5,29 @@
 	{% endblock %}
 
 	{% block header %}
-	 <nav class="navbar navbar-inverse">
+	 <nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
 		  <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a>
 		</div>
 
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
+		  <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 %}
+{% block content %}
 	<div class="container" >
 		<br>
 		<form action="" method="post">
 			{% csrf_token %}
-			<div class="form-group">
-				{{ form.as_p }}
+				<table class="table table-bordered">
+					{{ form.as_table }}
+				</table>
 				<button class="btn btn-primary" type="submit">Register</button>
-			</div>
 		</form>
 	</div>
-	{% endblock %}
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html
index 7227d87..b79a504 100644
--- a/workshop_app/templates/workshop_app/view_profile.html
+++ b/workshop_app/templates/workshop_app/view_profile.html
@@ -5,26 +5,28 @@
 {% endblock %}
 
 {% block header %}
-    <nav class="navbar navbar-inverse">
+    <nav class="navbar navbar-default navbar-custom">
       <div class="container-fluid">
         <div class="navbar-header">
+          <a class="navbar-brand" href="#">WebSiteName</a>
         </div>
         {% if request.user.profile.position == 'instructor' %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/manage/">Home</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+            <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
           </ul>
         {% else %}
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/book/">Home</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+            <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a>
+            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li></li>
           </ul>
         {% endif %}
         
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+          <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
           <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-in"></span> Logout</a></li>
         </ul>
       </div>
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html
index f033804..1821c66 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_details.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html
@@ -11,7 +11,15 @@
 		  <a class="navbar-brand" href="#">WebSiteName</a>
 		</div>
 		<ul class="nav navbar-nav">
-		  <li class="active"><a href="#">Home</a></li>
+		{% if request.user.profile.position == 'instructor' %}
+		  <li class="active"><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+		  <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+		{% else %}
+		  <li class="active"><a href="{{ URL_ROOT }}/book/">Book</a></li>
+		  <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+		{% endif %}
+		  <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_details/">View Workshop details</a></li>
+		  <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
 		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html
index b8fd867..ff99737 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_list.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html
@@ -6,16 +6,21 @@
 
 
 {% block header %}
-	<nav class="navbar navbar-inverse">
+	<nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
-		  <a class="navbar-brand" href="{{ URL_ROOT}}/manage/">WebSiteName</a>
+		  <a class="navbar-brand" href="#">WebSiteName</a>
 		</div>
 		<ul class="nav navbar-nav">
 		{% if request.user.profile.position == 'instructor'%}
-		  <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+		  <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li>
+		  <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+		{% else %}
+		  <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
 		{% endif %}
-		  <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
+		  <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li>
+		  <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
 		</ul>
 
 		<ul class="nav navbar-nav navbar-right">
author	Akshen	2017-05-08 16:57:10 +0530
committer	Akshen	2017-05-19 15:30:31 +0530
commit	7cd05edb5953eda0b0f52ca87347e53ac50d1ae3 (patch)
tree	f5197170f65b34f3f2b632461f48bfcfe94ccfab /workshop_app
parent	addf34769b448194a5d5be7f98821df26d185aee (diff)
download	workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.tar.gz workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.tar.bz2 workshop_booking-7cd05edb5953eda0b0f52ca87347e53ac50d1ae3.zip