Skip to content

Commit

Permalink
#609 Reorder case actions list
Browse files Browse the repository at this point in the history
  • Loading branch information
@nadouani
nadouani committed Jul 19, 2018
1 parent bc44372 commit 8bbf148
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 33 deletions.
65 changes: 35 additions & 30 deletions ui/app/views/partials/case/case.panelinfo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,71 +37,76 @@ <h3 class="box-title">
</span>

<!-- Right side -->
<span class="ml-xs pull-right" ng-if="isAdmin(currentUser)">
<a href ng-click="removeCase()" class="text-danger noline" uib-tooltip="Permanently Remove case">
<i class="text-danger fa fa-times"></i>
Remove
<span class="ml-xxs pull-right" uib-dropdown ng-if="appConfig.connectors.cortex.enabled">
<span class="mr-xxs text-primary">|</span>

<a href class="text-primary noline" ng-click="getCaseResponders(true)" uib-dropdown-toggle>
<i class="text-primary fa fa-cog"></i>
Responders
<i class="text-primary fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li ng-if="caseResponders && caseResponders.length === 0">
<a href ng-click="getCaseResponders(true)">
<strong><i class="fa fa-refresh mr-xxs"></i> No responders available</strong>
</a>
</li>
<li ng-repeat="responder in caseResponders">
<a href ng-click="runResponder(responder.id)">
<strong>{{responder.name}}</strong>
<br>
<small>{{responder.description}}</small></a>
</li>
</ul>
</span>

<span class="ml-xs pull-right" ng-if="appConfig.connectors.misp.enabled">
<span class="ml-xxs pull-right" ng-if="appConfig.connectors.misp.enabled">
<span class="mr-xxs text-primary">|</span>
<a href ng-click="shareCase()" class="text-primary noline" uib-tooltip="Share case">
<i class="text-primary fa fa-share"></i>
Share ({{existingExports}})
</a>
</span>

<span class="ml-xs pull-right">
<span class="ml-xxs pull-right" ng-if="isAdmin(currentUser)">
<a href ng-click="removeCase()" class="text-danger noline" uib-tooltip="Permanently Remove case">
<i class="text-danger fa fa-times"></i>
Remove
</a>
</span>

<span class="ml-xxs pull-right">
<a href ng-click="mergeCase()" class="text-primary noline" uib-tooltip="Merge case">
<i class="text-primary fa fa-compress"></i>
Merge
</a>
</span>

<span class="ml-xs pull-right" ng-if="!caze.flag || caze.flag == undefined">
<span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
<a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">
<i class="text-muted fa fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'"></i>
Flag
</a>
</span>
<span class="ml-xs pull-right" ng-if="caze.flag">
<span class="ml-xxs pull-right" ng-if="caze.flag">
<a href ng-click="switchFlag()" class="text-yellow noline" uib-tooltip="Unflag case">
<i class="text-yellow fa fa-flag" ng-show="caze.flag"></i>
Unflag
</a>
</span>
<span class="ml-xs pull-right" ng-hide="isCaseClosed()">
<span class="ml-xxs pull-right" ng-hide="isCaseClosed()">
<a href ng-click="openCloseDialog()" class="text-muted noline" uib-tooltip="Close case">
<i class="text-muted fa fa-check-circle-o" ng-class="CloseCase" ng-mouseout="CloseCase='text-muted glyphicon-ok-circle'" ng-mouseover="CloseCase='text-success glyphicon-ok-sign'"></i>
Close
</a>
</span>
<span class="ml-xs pull-right" ng-show="isCaseClosed()">
<span class="ml-xxs pull-right" ng-show="isCaseClosed()">
<a href ng-click="reopenCase()" class="text-success noline" uib-tooltip="Reopen case">
<i class="text-success fa fa-check-circle"></i>
Reopen
</a>
</span>
<span class="ml-xs pull-right" uib-dropdown ng-if="appConfig.connectors.cortex.enabled">
<a href class="text-primary noline" ng-click="getCaseResponders(true)" uib-dropdown-toggle>
<i class="text-primary fa fa-cog"></i>
Responders
<i class="text-primary fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li ng-if="caseResponders && caseResponders.length === 0">
<a href ng-click="getCaseResponders(true)">
<strong><i class="fa fa-refresh mr-xxs"></i> No responders available</strong>
</a>
</li>
<li ng-repeat="responder in caseResponders">
<a href ng-click="runResponder(responder.id)">
<strong>{{responder.name}}</strong>
<br>
<small>{{responder.description}}</small></a>
</li>
</ul>
</span>

</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions ui/app/views/partials/case/case.tasks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="btn-group">
<button class="btn btn-sm btn-primary" ng-click="state.showGrouped = !state.showGrouped">
<i class="glyphicon glyphicon-th-list"></i>
{{state.showGrouped ? 'Group' : 'List'}} Tasks
Show {{state.showGrouped ? 'as a List' : 'Groups'}}
</button>
</div>

Expand Down Expand Up @@ -151,12 +151,12 @@

<div class="row mt-l" ng-show="state.showGrouped && tasks.total !== 0">
<div class="col-md-12">
<div class="panel panel-info" ng-repeat="group in groupedTasks">
<div class="panel panel-default" ng-repeat="group in groupedTasks">
<div class="panel-heading">
<strong>{{group.group || 'Not Specified'}}</strong> <small>({{group.tasks.length}} task(s))</small>
</div>
<div class="panel-body p-0">
<table class="table table-striped table-hover valigned">
<table class="table table-hover valigned">
<thead>
<tr>
<th style="width: 40px"></th>
Expand Down

0 comments on commit 8bbf148

Please sign in to comment.