From 71f9464a544042c5aeb3f808bbee716f88bfebf1 Mon Sep 17 00:00:00 2001 From: anisha1234 Date: Sat, 11 Mar 2017 00:25:34 +0530 Subject: [PATCH 1/2] ui button style change --- app/admin/custom-forms/edit/template.hbs | 4 +-- app/admin/loaddb/template.hbs | 2 +- app/admin/lookup/template.hbs | 4 +-- app/appointments/calendar/template.hbs | 2 +- app/appointments/item/template.hbs | 2 +- app/appointments/search/template.hbs | 2 +- app/appointments/theater/template.hbs | 2 +- app/inventory/edit/template.hbs | 2 +- app/inventory/listing/template.hbs | 4 +-- app/inventory/purchase/template.hbs | 43 ++++++++++++++++++++++++ app/inventory/reports/template.hbs | 2 +- app/invoices/index/template.hbs | 2 +- app/medication/index/template.hbs | 2 +- app/patients/index/template.hbs | 6 ++-- app/patients/outpatient/template.hbs | 2 +- app/patients/reports/template.hbs | 2 +- app/styles/_variables_mixins.scss | 4 +++ app/styles/components/_buttons.scss | 20 +++++++++-- app/users/index/template.hbs | 2 +- 19 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 app/inventory/purchase/template.hbs diff --git a/app/admin/custom-forms/edit/template.hbs b/app/admin/custom-forms/edit/template.hbs index 82506bb8b3..9c219024e6 100644 --- a/app/admin/custom-forms/edit/template.hbs +++ b/app/admin/custom-forms/edit/template.hbs @@ -10,7 +10,7 @@

{{t 'admin.customForms.titles.fields'}} -

