Moved to ui.router
diff --git a/mCordPortal/src/app/fw/mast/mast.html b/mCordPortal/src/app/fw/mast/mast.html
index c568713..ac8bfe0 100644
--- a/mCordPortal/src/app/fw/mast/mast.html
+++ b/mCordPortal/src/app/fw/mast/mast.html
@@ -8,14 +8,14 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="#/home">
+ <a class="navbar-brand" href="#/">
<img src="/imgs/logo.png">
</a>
</div>
<div id="navbar" class="collapse navbar-collapse" close-on-route-change>
<ul ng-if="page.curr !== 'login'" class="nav navbar-nav pull-right">
<li ng-class="{active: page.curr === 'dashboard'}">
- <a href="#/home">Home</a>
+ <a href="#/">Home</a>
</li>
<li ng-class="{active: page.curr === 'user'}">
<a href="#/user">User</a>
diff --git a/mCordPortal/src/app/fw/services/rest.js b/mCordPortal/src/app/fw/services/rest.js
index 7d62a5e..29f4d7f 100644
--- a/mCordPortal/src/app/fw/services/rest.js
+++ b/mCordPortal/src/app/fw/services/rest.js
@@ -99,8 +99,8 @@
// but can be provided by any external services
// add an icon to the user
- res.data.map(function(user){
- switch (user.id){
+ res.data = res.data.map(function(user, i){
+ switch (i){
case 0:
user['icon_id'] = 'student1';
break