From cd0569d79431de0d1c69360b2b5aa16ca6dcc3be Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Thu, 23 Aug 2018 12:57:40 +0530
Subject: [PATCH] nav changes

---
 Apollo/assets/views/partials/nav.html | 55 ++++++++++++---------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index 4aad646d..65b18287 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -50,7 +50,11 @@
 							<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
 						</a>
 					</li>
-			
+			<li ui-sref-active="active">
+				<a ui-sref="app.master.batch" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
+				</a>
+			</li>
 			
 			<li ui-sref-active="active">
 				<a ui-sref="app.master.course" ng-click="checkSuperAdmin()">
@@ -63,16 +67,6 @@
 					<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
-				<a ui-sref="app.master.subjectMaster">
-					<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
-				</a>
-			</li>
-			<li ui-sref-active="active">
-				<a ui-sref="app.master.batch" ng-click="checkSuperAdmin()">
-					<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
-				</a>
-			</li>
 			
 			<li ui-sref-active="active">
 				<a ui-sref="app.master.branch" ng-click="checkSuperAdmin()">
@@ -108,7 +102,11 @@
 					<span class="title" translate="sidebar.nav.master.CENTERMASTER"> CENTER DETAILS </span>
 				</a>
 			</li>
-			
+			<li ui-sref-active="active" >
+				<a ui-sref="app.master.subjectMaster">
+					<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
+				</a>
+			</li>
 			<li ui-sref-active="active" >
 				<a ui-sref="app.master.sessionMaster">
 					<span class="title" translate="sidebar.nav.master.SESSIONMASTER"> SESSION DETAILS </span>
@@ -503,7 +501,7 @@
 
 		</ul>
 	</li>
-	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
 			<div class="item-content">
 				<div class="item-media">
@@ -515,7 +513,7 @@
 			</div>
 		</a>
 
-	</li>-->
+	</li>
 </ul>
 
 <!-- end: Super Admin -->
@@ -569,7 +567,11 @@
 					<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
 				</a>
 			</li>
-				
+			<li ui-sref-active="active">
+					<a ui-sref="app.master.batch" ng-click="checkAdmin()">
+						<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
+					</a>
+				</li>	
 			<li ui-sref-active="active">
 				<a ui-sref="app.master.course" ng-click="checkAdmin()">
 					<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
@@ -580,16 +582,7 @@
 					<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
-				<a ui-sref="app.master.subjectMaster">
-					<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
-				</a>
-			</li>
-			<li ui-sref-active="active">
-					<a ui-sref="app.master.batch" ng-click="checkAdmin()">
-						<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
-					</a>
-				</li>
+			
 			<!--<li ui-sref-active="active">
 				<a ui-sref="app.master.branch">
 					<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
@@ -999,7 +992,7 @@
 	
 			</ul>
 		</li>	
-	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile" ng-click="checkAdmin()">
 			<div class="item-content">
 				<div class="item-media">
@@ -1011,7 +1004,7 @@
 			</div>
 		</a>
 
-	</li>-->
+	</li>
 </ul>
 
 <!-- end: Admin -->
@@ -1255,7 +1248,7 @@
 		</ul>
 	</li>
 
-	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile"  ng-click="checkStaff()">
 			<div class="item-content">
 				<div class="item-media">
@@ -1267,7 +1260,7 @@
 			</div>
 		</a>
 
-	</li>-->
+	</li>
 </ul>
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">
@@ -1520,7 +1513,7 @@
 		</ul>
 	</li>
 
-	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile"  ng-click="checkStaff()">
 			<div class="item-content">
 				<div class="item-media">
@@ -1532,7 +1525,7 @@
 			</div>
 		</a>
 
-	</li>-->
+	</li>
 </ul>
 <!--<ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">