From 2e42a635f9958917da4fb1292d184fbd25e2c8f9 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Fri, 10 Mar 2017 17:37:04 +0100
Subject: [PATCH] rm items wrapper panel, mv action buttons to beginning
---
.../app/directives/edit/panelContent.js | 18 ++++++---
.../reports/app/directives/edit/panelItems.js | 37 ++++---------------
.../reports/app/directives/edit/plotItem.js | 1 -
.../reports/app/directives/edit/tableItem.js | 27 +++++++-------
.../reports/app/directives/edit/textItem.js | 14 +++----
5 files changed, 39 insertions(+), 58 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelContent.js b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
index 9b5090d03..589c2c6fd 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelContent.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
@@ -67,11 +67,6 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
</span>
</span>
</form>
- <div
- group-add-items-menu
- class="btn-group" role="group" role='tab'
- group='group'>
- </div>
<div class='btn-group action-buttons'>
<span
ng-click='deleteGroup(group.name)'
@@ -85,6 +80,11 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
<i class='fa fa-arrows fa-lg'></i>
</span>
</div>
+ <div
+ group-add-items-menu
+ class="btn-group" role="group" role='tab'
+ group='group'>
+ </div>
</h4>
</div>
<div id="collapse-{{group.name}}"
@@ -93,7 +93,13 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
aria-labelledby="{{group.name}}-heading">
<div class="panel-body panel-group">
<div group-panel-experiments group='group' class='panel panel-default'></div>
- <div ng-if='group.experiments.length > 0' group-panel-items group='group' class='panel panel-default'></div>
+ <div
+ style='margin-top: 5px;'
+ ng-if='group.experiments.length > 0'
+ group-panel-items
+ group='group'
+ >
+ </div>
</div>
</div>
`
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelItems.js b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
index 4ad633fee..0f446ed82 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelItems.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
@@ -36,35 +36,14 @@ angular.module('reportApp').directive("groupPanelItems", [function(){
};
},
template: `
-<div id="{{group.name}}-itemlist-heading" class="panel-heading" role="tab">
- <h4 class="panel-title">
- <a
- class=''
- role="button"
- data-toggle="collapse"
- data-parent="#{{group.name}}-itemlist-heading"
- href="#collapse-{{group.name}}-itemlist"
- aria-expanded="true"
- aria-controls="collapse-{{group.name}}-itemlist">
- Items
- </a>
- </h4>
-</div>
-<div id="collapse-{{group.name}}-itemlist"
- class="panel-collapse collapse in"
- role="tabpanel"
- aria-labelledby="{{group.name}}-itemlist-heading">
- <div class="panel-body">
- <div ui-sortable='sortableOptions' ng-model='group._reportItems' class='panel-group'>
- <div
- group-item-container
- ng-repeat='item in group.reportItems'
- group='group'
- report-item='item'
- style='margin-bottom: 5px;'
- >
- </div>
- </div>
+<div ui-sortable='sortableOptions' ng-model='group._reportItems'>
+ <div
+ group-item-container
+ ng-repeat='item in group.reportItems'
+ group='group'
+ report-item='item'
+ style='margin-bottom: 5px;'
+ >
</div>
</div>
`
diff --git a/beat/web/reports/static/reports/app/directives/edit/plotItem.js b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
index 2d9ecc437..cdc7343f7 100644
--- a/beat/web/reports/static/reports/app/directives/edit/plotItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
@@ -48,7 +48,6 @@ angular.module('reportApp')
aria-expanded="true"
aria-controls="collapse-{{domId}}">
</a>
-
<div class='btn-group action-buttons'>
<span
ng-click='group.removeReportItem(id)'
diff --git a/beat/web/reports/static/reports/app/directives/edit/tableItem.js b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
index 2147b6b15..69a4fa74a 100644
--- a/beat/web/reports/static/reports/app/directives/edit/tableItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
@@ -180,7 +180,19 @@ angular.module('reportApp')
aria-expanded="true"
aria-controls="collapse-{{domId}}">
</a>
-
+ <div class='btn-group action-buttons'>
+ <span
+ ng-click='group.removeReportItem(id)'
+ class="btn btn-default btn-delete"
+ data-toggle="tooltip" data-placement="top" title="Delete Table">
+ <i class="fa fa-times fa-lg"></i>
+ </span>
+ <span
+ class='btn btn-default drag-handle'
+ data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
+ <i class='fa fa-arrows fa-lg'></i>
+ </span>
+ </div>
<div class="btn-group" role="group" role='tab'>
<div class="btn-group" role="group"
group-table-field-selector
@@ -205,19 +217,6 @@ angular.module('reportApp')
Toggle CSV View
</button>
</div>
- <div class='btn-group action-buttons'>
- <span
- ng-click='group.removeReportItem(id)'
- class="btn btn-default btn-delete"
- data-toggle="tooltip" data-placement="top" title="Delete Table">
- <i class="fa fa-times fa-lg"></i>
- </span>
- <span
- class='btn btn-default drag-handle'
- data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
- <i class='fa fa-arrows fa-lg'></i>
- </span>
- </div>
</h4>
</div>
<div id="collapse-{{domId}}"
diff --git a/beat/web/reports/static/reports/app/directives/edit/textItem.js b/beat/web/reports/static/reports/app/directives/edit/textItem.js
index bb55aae5d..c5b0df8d3 100644
--- a/beat/web/reports/static/reports/app/directives/edit/textItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/textItem.js
@@ -91,14 +91,6 @@ angular.module('reportApp')
aria-expanded="true"
aria-controls="collapse-{{domId}}">
</a>
-
- <div class="btn-group" role="group" role='tab'>
- <!-- dont show split view, just toggle between html/rst view !-->
- <button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
- Toggle View
- </button>
- </div>
-
<div class='btn-group action-buttons'>
<span
ng-click='group.removeReportItem(item.id)'
@@ -112,6 +104,12 @@ angular.module('reportApp')
<i class='fa fa-arrows fa-lg'></i>
</span>
</div>
+ <div class="btn-group" role="group" role='tab'>
+ <!-- dont show split view, just toggle between html/rst view !-->
+ <button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
+ Toggle View
+ </button>
+ </div>
</h4>
</div>
<div id="collapse-{{domId}}"
--
GitLab