Merge remote-tracking branch 'origin/10172_team_edit' into develop

public/app/features/org/partials/team_details.html

-<navbar model="ctrl.navModel"></navbar>
+<page-header model="ctrl.navModel"></page-header>
 
 
-<div class="page-container">
-	<div class="page-header">
-		<h1>Edit Team</h1>
-	</div>
+<div class="page-container page-body">
+  <h3 class="page-sub-heading">Edit Team</h3>
 
 
-	<form name="teamDetailsForm" class="gf-form-group gf-form-inline">
-		<div class="gf-form">
-			<span class="gf-form-label width-10">Name</span>
-			<input type="text" required ng-model="ctrl.team.name" class="gf-form-input max-width-14" >
-		</div>
+  <form name="teamDetailsForm" class="gf-form-group gf-form-inline">
+    <div class="gf-form">
+      <span class="gf-form-label width-10">Name</span>
+      <input type="text" required ng-model="ctrl.team.name" class="gf-form-input max-width-14">
+    </div>
 
 
-		<div class="gf-form">
-			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>
-		</div>
-	</form>
+    <div class="gf-form">
+      <button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>
+    </div>
+  </form>
 
 
   <div class="gf-form-group">
   <div class="gf-form-group">
     <h3 class="page-heading">Team Members</h3>
     <h3 class="page-heading">Team Members</h3>
@@ -43,7 +41,7 @@
       </tr>
       </tr>
     </table>
     </table>
     <div>
     <div>
-  <em class="muted" ng-hide="ctrl.teamMembers.length > 0">
-    This team has no members yet.
-  </em>
-</div>
+      <em class="muted" ng-hide="ctrl.teamMembers.length > 0">
+        This team has no members yet.
+      </em>
+    </div>

public/app/features/org/team_details_ctrl.ts

@@ -8,7 +8,7 @@ export default class TeamDetailsCtrl {
   navModel: any;
   navModel: any;
 
 
   constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
   constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
-    this.navModel = navModelSrv.getNav('cfg', 'users');
+    this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
     this.get();
     this.get();
   }
   }