Changed buttons in patiens & appointments Idex (#459)

* Changed buttons for patients and appointments index * Update _bootstrap-theme.scss
HospitalRun · May 13, 2016 · 84d1b20 · 84d1b20
1 parent 340d9f7
commit 84d1b20
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs
@@ -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>
diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs
@@ -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}}

diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
@@ -27,6 +27,10 @@
     &:focus { opacity: .8; }
   }
 
+  &.admit {
+    width: 103px;
+  }
+
   .octicon {
     position: relative;
     left: -3px;