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

more icons not text, draghandle button

parent af695f91
No related branches found
No related tags found
1 merge request!223Reports overhaul
...@@ -67,12 +67,24 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun ...@@ -67,12 +67,24 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
</span> </span>
</span> </span>
</form> </form>
<div class='btn-group'> <div
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='deleteGroup(group.name)'>Delete Group</button> 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)'
class="btn btn-default btn-delete"
data-toggle="tooltip" data-placement="top" title="Delete Group">
<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 groups'>
<i class='fa fa-arrows fa-lg'></i>
</span>
</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}}"
......
...@@ -90,9 +90,14 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService', ...@@ -90,9 +90,14 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService',
<tbody> <tbody>
<tr ng-repeat='expName in group.experiments'> <tr ng-repeat='expName in group.experiments'>
<td> <td>
<button ng-disabled='!isEditable' class="btn btn-danger" aria-hidden="true" ng-click='group.removeExperiment(expName)'> <div class='btn-group action-buttons'>
Remove <span
</button> ng-click='group.removeExperiment(expName)'
class="btn btn-default btn-delete"
data-toggle="tooltip" data-placement="top" title="Remove Experiment from Group">
<i class="fa fa-times fa-lg"></i>
</span>
</div>
</td> </td>
<td>{{ expName }}</td> <td>{{ expName }}</td>
<td><input ng-disabled='!isEditable' ng-model='group.aliases[expName]'></input></td> <td><input ng-disabled='!isEditable' ng-model='group.aliases[expName]'></input></td>
......
...@@ -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 > .panel-title > .drag-handle' handle: '.panel-heading > .panel-title > .action-buttons > .drag-handle'
}; };
}, },
template: ` template: `
...@@ -48,11 +48,6 @@ angular.module('reportApp').directive("groupPanelItems", [function(){ ...@@ -48,11 +48,6 @@ angular.module('reportApp').directive("groupPanelItems", [function(){
aria-controls="collapse-{{group.name}}-itemlist"> aria-controls="collapse-{{group.name}}-itemlist">
Items Items
</a> </a>
<div
group-add-items-menu
class="btn-group" role="group" role='tab'
group='group'
></div>
</h4> </h4>
</div> </div>
<div id="collapse-{{group.name}}-itemlist" <div id="collapse-{{group.name}}-itemlist"
......
...@@ -37,7 +37,7 @@ angular.module('reportApp') ...@@ -37,7 +37,7 @@ angular.module('reportApp')
scope.domId = `${scope.group.name}_${scope.id}`; scope.domId = `${scope.group.name}_${scope.id}`;
}, },
template: ` template: `
<div id="{{domId}}-heading" class="panel-heading" role="tab" style='cursor: grab;'> <div id="{{domId}}-heading" class="panel-heading" role="tab">
<h4 class="panel-title"> <h4 class="panel-title">
<a <a
class='' class=''
...@@ -55,19 +55,21 @@ angular.module('reportApp') ...@@ -55,19 +55,21 @@ angular.module('reportApp')
<!--<span class='glyphicon glyphicon-refresh'></span>!--> <!--<span class='glyphicon glyphicon-refresh'></span>!-->
Refresh Plot Refresh Plot
</button> </button>
<!--
<button class='btn btn-default' ng-click='showSerialized.val = !showSerialized.val'>
Toggle Serialize View
</button>
!-->
</div> </div>
<button class='btn btn-danger' ng-click='group.removeReportItem(id)'>
Delete Plot
</button>
<span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'> <div class='btn-group action-buttons'>
<i class='fa fa-arrows'></i> <span
</span> ng-click='group.removeReportItem(id)'
class="btn btn-default btn-delete"
data-toggle="tooltip" data-placement="top" title="Delete Plot">
<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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <div id="collapse-{{domId}}"
......
...@@ -169,7 +169,7 @@ angular.module('reportApp') ...@@ -169,7 +169,7 @@ angular.module('reportApp')
}; };
}, },
template: ` template: `
<div id="{{domId}}-heading" class="panel-heading" role="tab" style='cursor: grab;'> <div id="{{domId}}-heading" class="panel-heading" role="tab">
<h4 class="panel-title"> <h4 class="panel-title">
<a <a
class='' class=''
...@@ -205,19 +205,20 @@ angular.module('reportApp') ...@@ -205,19 +205,20 @@ angular.module('reportApp')
<button class='btn btn-default' ng-click='toggleViewingCSV()'> <button class='btn btn-default' ng-click='toggleViewingCSV()'>
Toggle CSV View Toggle CSV View
</button> </button>
<!--
<button ng-disabled='!isEditable' class='btn btn-default' ng-click='showSerialized.val = !showSerialized.val'>
Toggle CSV View
</button>
!-->
</div> </div>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(id)'> <div class='btn-group action-buttons'>
Delete Table <span
</button> ng-click='group.removeReportItem(id)'
class="btn btn-default btn-delete"
<span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'> data-toggle="tooltip" data-placement="top" title="Delete Table">
<i class='fa fa-arrows'></i> <i class="fa fa-times fa-lg"></i>
</span> </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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <div id="collapse-{{domId}}"
......
...@@ -80,7 +80,7 @@ angular.module('reportApp') ...@@ -80,7 +80,7 @@ angular.module('reportApp')
scope.compileContent(); scope.compileContent();
}, },
template: ` template: `
<div id="{{domId}}-heading" class="panel-heading" role="tab" style='cursor: grab;'> <div id="{{domId}}-heading" class="panel-heading" role="tab">
<h4 class="panel-title"> <h4 class="panel-title">
<a <a
class='' class=''
...@@ -100,20 +100,21 @@ angular.module('reportApp') ...@@ -100,20 +100,21 @@ angular.module('reportApp')
<button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'> <button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
Toggle View Toggle View
</button> </button>
<!-- dont show split view, just toggle between html/rst view
<button ng-disabled='!isEditable' class='btn btn-default' ng-click='showSerialized.val = !showSerialized.val'>
Toggle Compiled View
</button>
!-->
</div> </div>
<button ng-disabled='!isEditable' class='btn btn-danger' ng-click='group.removeReportItem(item.id)'> <div class='btn-group action-buttons'>
Delete Text Block <span
</button> ng-click='group.removeReportItem(item.id)'
class="btn btn-default btn-delete"
<span class='btn btn-default drag-handle' data-toggle='tooltip' data-placement='top' title='Drag to re-order item'> data-toggle="tooltip" data-placement="top" title="Delete Text Block">
<i class='fa fa-arrows'></i> <i class="fa fa-times fa-lg"></i>
</span> </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> </h4>
</div> </div>
<div id="collapse-{{domId}}" <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