Merge branch 'se-hub-33'

templates/css/theme.css

@@ -214,8 +214,17 @@ body.noscroll
     background-color: #E2E2E2;
     font-weight: bold;
   }
-  .se-menu li .selected{
+
+  .se-menu li:active{
+    background-color: #B2B2B2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
+  }
+
+  .se-menu .selected{
     background-color: #E2E2E2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
   }
 
   .user-box{

templates/js/controllers/mainController.js

@@ -40,37 +40,37 @@ angular.module('SeHub')
 			"title": "Home",
 			"icon": "fa fa-home",
 			"style": "selected",
-			"route": "/home"
+			"route": "#/home"
 		}, {
 			"title": "My Campuses",
 			"icon": "fa fa-university",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "My Classes",
 			"icon": "fa fa-graduation-cap",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "My Projects",
 			"icon": "fa fa-cube",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "Tasks",
 			"icon": "fa fa-clipboard",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "Settings",
 			"icon": "fa fa-cogs",
-			"style": "selected",
+			"style": "",
-			"route": "/campuses"
+			"route": "#/Settings"
 		}, {
 			"title": "Log Out",
 			"icon": "fa fa-power-off",
-			"style": "selected",
+			"style": "",
-			"route": "/campuses"
+			"route": "#/logout"
 		}];
 
 	}]);

templates/views/index.html

@@ -25,26 +25,28 @@
             <img ng-src="{{user.avatar_url}}" alt="">
         </div> -->
         <md-content class="se-menu">
-            <div class="user-box" layout="row" layout-padding>
+            <div ng-if="!isInRegisterMode">
-                <div flex="30"> <!-- Avatar -->
+                <div class="user-box" layout="row" layout-padding>
-                    <img ng-src="{{user.avatar_url}}" alt="">
+                    <div flex="30"> <!-- Avatar -->
-                </div>
+                        <img ng-src="{{user.avatar_url}}" alt="">
-                <div class="user-data" layout="column" flex>
-                    <div>
-                        {{user.name}}
                     </div>
-                    <div>
+                    <div class="user-data" layout="column" flex>
-                        {{user.email}}
+                        <div>
+                            {{user.name}}
+                        </div>
+                        <div>
+                            {{user.email}}
+                        </div>
                     </div>
                 </div>
+                
+                    <ul>
+                        <a ng-repeat="item in menuItems" ng-href="{{item.route}}">
+                            <li ng-class="[item.style]"><i ng-class="item.icon"></i> {{item.title}}</li>
+                            <md-divider ng-if="!$last"></md-divider>
+                        </a>
+                    </ul>
             </div>
-            
-                <ul>
-                    <a ng-repeat="item in menuItems" href="#">
-                        <li><i ng-class="item.icon"></i> {{item.title}}</li>
-                        <md-divider ng-if="!$last"></md-divider>
-                    </a>
-                </ul>
             <div ng-if="loadingData">
                 <md-progress-circular></md-progress-circular>
             </div>