nav bar changes

Apollo/assets/i18n/en.json

@@ -19,6 +19,7 @@
       "MESSAGES": "My Messages",
       "LOCKSCREEN": "Lock Screen",
       "LOGOUT": "Log Out",
+      "MYPROFILE": "My Profile",
       "CHANGEPASSWORD": "Change Password"
     }
   },

Apollo/assets/views/partials/nav.html

@@ -50,11 +50,7 @@
 							<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()">
@@ -67,6 +63,16 @@
 					<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()">
@@ -102,11 +108,7 @@
 					<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>
@@ -495,7 +497,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">
@@ -507,7 +509,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 
 <!-- end: Super Admin -->
@@ -561,11 +563,7 @@
 					<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>
@@ -576,7 +574,16 @@
 					<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>
@@ -979,7 +986,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">
@@ -991,7 +998,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 
 <!-- end: Admin -->
@@ -1235,7 +1242,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">
@@ -1247,7 +1254,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">
@@ -1500,7 +1507,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">
@@ -1512,7 +1519,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 <!--<ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">

Apollo/assets/views/partials/top-navbar.html

@@ -183,7 +183,7 @@
 				<!--<li>
 					<a ui-sref="app.pages.calendar" translate="topbar.user.CALENDAR">
 						My Calendar
-					</a>
+					</a>      
 				</li>
 				<li>
 					<a ui-sref="app.pages.messages" translate="topbar.user.MESSAGES">
@@ -191,6 +191,12 @@
 					</a>
 				</li>-->
 				<li>
+		<a ui-sref="app.myprofile" translate="topbar.user.PROFILE">
+			   My Profile
+					</a>
+
+	</li>
+				<li>
 					<a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD">
 						Change Password
 					</a>
@@ -200,6 +206,8 @@
 						Log Out
 					</a>
 				</li>
+				
+				
 			</ul>
 		</li>
 		<!-- end: USER OPTIONS DROPDOWN -->