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

rm items wrapper panel, mv action buttons to beginning

parent 7c454f9a
No related branches found
No related tags found
1 merge request!223Reports overhaul
......@@ -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>
`
......
......@@ -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>
`
......
......@@ -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)'
......
......@@ -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}}"
......
......@@ -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}}"
......
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