Skip to content
Snippets Groups Projects
Commit 6f140dfb authored by Jaden Diefenbaugh's avatar Jaden Diefenbaugh
Browse files

mv group directives to folder, add basic drag handle button

parent 387737f9
No related branches found
No related tags found
1 merge request!223Reports overhaul
Showing
with 33 additions and 18 deletions
...@@ -35,7 +35,7 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function ...@@ -35,7 +35,7 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function
scope.groups = GroupsService.groups; scope.groups = GroupsService.groups;
scope.GroupsService = GroupsService; scope.GroupsService = GroupsService;
scope.sortableOptions = { scope.sortableOptions = {
handle: '> .panel-heading' handle: '> .panel-heading > .panel-title > .drag-handle'
}; };
}, },
template: ` template: `
......
...@@ -39,7 +39,7 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun ...@@ -39,7 +39,7 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
}; };
}, },
template: ` 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"> <h4 class="panel-title">
<a <a
class='' class=''
...@@ -70,6 +70,9 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun ...@@ -70,6 +70,9 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
<div class='btn-group'> <div class='btn-group'>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='deleteGroup(group.name)'>Delete Group</button> <button ng-disabled='!isEditable' class='btn btn-danger' ng-click='deleteGroup(group.name)'>Delete Group</button>
</div> </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> </h4>
</div> </div>
<div id="collapse-{{group.name}}" <div id="collapse-{{group.name}}"
......
...@@ -32,7 +32,7 @@ angular.module('reportApp').directive("groupPanelItems", [function(){ ...@@ -32,7 +32,7 @@ angular.module('reportApp').directive("groupPanelItems", [function(){
}, },
link: function(scope){ link: function(scope){
scope.sortableOptions = { scope.sortableOptions = {
handle: '.panel-heading' handle: '.panel-heading > .panel-title > .drag-handle'
}; };
}, },
template: ` template: `
......
...@@ -63,7 +63,11 @@ angular.module('reportApp') ...@@ -63,7 +63,11 @@ angular.module('reportApp')
</div> </div>
<button class='btn btn-danger' ng-click='group.removeReportItem(id)'> <button class='btn btn-danger' ng-click='group.removeReportItem(id)'>
Delete Plot 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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <div id="collapse-{{domId}}"
......
...@@ -213,7 +213,11 @@ angular.module('reportApp') ...@@ -213,7 +213,11 @@ angular.module('reportApp')
</div> </div>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(id)'> <button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(id)'>
Delete Table 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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <div id="collapse-{{domId}}"
......
...@@ -109,7 +109,11 @@ angular.module('reportApp') ...@@ -109,7 +109,11 @@ angular.module('reportApp')
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(item.id)'> <button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(item.id)'>
Delete Text Block 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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <div id="collapse-{{domId}}"
......
...@@ -107,19 +107,19 @@ ...@@ -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/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/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/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/smartselector.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "ui/js/multipleselector.js" %}" type="text/javascript" charset="utf-8"></script> <script src="{% fingerprint "ui/js/multipleselector.js" %}" type="text/javascript" charset="utf-8"></script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment