diff --git a/app/include/appsettings.php b/app/include/appsettings.php index cd607d77..9cf99c51 100644 --- a/app/include/appsettings.php +++ b/app/include/appsettings.php @@ -737,9 +737,9 @@ $strLastSQL = ""; $showCustomMarkerOnPrint = false; -$projectBuildKey = "433_1722696932"; +$projectBuildKey = "437_1722696932"; $wizardBuildKey = "39558"; -$projectBuildNumber = "433"; +$projectBuildNumber = "437"; $mlang_messages = array(); $mlang_charsets = array(); diff --git a/app/include/mfr_dashboard_report_settings.php b/app/include/mfr_dashboard_report_settings.php index e01e789e..a86e279c 100644 --- a/app/include/mfr_dashboard_report_settings.php +++ b/app/include/mfr_dashboard_report_settings.php @@ -53,7 +53,7 @@ $tdatamfr_dashboard_report[".strOriginalTableName"] = "MFR_Dashboard_Report"; - + @@ -246,7 +246,7 @@ - + $fdata["strField"] = "model/*/type"; @@ -381,7 +381,7 @@ - + $fdata["strField"] = "model/*/name"; @@ -516,7 +516,7 @@ - + $fdata["strField"] = "model/*/count"; diff --git a/app/include/pages/.global_login.php b/app/include/pages/.global_login.php index 813b1f49..fe794cc3 100644 --- a/app/include/pages/.global_login.php +++ b/app/include/pages/.global_login.php @@ -6,6 +6,7 @@ 'fieldItems' => array( ) ), 'layoutHelper' => array( 'formItems' => array( 'formItems' => array( 'above-grid' => array( 'login_message' ), 'top' => array( 'login-logo', +'text1', 'login_welcome' ), 'grid' => array( 'username_label', 'username', @@ -20,6 +21,7 @@ 'formXtTags' => array( 'superbottom' => array( ) ), 'itemForms' => array( 'login_message' => 'above-grid', 'login-logo' => 'top', +'text1' => 'top', 'login_welcome' => 'top', 'username_label' => 'grid', 'username' => 'grid', @@ -43,7 +45,8 @@ 'continue_login_button' => array( 'continue_login_button' ), 'login-logo' => array( 'login-logo' ), 'login_welcome' => array( 'login_welcome' ), -'text' => array( 'text' ) ), +'text' => array( 'text', +'text1' ) ), 'cellMaps' => array( ) ), 'page' => array( 'verticalBar' => false, 'labeledButtons' => array( 'update_records' => array( ), @@ -82,7 +85,7 @@ 'cells' => array( 'c1' => array( 'model' => 'c1', 'items' => array( 'login-logo' ) ), 'c2' => array( 'model' => 'c2', -'items' => array( ) ), +'items' => array( 'text1' ) ), 'c3' => array( 'model' => 'c3', 'items' => array( 'login_welcome' ) ) ), 'deferredItems' => array( ), @@ -132,22 +135,35 @@ 'cells' => array( ), 'deferredItems' => array( ), 'recsPerRow' => 1 ) ), -'items' => array( 'username_label' => array( 'type' => 'username_label' ), +'items' => array( 'username_label' => array( 'type' => 'username_label', +'bold' => true ), 'username' => array( 'type' => 'username' ), -'password_label' => array( 'type' => 'password_label' ), +'password_label' => array( 'type' => 'password_label', +'bold' => true ), 'password' => array( 'type' => 'password' ), -'login_message' => array( 'type' => 'login_message' ), +'login_message' => array( 'type' => 'login_message', +'bold' => true ), 'login_button' => array( 'type' => 'login_button' ), -'guest_login' => array( 'type' => 'guest_login' ), -'remember_password' => array( 'type' => 'remember_password' ), +'guest_login' => array( 'type' => 'guest_login', +'buttonStyle' => 'warning', +'bold' => true ), +'remember_password' => array( 'type' => 'remember_password', +'bold' => true ), 'continue_login_button' => array( 'type' => 'continue_login_button' ), 'login-logo' => array( 'type' => 'login-logo', 'font-size' => '24px' ), -'login_welcome' => array( 'type' => 'login_welcome' ), +'login_welcome' => array( 'type' => 'login_welcome', +'bold' => true ), 'text' => array( 'type' => 'text', 'label' => array( 'text' => '


Go Back to Home Page', 'type' => 0 ), -'editedByRte' => false ) ), +'editedByRte' => false, +'bold' => true ), +'text1' => array( 'type' => 'text', +'label' => array( 'text' => 'Welcome To Health Information Systems Performance Monitoring Dashboard (HISPMD)', +'type' => 0 ), +'editedByRte' => false, +'bold' => true ) ), 'dbProps' => array( ), 'version' => 11, 'imageItem' => array( 'type' => 'page_image', diff --git a/app/pdf/.global_login.json b/app/pdf/.global_login.json index b9c01792..6fcb73bb 100644 --- a/app/pdf/.global_login.json +++ b/app/pdf/.global_login.json @@ -77,8 +77,10 @@ pdfDocument = { "text": [ - '', - ], + + {"text":"Welcome To Health Information Systems Performance Monitoring Dashboard (HISPMD)","hidden":"{$item_hide_text1}","bold":true,"isHtml":true}, + + ], "border": [ false, false, false, false ], "alignment": 'right', @@ -102,7 +104,7 @@ pdfDocument = { "text": [ - {"text":"Login into your account","hidden":"{$item_hide_login_welcome}","isHtml":true}, + {"text":"Login into your account","hidden":"{$item_hide_login_welcome}","bold":true,"isHtml":true}, ], "border": [ false, false, false, false ], @@ -177,7 +179,7 @@ pdfDocument = { "text": [ - {"text":"","hidden":"{$item_hide_login_message}"}, + {"text":"","hidden":"{$item_hide_login_message}","bold":true}, ], "border": [ false, false, false, false ], @@ -236,7 +238,7 @@ pdfDocument = { "stack": [ - {"text":"Username","hidden":"{$item_hide_username_label}","isHtml":true}, + {"text":"Username","hidden":"{$item_hide_username_label}","bold":true,"isHtml":true}, {"text":"","hidden":"{$item_hide_username}"}, @@ -271,7 +273,7 @@ pdfDocument = { "stack": [ - {"text":"Password","hidden":"{$item_hide_password_label}","isHtml":true}, + {"text":"Password","hidden":"{$item_hide_password_label}","bold":true,"isHtml":true}, {"text":"","hidden":"{$item_hide_password}"}, @@ -305,7 +307,7 @@ pdfDocument = { "stack": [ - {"text":"","hidden":"{$item_hide_remember_password}"}, + {"text":"","hidden":"{$item_hide_remember_password}","bold":true}, ], "border": [ false, false, false, false ], @@ -328,7 +330,7 @@ pdfDocument = { "text": [ - {"text":"","hidden":"{$item_hide_guest_login}"}, + {"text":"","hidden":"{$item_hide_guest_login}","bold":true}, ], "border": [ false, false, false, false ], diff --git a/app/styles/pages/.global_login.css b/app/styles/pages/.global_login.css index 86b11aba..b767a884 100644 --- a/app/styles/pages/.global_login.css +++ b/app/styles/pages/.global_login.css @@ -1,6 +1,30 @@ +[data-page=".global_login"][data-itemid="username_label"] { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="password_label"] { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="login_message"] { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="guest_login"] > .btn { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="remember_password"] { + font-weight: bold; +} [data-page=".global_login"][data-itemid="login-logo"] { font-size: 24px; } +[data-page=".global_login"][data-itemid="login_welcome"] { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="text"] { + font-weight: bold; +} +[data-page=".global_login"][data-itemid="text1"] { + font-weight: bold; +} [data-page=".global_login"][data-itemid="page_image_ash8f23hr"] { width: 400px; } diff --git a/app/templates/.global_login.htm b/app/templates/.global_login.htm index a76e5498..380a3dc9 100644 --- a/app/templates/.global_login.htm +++ b/app/templates/.global_login.htm @@ -53,7 +53,10 @@ class="r-align-right r-ori-vert col-md-6 "> - + + + Welcome To Health Information Systems Performance Monitoring Dashboard (HISPMD) +
@@ -63,7 +66,7 @@ "> - + Login into your account
@@ -91,7 +94,7 @@ "> {BEGIN message_block} - @@ -107,7 +110,7 @@ colspan="2" data-cellId="grid_c1" data-pageid="{$pageid}"> -