Added panelMeta object for extra panel details, moved add panel button, tweaked editors

partials/roweditor.html

@@ -2,7 +2,7 @@
   <div class="pull-right editor-title">Row settings</div>
 
   <div ng-model="editor.index" bs-tabs>
-    <div ng-repeat="tab in ['General','Panels']" data-title="{{tab}}">
+    <div ng-repeat="tab in ['General','Panels','Add Panel']" data-title="{{tab}}">
     </div>
   </div>
 
@@ -20,18 +20,6 @@
       <label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable" />
     </div>
   </div>
-  <div class="row-fluid" ng-show="editor.index == 1">
-    <h4>New Panel</h4>
-    <form class="input-append">
-    <select class="input-medium input-append" ng-model="panel.type" ng-options="f for f in config.modules|stringSort"></select>
-    <small ng-show="!panel.type">Select Type</small> <button ng-show="panel.type" ng-click="add_panel(row,panel); reset_panel();" class="btn btn-success ">Add <i class="icon-plus"></i></button></form>
-
-    <div ng-show="!(_.isUndefined(panel.type))">
-      <div ng-include src="'partials/panelgeneral.html'"></div>
-
-      <div add-panel="{{panel.type}}"></div>
-    </div>
-  </div>
   <div class="row-fluid" ng-show="editor.index == 1">
     <div class="span12">
       <h4>Panels</h4>
@@ -57,7 +45,18 @@
       </table>
     </div>
   </div>
+  <div class="row-fluid" ng-show="editor.index == 2">
+    <h4>Select Panel Type</h4>
+    <form class="input-append">
+    <select class="input-medium input-append" ng-model="panel.type" ng-options="f for f in config.modules|stringSort"></select>
+    <small ng-show="!panel.type">Select Type</small></form>
+
+    <div ng-show="!(_.isUndefined(panel.type))">
+      <div add-panel="{{panel.type}}"></div>
+    </div>
+  </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-success" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
+  <button ng-show="panel.type && editor.index == 2" ng-click="add_panel(row,panel); reset_panel(); editor.index == 1;" class="btn btn-success ">Add Panel</button>
+  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
 </div>