Merge branch 'master' of github.com:grafana/grafana

public/app/features/dashboard/rowCtrl.js

@@ -55,9 +55,40 @@ function (angular, _, config) {
     $scope.move_row = function(direction) {
     $scope.move_row = function(direction) {
       var rowsList = $scope.dashboard.rows;
       var rowsList = $scope.dashboard.rows;
       var rowIndex = _.indexOf(rowsList, $scope.row);
       var rowIndex = _.indexOf(rowsList, $scope.row);
-      var newIndex = rowIndex + direction;
+      var newIndex = rowIndex;
+      switch(direction) {
+        case 'up': {
+          newIndex = rowIndex - 1;
+          break;
+        }
+        case 'down': {
+          newIndex = rowIndex + 1;
+          break;
+        }
+        case 'top': {
+          newIndex = 0;
+          break;
+        }
+        case 'bottom': {
+          newIndex = rowsList.length - 1;
+          break;
+        }
+        default: {
+          newIndex = rowIndex;
+        }
+      }
+      if (newIndex >= 0 && newIndex <= (rowsList.length - 1)) {
+        _.move(rowsList, rowIndex, newIndex);
+      }
+    };
+
+    $scope.insert_row = function(direction) {
+      var rowsList = $scope.dashboard.rows;
+      var currentRowIndex = _.indexOf(rowsList, $scope.row);
+      $scope.add_row_default();
+      var newIndex = currentRowIndex + direction;
       if (newIndex >= 0 && newIndex <= (rowsList.length - 1)) {
       if (newIndex >= 0 && newIndex <= (rowsList.length - 1)) {
-        _.move(rowsList, rowIndex, rowIndex + direction);
+        _.move(rowsList, rowsList.length - 1, newIndex);
       }
       }
     };
     };
 
 

public/app/partials/dashboard.html

@@ -60,13 +60,22 @@
 								<li class="dropdown-submenu">
 								<li class="dropdown-submenu">
 									<a href="javascript:void(0);">Move</a>
 									<a href="javascript:void(0);">Move</a>
 									<ul class="dropdown-menu">
 									<ul class="dropdown-menu">
-										<li><a ng-click="move_row(-1)">Up</a></li>
-										<li><a ng-click="move_row(1)">Down</a></li>
+										<li><a ng-click="move_row('up')">Up</a></li>
+										<li><a ng-click="move_row('down')">Down</a></li>
+                    <li><a ng-click="move_row('top')">To top</a></li>
+                    <li><a ng-click="move_row('bottom')">To Bottom</a></li>
 									</ul>
 									</ul>
 								</li>
 								</li>
 								<li>
 								<li>
 									<a dash-editor-link="app/partials/roweditor.html">Row editor</a>
 									<a dash-editor-link="app/partials/roweditor.html">Row editor</a>
 								</li>
 								</li>
+                <li class="dropdown-submenu">
+                  <a href="javascript:void(0);">Insert Row</a>
+                  <ul class="dropdown-menu">
+                    <li><a ng-click="insert_row(0)">Above</a></li>
+                    <li><a ng-click="insert_row(1)">Below</a></li>
+                  </ul>
+                </li>
 								<li>
 								<li>
 									<a ng-click="delete_row()">Delete row</a>
 									<a ng-click="delete_row()">Delete row</a>
 								</li>
 								</li>