Merge remote-tracking branch 'origin/develop-filter-table' into develop

public/app/features/admin/partials/edit_org.html

@@ -16,7 +16,7 @@
 
 	<h3 class="page-heading">Organization Users</h3>
 
-	<table class="grafana-options-table">
+	<table class="filter-table">
 		<tr>
 			<th>Username</th>
 			<th>Email</th>

public/app/features/admin/partials/orgs.html

@@ -1,37 +1,40 @@
 <page-header model="navModel"></page-header>
 
 <div class="page-container page-body">
-	<div class="page-action-bar">
+  <div class="page-action-bar">
     <div class="page-action-bar__spacer"></div>
     <a class="page-header__cta btn btn-success" href="org/new">
       <i class="fa fa-plus"></i>
       New Org
     </a>
-	</div>
+  </div>
 
-	<table class="filter-table form-inline">
-		<thead>
-			<tr>
-				<th>Id</th>
-				<th>Name</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr ng-repeat="org in orgs">
-				<td>{{org.id}}</td>
-				<td>{{org.name}}</td>
-				<td class="text-right">
-					<a href="admin/orgs/edit/{{org.id}}" class="btn btn-inverse btn-small">
-						<i class="fa fa-edit"></i>
-						Edit
-					</a>
-					&nbsp;&nbsp;
-					<a ng-click="deleteOrg(org)" class="btn btn-danger btn-small">
-						<i class="fa fa-remove"></i>
-					</a>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+  <table class="filter-table form-inline filter-table--hover">
+    <thead>
+      <tr>
+        <th>Id</th>
+        <th>Name</th>
+        <th style="width:1%"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr ng-repeat="org in orgs">
+        <td class="link-td">
+          <a href="admin/orgs/edit/{{org.id}}">
+            {{org.id}}
+          </a>
+        </td>
+        <td class="link-td">
+          <a href="admin/orgs/edit/{{org.id}}">
+            {{org.name}}
+          </a>
+        </td>
+        <td class="text-right">
+          <a ng-click="deleteOrg(org)" class="btn btn-danger btn-small">
+            <i class="fa fa-remove"></i>
+          </a>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>

public/app/features/admin/partials/users.html

@@ -14,39 +14,48 @@
   </div>
 
   <div class="admin-list-table">
-    <table class="filter-table form-inline">
+    <table class="filter-table form-inline filter-table--hover">
       <thead>
         <tr>
           <th></th>
           <th>Login</th>
           <th>Email</th>
           <th>
-						Seen
-						<tip>Time since user was seen using Grafana</tip>
-					</th>
-          <th></th>
+            Seen
+            <tip>Time since user was seen using Grafana</tip>
+          </th>
           <th></th>
+          <th style="width: 1%"></th>
         </tr>
       </thead>
       <tbody>
         <tr ng-repeat="user in ctrl.users">
-					<td class="width-4 text-center">
-						<img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
-					</td>
-          <td>{{user.login}}</td>
-          <td>{{user.email}}</td>
-          <td>
-						{{user.lastSeenAtAge}}
-					</td>
-          <td>
-						<i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
-					</td>
-          <td class="text-right">
-            <a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
-              <i class="fa fa-edit"></i>
-              Edit
+          <td class="width-4 text-center link-td">
+            <a href="admin/users/edit/{{user.id}}">
+              <img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
             </a>
-            &nbsp;&nbsp;
+          </td>
+          <td class="link-td">
+            <a href="admin/users/edit/{{user.id}}">
+              {{user.login}}
+            </a>
+          </td>
+          <td class="link-td">
+            <a href="admin/users/edit/{{user.id}}">
+              {{user.email}}
+            </a>
+          </td>
+          <td class="link-td">
+            <a href="admin/users/edit/{{user.id}}">
+              {{user.lastSeenAtAge}}
+            </a>
+          </td>
+          <td class="link-td">
+            <a href="admin/users/edit/{{user.id}}">
+              <i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
+            </a>
+          </td>
+          <td class="text-right">
             <a ng-click="ctrl.deleteUser(user)" class="btn btn-danger btn-small">
               <i class="fa fa-remove"></i>
             </a>
@@ -60,10 +69,7 @@
   <div class="admin-list-paging" ng-if="ctrl.showPaging">
     <ol>
       <li ng-repeat="page in ctrl.pages">
-        <button
-          class="btn btn-small"
-          ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}"
-          ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
+        <button class="btn btn-small" ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}" ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
       </li>
     </ol>
   </div>