Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Changed buttons in patiens & appointments Idex #459

Merged
merged 3 commits into from May 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/appointments/item/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
<td>{{appointment.provider}}</td>
<td class="appointment-status">{{appointment.displayStatus}}</td>
<td>

{{#if canEdit}}
<button class="btn btn-default neutral" {{action 'editAppointment' appointment bubbles=false }}>{{t 'labels.edit'}}</button>
{{/if}}
{{#if canAddVisit}}
<button class="btn btn-default" {{action 'createVisit' appointment bubbles=false }}>{{t 'buttons.add_visit'}}</button>
{{/if}}
{{#if canEdit}}
<button class="btn btn-default" {{action 'editAppointment' appointment bubbles=false }}>{{t 'labels.edit'}}</button>
{{/if}}
{{#if canDelete}}
<button class="btn btn-default" {{action 'deleteItem' appointment bubbles=false }}>{{t 'buttons.delete'}}</button>
{{/if}}
<button class="btn btn-default warning" {{action 'deleteItem' appointment bubbles=false }}><span class="octicon octicon-x"></span> Delete</button>
{{/if}}
</td>
</tr>
2 changes: 1 addition & 1 deletion app/patients/index/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{{/if}}
{{#unless patient.admitted}}
{{#if canAdmitPatient}}
<button class="btn btn-default success" {{action 'admitPatient' patient bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> Admit</button>
<button class="btn btn-default success admit" {{action 'admitPatient' patient bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> Admit</button>
{{/if}}
{{/unless}}
{{#if patient.admitted}}
Expand Down
4 changes: 4 additions & 0 deletions app/styles/_bootstrap-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
&:focus { opacity: .8; }
}

&.admit {
width: 103px;
}

.octicon {
position: relative;
left: -3px;
Expand Down