Skip to content

Commit

Permalink
#156 Rename the task "open" button to "reopen"
Browse files Browse the repository at this point in the history
  • Loading branch information
nadouani committed Jun 29, 2017
1 parent 06f28ad commit aafa14e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions ui/app/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -512,3 +512,8 @@ report:empty {
span.action-button {
font-size: 14px;
}

table tr td.task-actions span.action-button {
width: 60px;
display: inline-block;
}
12 changes: 6 additions & 6 deletions ui/app/views/partials/case/case.tasks.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<th>Task</th>
<th style="width: 240px">Date</th>
<th style="width: 200px">Assignee</th>
<th style="width: 200px"></th>
<th style="width: 200px" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
Expand All @@ -73,20 +73,20 @@
<em ng-show="!task.owner">Not assigned</em>
</td>
<!-- class="task-delete" -->
<td align="right">
<td align="right" class="task-actions">
<span class="ml-xs clickable text-danger task-delete" ng-click="removeTask(task)">
<i class="fa fa-times"></i>
Delete
</span>
<span class="ml-xs clickable text-success" ng-show="task.status == 'Completed'" ng-click="openTask(task)">
<span class="ml-xs clickable text-success action-button" ng-show="task.status == 'Completed'" ng-click="openTask(task)">
<i class="fa fa-check-circle"></i>
Open
Reopen
</span>
<span class="ml-xs clickable text-muted" ng-show="task.status == 'InProgress'" ng-click="closeTask(task)">
<span class="ml-xs clickable text-muted action-button" ng-show="task.status == 'InProgress'" ng-click="closeTask(task)">
<i class="fa fa-check-circle-o"></i>
Close
</span>
<span class="ml-xs clickable text-primary" ng-show="task.status == 'Waiting'" ng-click="startTask(task)">
<span class="ml-xs clickable text-primary action-button" ng-show="task.status == 'Waiting'" ng-click="startTask(task)">
<i class="fa fa-play"></i>
Start
</span>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/views/partials/case/case.tasks.item.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h4 class="mb-xs text-primary">

<a href ng-click="openTask(task)">
<span ng-show="task.status == 'Completed'" class="action-button text-success">
<i class="fa fa-check-circle"></i> Open
<i class="fa fa-check-circle"></i> Reopen
</span>
</a>

Expand Down

0 comments on commit aafa14e

Please sign in to comment.