diff --git a/beat/web/reports/static/reports/app/directives/view/plotItem.js b/beat/web/reports/static/reports/app/directives/view/plotItem.js index 2e155ad7f78093c34874dd706a85ad97e0a00555..6b9d1cc7f948fabffb0fa68ef6b8989316cb25db 100644 --- a/beat/web/reports/static/reports/app/directives/view/plotItem.js +++ b/beat/web/reports/static/reports/app/directives/view/plotItem.js @@ -37,28 +37,9 @@ angular.module('reportApp') scope.domId = `${scope.group.name}_${scope.id}`; }, template: ` -<div id="{{domId}}-heading" class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a - class='' - role="button" - data-toggle="collapse" - data-parent="#{{domId}}-heading" - href="#collapse-{{domId}}" - aria-expanded="true" - aria-controls="collapse-{{domId}}"> - - </a> - </h4> -</div> -<div id="collapse-{{domId}}" - class="panel-collapse collapse in" - role="tabpanel" - aria-labelledby="{{domId}}-heading"> - <div class='panel-body'> - <p>{{ id }} content</p> - <strong class='text-danger'>Plot items in reports are not implemented yet.</strong> - </div> +<div class='panel-body'> + <p>{{ id }} content</p> + <strong class='text-danger'>Plot items in reports are not implemented yet.</strong> </div> ` }; diff --git a/beat/web/reports/static/reports/app/directives/view/tableItem.js b/beat/web/reports/static/reports/app/directives/view/tableItem.js index bed05cf76f5e2c06c9a8e9fcd75bec83292de2a9..28aa3c9e58e4bdeb9dc003f085887c33d279b26a 100644 --- a/beat/web/reports/static/reports/app/directives/view/tableItem.js +++ b/beat/web/reports/static/reports/app/directives/view/tableItem.js @@ -153,59 +153,51 @@ angular.module('reportApp') }; }, template: ` -<div id="{{domId}}-heading" class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a - class='' - role="button" - data-toggle="collapse" - data-parent="#{{domId}}-heading" - href="#collapse-{{domId}}" - aria-expanded="true" - aria-controls="collapse-{{domId}}"> - </a> - <div class="btn-group" role="group" role='tab'> - <button class='btn btn-default' ng-click='toggleViewingCSV()'> - Toggle CSV View - </button> +<div class='panel-body'> + <div class='row'> + <div class='col-sm-12'> + <div class="btn-group" role="group" role='tab'> + <button class='btn btn-default' ng-click='toggleViewingCSV()'> + Toggle CSV View + </button> + </div> </div> - </h4> -</div> -<div id="collapse-{{domId}}" - class="panel-collapse collapse in" - role="tabpanel" - aria-labelledby="{{domId}}-heading"> - <div ng-if='isViewingCSV.val' class='panel-body'> - <pre>{{ getCSV() }}</pre> </div> - <div ng-if='!isViewingCSV.val' class='panel-body' style='height: 100%; overflow-x: auto;'> - <table class="table table-striped table-hover"> - <thead> - <tr> - <th ng-repeat='field in fields'> - <span - ng-if="sortField.val == field" - class='glyphicon' - ng-class="{ - 'glyphicon-chevron-up': sortField.isReversed, - 'glyphicon-chevron-down': !sortField.isReversed - }" - > - </span> - <a role='button' ng-click='setSortField(field)'> - {{ field }} <i>({{ getFieldType(field) }})</i> - </a> - </th> - </tr> - </thead> - <tbody> - <tr ng-repeat="exp in group.experiments | orderBy:sortFunc:sortField.isReversed"> - <td ng-repeat='field in fields'> - {{ getFieldVal(exp, field) }} - </td> - </tr> - </tbody> - </table> + <div class='row' style='margin-top: 5px;'> + <div class='col-sm-12'> + <div ng-if='isViewingCSV.val'> + <pre>{{ getCSV() }}</pre> + </div> + <div ng-if='!isViewingCSV.val' style='height: 100%; overflow-x: auto;'> + <table class="table table-striped table-hover"> + <thead> + <tr> + <th ng-repeat='field in fields'> + <span + ng-if="sortField.val == field" + class='glyphicon' + ng-class="{ + 'glyphicon-chevron-up': sortField.isReversed, + 'glyphicon-chevron-down': !sortField.isReversed + }" + > + </span> + <a role='button' ng-click='setSortField(field)'> + {{ field }} <i>({{ getFieldType(field) }})</i> + </a> + </th> + </tr> + </thead> + <tbody> + <tr ng-repeat="exp in group.experiments | orderBy:sortFunc:sortField.isReversed"> + <td ng-repeat='field in fields'> + {{ getFieldVal(exp, field) }} + </td> + </tr> + </tbody> + </table> + </div> + </div> </div> </div> `