menu bugfix

header user name + surname

app/shared/directives.js

@@ -384,7 +384,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
                     //menu['other'] = $scope.allMenuItems.other;
                     $scope.selectedMenuItems = $scope.prepareMenu(menu);
                     $timeout(function () {
-                        sidebarmenu.metisMenu();
+                        //sidebarmenu.metisMenu();
                         sidebarUserMenu.metisMenu();
                     });
                 });
@@ -425,7 +425,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
                     function (newindex, oldindex) {
                         if (newindex > -1) {
                             $scope.menuItems = [$scope.allMenuItems[newindex]];
-                            $scope.collapseVar = 1;
+                            $scope.collapseVar = 0;
                         }
                     });
 

app/shared/templates/directives/header-notification.html

@@ -85,7 +85,7 @@
     <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown">
             <i class="fa fa-user fa-fw" tooltip-placement="bottom"
-               uib-tooltip="Profil"></i>&nbsp;{{$root.current_user.username}}&nbsp;<i
+               uib-tooltip="Profil"></i>&nbsp;{{$root.current_user.name}}&nbsp;{{$root.current_user.surname}}&nbsp;<i
                 class="fa fa-caret-down"></i>
         </a>
         <ul class="dropdown-menu dropdown-user">

app/shared/templates/directives/sidebar.html

@@ -37,8 +37,8 @@
                     data-intro="seçilen personele veya öğrenciye göre ilgili menüler yer almaktadır. yapılacak işlemi buradan seçebilirsiniz.">
 
 
-                    <li ng-repeat="(key, item) in selectedMenuItems" ng-class="{active: collapseVar == $index+1}">{{dropDown}}
-                        <a href="" ng-click="check($index+1)">
+                    <li ng-repeat="(key, item) in selectedMenuItems" ng-class="{active: collapseVar == $index+100}">{{dropDown}}
+                        <a href="" ng-click="check($index+100)">
                             <i class="fa fa-fw"
                                ng-class="{
                                'Admin': 'fa fa-fw fa-terminal',