From c7597e1511a03296f8a831d3c4764ad8f9bc7db6 Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Fri, 3 Nov 2017 22:06:28 -0700 Subject: [PATCH] reordered themes in Header class to include bootstrap prior to main theme (#1193) --- config/config.yaml | 4 ++++ interface/forms/LBF/new.php | 6 ++--- interface/forms/eye_mag/SpectacleRx.php | 10 ++++---- interface/forms/eye_mag/a_issue.php | 4 ++-- interface/forms/eye_mag/help.php | 5 ++-- interface/forms/eye_mag/php/Anything_simple.php | 4 ++-- interface/forms/eye_mag/view.php | 6 ++--- interface/new/new_comprehensive.php | 2 +- .../patient_file/summary/demographics_full.php | 2 +- .../patient_file/transaction/add_transaction.php | 2 +- interface/themes/style_manila.css | 8 +++---- interface/themes/tabs_style_full.css | 4 +--- interface/usergroup/usergroup_admin.php | 4 ++-- library/core/src/Header.php | 27 ++++++++++++---------- portal/find_appt_popup_user.php | 2 +- 15 files changed, 46 insertions(+), 44 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 865f7b796..e797a5878 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -27,6 +27,10 @@ assets: basePath: %assets_static_relative%/bootstrap-sidebar-0-2-2/dist/ script: js/sidebar.js link: css/sidebar.css + main-theme: + alreadyBuilt: true + link: %css_header% + autoload: true tabs-theme: basePath: %webroot%/interface/themes/ link: %theme_tabs_layout% diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php index 875fe7ede..0f2ff23d5 100644 --- a/interface/forms/LBF/new.php +++ b/interface/forms/LBF/new.php @@ -317,11 +317,11 @@ if (!empty($_POST['bn_save']) || !empty($_POST['bn_save_print']) || !empty($_POS - + @@ -970,7 +970,7 @@ while ($frow = sqlFetchArray($fres)) { // Must have edit option "I" in first item for its group to be initially open. $display_style = isOption($edit_options, 'I') === false ? 'none' : 'block'; } - + // If group name is blank, no checkbox or div. if (strlen($gname)) { echo "
"; } - + // Clear historical data string. foreach ($historical_ids as $key => $dummy) { $historical_ids[$key] = ''; diff --git a/interface/forms/eye_mag/SpectacleRx.php b/interface/forms/eye_mag/SpectacleRx.php index 393cd4688..32c8a6152 100644 --- a/interface/forms/eye_mag/SpectacleRx.php +++ b/interface/forms/eye_mag/SpectacleRx.php @@ -276,13 +276,12 @@ if ($_REQUEST['dispensed']) { + + - - -