From 6f140dfbd9e40bab7a912a8af4826f884c08e6e1 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Fri, 10 Mar 2017 16:54:07 +0100
Subject: [PATCH] mv group directives to folder, add basic drag handle button
---
.../addGroupMenu.js} | 0
.../addItemsMenu.js} | 0
.../itemContainer.js} | 0
.../{groupsLayout.js => edit/layout.js} | 2 +-
.../panelContent.js} | 5 +++-
.../panelExperiments.js} | 0
.../panelItems.js} | 2 +-
.../{groupPlotItem.js => edit/plotItem.js} | 6 ++++-
.../tableFieldSelector.js} | 0
.../{groupTableItem.js => edit/tableItem.js} | 6 ++++-
.../{groupTextItem.js => edit/textItem.js} | 6 ++++-
.../viewSerialized.js} | 0
.../web/reports/templates/reports/report.html | 24 +++++++++----------
13 files changed, 33 insertions(+), 18 deletions(-)
rename beat/web/reports/static/reports/app/directives/{groupAddGroupMenu.js => edit/addGroupMenu.js} (100%)
rename beat/web/reports/static/reports/app/directives/{groupAddItemsMenu.js => edit/addItemsMenu.js} (100%)
rename beat/web/reports/static/reports/app/directives/{groupItemContainer.js => edit/itemContainer.js} (100%)
rename beat/web/reports/static/reports/app/directives/{groupsLayout.js => edit/layout.js} (96%)
rename beat/web/reports/static/reports/app/directives/{groupPanelContent.js => edit/panelContent.js} (94%)
rename beat/web/reports/static/reports/app/directives/{groupPanelExperiments.js => edit/panelExperiments.js} (100%)
rename beat/web/reports/static/reports/app/directives/{groupPanelItems.js => edit/panelItems.js} (97%)
rename beat/web/reports/static/reports/app/directives/{groupPlotItem.js => edit/plotItem.js} (93%)
rename beat/web/reports/static/reports/app/directives/{groupTableFieldSelector.js => edit/tableFieldSelector.js} (100%)
rename beat/web/reports/static/reports/app/directives/{groupTableItem.js => edit/tableItem.js} (97%)
rename beat/web/reports/static/reports/app/directives/{groupTextItem.js => edit/textItem.js} (96%)
rename beat/web/reports/static/reports/app/directives/{groupViewSerialized.js => edit/viewSerialized.js} (100%)
diff --git a/beat/web/reports/static/reports/app/directives/groupAddGroupMenu.js b/beat/web/reports/static/reports/app/directives/edit/addGroupMenu.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupAddGroupMenu.js
rename to beat/web/reports/static/reports/app/directives/edit/addGroupMenu.js
diff --git a/beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js
rename to beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
diff --git a/beat/web/reports/static/reports/app/directives/groupItemContainer.js b/beat/web/reports/static/reports/app/directives/edit/itemContainer.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupItemContainer.js
rename to beat/web/reports/static/reports/app/directives/edit/itemContainer.js
diff --git a/beat/web/reports/static/reports/app/directives/groupsLayout.js b/beat/web/reports/static/reports/app/directives/edit/layout.js
similarity index 96%
rename from beat/web/reports/static/reports/app/directives/groupsLayout.js
rename to beat/web/reports/static/reports/app/directives/edit/layout.js
index 2e6af026f..a9182b6a1 100644
--- a/beat/web/reports/static/reports/app/directives/groupsLayout.js
+++ b/beat/web/reports/static/reports/app/directives/edit/layout.js
@@ -35,7 +35,7 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function
scope.groups = GroupsService.groups;
scope.GroupsService = GroupsService;
scope.sortableOptions = {
- handle: '> .panel-heading'
+ handle: '> .panel-heading > .panel-title > .drag-handle'
};
},
template: `
diff --git a/beat/web/reports/static/reports/app/directives/groupPanelContent.js b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
similarity index 94%
rename from beat/web/reports/static/reports/app/directives/groupPanelContent.js
rename to beat/web/reports/static/reports/app/directives/edit/panelContent.js
index d088c7c1a..7ad60891e 100644
--- a/beat/web/reports/static/reports/app/directives/groupPanelContent.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
@@ -39,7 +39,7 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
};
},
template: `
-<div id="{{group.name}}-heading" class="panel-heading" role="tab" style='cursor: grab;'>
+<div id="{{group.name}}-heading" class="panel-heading" role="tab">
<h4 class="panel-title">
<a
class=''
@@ -70,6 +70,9 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
<div class='btn-group'>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='deleteGroup(group.name)'>Delete Group</button>
</div>
+ <span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order groups'>
+ <i class='fa fa-arrows'></i>
+ </span>
</h4>
</div>
<div id="collapse-{{group.name}}"
diff --git a/beat/web/reports/static/reports/app/directives/groupPanelExperiments.js b/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupPanelExperiments.js
rename to beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
diff --git a/beat/web/reports/static/reports/app/directives/groupPanelItems.js b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
similarity index 97%
rename from beat/web/reports/static/reports/app/directives/groupPanelItems.js
rename to beat/web/reports/static/reports/app/directives/edit/panelItems.js
index 469c7fe9f..d1c024469 100644
--- a/beat/web/reports/static/reports/app/directives/groupPanelItems.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
@@ -32,7 +32,7 @@ angular.module('reportApp').directive("groupPanelItems", [function(){
},
link: function(scope){
scope.sortableOptions = {
- handle: '.panel-heading'
+ handle: '.panel-heading > .panel-title > .drag-handle'
};
},
template: `
diff --git a/beat/web/reports/static/reports/app/directives/groupPlotItem.js b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
similarity index 93%
rename from beat/web/reports/static/reports/app/directives/groupPlotItem.js
rename to beat/web/reports/static/reports/app/directives/edit/plotItem.js
index 2a08495e6..e1c35e52d 100644
--- a/beat/web/reports/static/reports/app/directives/groupPlotItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
@@ -63,7 +63,11 @@ angular.module('reportApp')
</div>
<button class='btn btn-danger' ng-click='group.removeReportItem(id)'>
Delete Plot
- </button
+ </button>
+
+ <span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
+ <i class='fa fa-arrows'></i>
+ </span>
</h4>
</div>
<div id="collapse-{{domId}}"
diff --git a/beat/web/reports/static/reports/app/directives/groupTableFieldSelector.js b/beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupTableFieldSelector.js
rename to beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js
diff --git a/beat/web/reports/static/reports/app/directives/groupTableItem.js b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
similarity index 97%
rename from beat/web/reports/static/reports/app/directives/groupTableItem.js
rename to beat/web/reports/static/reports/app/directives/edit/tableItem.js
index 242394089..3e1eab9de 100644
--- a/beat/web/reports/static/reports/app/directives/groupTableItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
@@ -213,7 +213,11 @@ angular.module('reportApp')
</div>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(id)'>
Delete Table
- </button
+ </button>
+
+ <span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
+ <i class='fa fa-arrows'></i>
+ </span>
</h4>
</div>
<div id="collapse-{{domId}}"
diff --git a/beat/web/reports/static/reports/app/directives/groupTextItem.js b/beat/web/reports/static/reports/app/directives/edit/textItem.js
similarity index 96%
rename from beat/web/reports/static/reports/app/directives/groupTextItem.js
rename to beat/web/reports/static/reports/app/directives/edit/textItem.js
index d74023bb4..cdce2cc6f 100644
--- a/beat/web/reports/static/reports/app/directives/groupTextItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/textItem.js
@@ -109,7 +109,11 @@ angular.module('reportApp')
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(item.id)'>
Delete Text Block
- </button
+ </button>
+
+ <span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
+ <i class='fa fa-arrows'></i>
+ </span>
</h4>
</div>
<div id="collapse-{{domId}}"
diff --git a/beat/web/reports/static/reports/app/directives/groupViewSerialized.js b/beat/web/reports/static/reports/app/directives/edit/viewSerialized.js
similarity index 100%
rename from beat/web/reports/static/reports/app/directives/groupViewSerialized.js
rename to beat/web/reports/static/reports/app/directives/edit/viewSerialized.js
diff --git a/beat/web/reports/templates/reports/report.html b/beat/web/reports/templates/reports/report.html
index 5db191516..2a4119abe 100644
--- a/beat/web/reports/templates/reports/report.html
+++ b/beat/web/reports/templates/reports/report.html
@@ -107,19 +107,19 @@
<script src="{% fingerprint "reports/app/directives/tableDynamic.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "reports/app/directives/tablePrecision.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "reports/app/directives/theColumn.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupsLayout.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupPanelContent.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupPanelExperiments.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupPanelItems.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupAddItemsMenu.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupItemContainer.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupTableItem.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupPlotItem.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupTextItem.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupTableFieldSelector.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupViewSerialized.js" %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% fingerprint "reports/app/directives/groupAddGroupMenu.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/addGroupMenu.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/addItemsMenu.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/itemContainer.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/layout.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/panelContent.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/panelExperiments.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/panelItems.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/plotItem.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/tableFieldSelector.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/tableItem.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/textItem.js" %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% fingerprint "reports/app/directives/edit/viewSerialized.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "ui/js/smartselector.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "ui/js/multipleselector.js" %}" type="text/javascript" charset="utf-8"></script>
--
GitLab