@@ -56,7 +56,7 @@ {{t 'admin.customForms.buttons.preview'}} {{#if preview}} -
+

{{formName}}

diff --git a/app/admin/loaddb/template.hbs b/app/admin/loaddb/template.hbs index e3b8badc63..b0b1da62d0 100644 --- a/app/admin/loaddb/template.hbs +++ b/app/admin/loaddb/template.hbs @@ -2,7 +2,7 @@
{{#em-form model=model submitButton=false }} {{file-upload label=(t 'labels.fileToLoad') property="importFileName" selectedFile=importFile }} - + {{/em-form}} {{#if syncResults}}

{{t 'labels.fileLoadSuccessful'}}

diff --git a/app/admin/lookup/template.hbs b/app/admin/lookup/template.hbs index f12a53d346..387b8c9b9e 100644 --- a/app/admin/lookup/template.hbs +++ b/app/admin/lookup/template.hbs @@ -48,14 +48,14 @@
{{em-checkbox label=(t 'labels.userCanAddNewValue') property="userCanAdd"}} - +
{{#if showOrganizeByType}} {{em-checkbox label="Organize Pricing By Type" property="organizeByType" class="col-sm-4"}} {{/if}}
{{file-upload label=(t 'labels.importFile') property="importFileName" selectedFile=importFile }} - +
{{/em-form}} diff --git a/app/appointments/calendar/template.hbs b/app/appointments/calendar/template.hbs index 57e7182e3c..cd2777aa7b 100644 --- a/app/appointments/calendar/template.hbs +++ b/app/appointments/calendar/template.hbs @@ -26,7 +26,7 @@ {{/em-form}}
- +
{{calendar-control events=model.events defaultDate=calendarDate diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs index 75f630fdba..c4dd09d46e 100644 --- a/app/appointments/item/template.hbs +++ b/app/appointments/item/template.hbs @@ -13,7 +13,7 @@ {{/if}} {{#if canAddVisit}} {{#if (eq appointment.displayStatus 'Scheduled')}} - diff --git a/app/appointments/search/template.hbs b/app/appointments/search/template.hbs index aab4aa0090..731355bda2 100644 --- a/app/appointments/search/template.hbs +++ b/app/appointments/search/template.hbs @@ -17,7 +17,7 @@ {{/em-form}}
- +
diff --git a/app/appointments/theater/template.hbs b/app/appointments/theater/template.hbs index bf8d755263..269dffb121 100644 --- a/app/appointments/theater/template.hbs +++ b/app/appointments/theater/template.hbs @@ -21,7 +21,7 @@ {{/em-form}}
- +
{{calendar-control events=model.events defaultDate=calendarDate diff --git a/app/inventory/edit/template.hbs b/app/inventory/edit/template.hbs index 004969134d..56454f04f9 100644 --- a/app/inventory/edit/template.hbs +++ b/app/inventory/edit/template.hbs @@ -76,7 +76,7 @@ {{#if canAdjustLocation}} {{/if}} diff --git a/app/inventory/listing/template.hbs b/app/inventory/listing/template.hbs index 14dbb9fda6..1341fc14bf 100644 --- a/app/inventory/listing/template.hbs +++ b/app/inventory/listing/template.hbs @@ -21,7 +21,7 @@ {{/unless}} diff --git a/app/inventory/purchase/template.hbs b/app/inventory/purchase/template.hbs new file mode 100644 index 0000000000..1341fc14bf --- /dev/null +++ b/app/inventory/purchase/template.hbs @@ -0,0 +1,43 @@ +{{#item-listing paginationProps=paginationProps }} + {{#if hasRecords}} +
- +
{{inventory.crossReference}} {{#if canAddPurchase}} - + {{/if}} {{#if canAddItem}} @@ -29,7 +29,7 @@ {{#if canDeleteItem}} {{/if}} - {{#link-to 'inventory.barcode' inventory class="btn btn-default neutral" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}} + {{#link-to 'inventory.barcode' inventory class="btn btn-extra" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}}
+ + {{#sortable-column sortBy='friendlyId' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}} + {{#sortable-column sortBy='name' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.name'}}{{/sortable-column}} + {{#sortable-column sortBy='inventoryType' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}} + {{#sortable-column sortBy='quantity' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.quantity'}}{{/sortable-column}} + + {{#sortable-column sortBy='crossReference' sortDesc=sortDesc sortKey=sortKey }}{{t 'inventory.labels.xref'}}{{/sortable-column}} + + + {{#each model as |inventory|}} + {{#unless inventory.isNew}} + + + + + + + + + + {{/unless}} + {{/each}} +
{{t 'inventory.labels.location'}}{{t 'labels.actions'}}
{{inventory.friendlyId}}{{inventory.name}}{{inventory.inventoryType}}{{inventory.quantity}} {{inventory.distributionUnit}}{{inventory.displayLocations}}{{inventory.crossReference}} + {{#if canAddPurchase}} + + {{/if}} + {{#if canAddItem}} + + {{/if}} + {{#if canDeleteItem}} + + {{/if}} + {{#link-to 'inventory.barcode' inventory class="btn btn-extra" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}} +
+ {{else}} +
+

{{t 'messages.noItemsFound'}} {{#if canAddItem}} {{t 'messages.createNewRecord'}}{{/if}}

+
+ {{/if}} +{{/item-listing}} diff --git a/app/inventory/reports/template.hbs b/app/inventory/reports/template.hbs index e8dc8b5762..7e67c23bcf 100644 --- a/app/inventory/reports/template.hbs +++ b/app/inventory/reports/template.hbs @@ -79,7 +79,7 @@ {{/em-form}}
- +
{{#if showReportResults}} diff --git a/app/invoices/index/template.hbs b/app/invoices/index/template.hbs index d946016f4e..9e2714c8a2 100644 --- a/app/invoices/index/template.hbs +++ b/app/invoices/index/template.hbs @@ -24,7 +24,7 @@ {{#unless invoice.paidFlag}} {{#if showActions}} {{#if canAddPayment}} - {{/if}} diff --git a/app/medication/index/template.hbs b/app/medication/index/template.hbs index 744bae99aa..2c04bbdbc9 100644 --- a/app/medication/index/template.hbs +++ b/app/medication/index/template.hbs @@ -22,7 +22,7 @@ {{medicationRequest.status}} {{#if showActions}} - + {{/if}} diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs index d612c4f27e..2b74f3a58b 100644 --- a/app/patients/index/template.hbs +++ b/app/patients/index/template.hbs @@ -30,16 +30,16 @@ {{/if}} {{#if patient.admitted}} {{#if canDischargePatient}} - + {{/if}} {{else}} {{#if patient.checkedIn}} {{#if canDischargePatient}} - + {{/if}} {{else}} {{#if canAdmitPatient}} - + {{/if}} {{/if}} {{/if}} diff --git a/app/patients/outpatient/template.hbs b/app/patients/outpatient/template.hbs index 8c53ac1133..6ce07f7f67 100644 --- a/app/patients/outpatient/template.hbs +++ b/app/patients/outpatient/template.hbs @@ -10,7 +10,7 @@
- +
diff --git a/app/patients/reports/template.hbs b/app/patients/reports/template.hbs index 804dc9d849..ef518e1e34 100644 --- a/app/patients/reports/template.hbs +++ b/app/patients/reports/template.hbs @@ -88,7 +88,7 @@ {{/em-form}}
- +
{{#if showReportResults}} diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss index 8809ea9ca8..f348ff5855 100644 --- a/app/styles/_variables_mixins.scss +++ b/app/styles/_variables_mixins.scss @@ -6,6 +6,8 @@ $black: #000; $green: #00bd9c; $green_light: #13d8b6; $navy: #2e4359; +$navy_dark: #3e95ff; +$navy_darker: #0173ff; $navy_mid: #546a83; $navy_mid2: #2f4358; $navy_mid3: #3a4d63; @@ -19,6 +21,8 @@ $blue_light2: #e9f3ff; $blue_light3: #dde5ee; $blue_lightest: #eff2f5; $blue_lightest2: #dee2e7; +$blue_dark: #799fd2; +$blue_darker: #4a7ec3; $red: #ff6d6f; $red_light: rgba($red,.3); $red_lighter: rgba($red,.75); diff --git a/app/styles/components/_buttons.scss b/app/styles/components/_buttons.scss index 27d137fa3e..eecc7d63c2 100644 --- a/app/styles/components/_buttons.scss +++ b/app/styles/components/_buttons.scss @@ -16,11 +16,25 @@ } &.neutral { - background-color: $gray_light; - color: $gray; + background-color: $navy_dark; + color: $white; + + &:hover, + &:focus { + background-color: $navy_darker; + color: $white; + } + } + + &.btn-extra { + background-color: $blue_dark; + color: $white; &:hover, - &:focus { opacity: .8; } + &:focus { + background-color: $blue_darker; + color: $white; + } } &.admit { diff --git a/app/users/index/template.hbs b/app/users/index/template.hbs index 48a0442557..d483466880 100644 --- a/app/users/index/template.hbs +++ b/app/users/index/template.hbs @@ -20,7 +20,7 @@ {{#if showActions}} {{#if canAdd}} - + {{/if}} {{#if canDelete}} From 94fe540db5f3f9aaf1bf7c4c3fe5107c397aa5a9 Mon Sep 17 00:00:00 2001 From: Anisha Swain Date: Thu, 20 Apr 2017 16:47:53 +0530 Subject: [PATCH 2/2] changes per requested --- app/inventory/listing/template.hbs | 2 +- app/inventory/reports/template.hbs | 2 +- app/styles/_variables_mixins.scss | 4 ---- app/styles/components/_buttons.scss | 22 +++++++--------------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/app/inventory/listing/template.hbs b/app/inventory/listing/template.hbs index 1341fc14bf..f8d6d711a2 100644 --- a/app/inventory/listing/template.hbs +++ b/app/inventory/listing/template.hbs @@ -29,7 +29,7 @@ {{#if canDeleteItem}} {{/if}} - {{#link-to 'inventory.barcode' inventory class="btn btn-extra" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}} + {{#link-to 'inventory.barcode' inventory class="btn btn-default neutral" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}} {{/unless}} diff --git a/app/inventory/reports/template.hbs b/app/inventory/reports/template.hbs index 7e67c23bcf..92c94bdad8 100644 --- a/app/inventory/reports/template.hbs +++ b/app/inventory/reports/template.hbs @@ -100,7 +100,7 @@
- {{t 'inventory.reports.export'}} + {{t 'inventory.reports.export'}}
diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss index f348ff5855..8809ea9ca8 100644 --- a/app/styles/_variables_mixins.scss +++ b/app/styles/_variables_mixins.scss @@ -6,8 +6,6 @@ $black: #000; $green: #00bd9c; $green_light: #13d8b6; $navy: #2e4359; -$navy_dark: #3e95ff; -$navy_darker: #0173ff; $navy_mid: #546a83; $navy_mid2: #2f4358; $navy_mid3: #3a4d63; @@ -21,8 +19,6 @@ $blue_light2: #e9f3ff; $blue_light3: #dde5ee; $blue_lightest: #eff2f5; $blue_lightest2: #dee2e7; -$blue_dark: #799fd2; -$blue_darker: #4a7ec3; $red: #ff6d6f; $red_light: rgba($red,.3); $red_lighter: rgba($red,.75); diff --git a/app/styles/components/_buttons.scss b/app/styles/components/_buttons.scss index eecc7d63c2..f27dfb133f 100644 --- a/app/styles/components/_buttons.scss +++ b/app/styles/components/_buttons.scss @@ -16,29 +16,21 @@ } &.neutral { - background-color: $navy_dark; - color: $white; + background-color: $gray_light; + color: $gray; &:hover, &:focus { - background-color: $navy_darker; - color: $white; + opacity: .8; } } - &.btn-extra { - background-color: $blue_dark; - color: $white; - - &:hover, - &:focus { - background-color: $blue_darker; - color: $white; - } + &.admit { + width: 110px; } - &.admit { - width: 103px; + &.info { + width: 110px; } .octicon {