Skip to content

Commit

Permalink
updated login page design added guest mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@MIKEINTOSHSYSTEMS
MIKEINTOSHSYSTEMS committed Aug 9, 2024
1 parent e262b7f commit 431daef
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 32 deletions.
4 changes: 2 additions & 2 deletions app/include/appsettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions app/include/mfr_dashboard_report_settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

$tdatamfr_dashboard_report[".strOriginalTableName"] = "MFR_Dashboard_Report";





Expand Down Expand Up @@ -246,7 +246,7 @@





$fdata["strField"] = "model/*/type";

Expand Down Expand Up @@ -381,7 +381,7 @@





$fdata["strField"] = "model/*/name";

Expand Down Expand Up @@ -516,7 +516,7 @@





$fdata["strField"] = "model/*/count";

Expand Down
34 changes: 25 additions & 9 deletions app/include/pages/.global_login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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( ),
Expand Down Expand Up @@ -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( ),
Expand Down Expand Up @@ -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' => '<p><br></p><a href="../../" target="" rel=""><strong>Go Back to Home Page</strong></a>',
'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',
Expand Down
18 changes: 10 additions & 8 deletions app/pdf/.global_login.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand All @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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}"},
Expand Down Expand Up @@ -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}"},
Expand Down Expand Up @@ -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 ],
Expand All @@ -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 ],
Expand Down
24 changes: 24 additions & 0 deletions app/styles/pages/.global_login.css
View file
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
21 changes: 12 additions & 9 deletions app/templates/.global_login.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@
class="r-align-right r-ori-vert col-md-6
">
</div> </div>

<span data-itemtype="text" data-itemid="text1" {$item_text1} data-pageid="{$pageid}" data-page=".global_login" data-small >
Welcome To Health Information Systems Performance Monitoring Dashboard (HISPMD)</span>
</div> </div>

<div class="row">

Expand All @@ -63,7 +66,7 @@
">

<span data-itemtype="login_welcome" data-itemid="login_welcome" {$item_login_welcome} data-pageid="{$pageid}" data-small >
<span data-itemtype="login_welcome" data-itemid="login_welcome" {$item_login_welcome} data-pageid="{$pageid}" data-page=".global_login" data-small >
Login into your account</span>
</div> </div>
</div>
Expand Down Expand Up @@ -91,7 +94,7 @@
">

{BEGIN message_block}
<div data-itemtype="login_message" data-itemid="login_message" {$item_login_message} data-pageid="{$pageid}" class="alert {$message_class}" role="alert">
<div data-itemtype="login_message" data-itemid="login_message" {$item_login_message} data-pageid="{$pageid}" data-page=".global_login" class="alert {$message_class}" role="alert">
{$message}
</div>
{END message_block} </div> </div>
Expand All @@ -107,7 +110,7 @@
colspan="2"
data-cellId="grid_c1" data-pageid="{$pageid}">

<label data-itemtype="username_label" data-itemid="username_label" {$item_username_label} data-pageid="{$pageid}" data-small class="r-edit-label control-label" for="username">
<label data-itemtype="username_label" data-itemid="username_label" {$item_username_label} data-pageid="{$pageid}" data-page=".global_login" data-small class="r-edit-label control-label" for="username">
{BEGIN username_label}Username{END username_label}
</label>
<div class="r-edit-field" data-itemtype="username" data-itemid="username" {$item_username} data-pageid="{$pageid}" >
Expand All @@ -120,7 +123,7 @@
colspan="2"
data-cellId="grid_c2" data-pageid="{$pageid}">

<label data-itemtype="password_label" data-itemid="password_label" {$item_password_label} data-pageid="{$pageid}" data-small class="r-edit-label control-label" for="password">
<label data-itemtype="password_label" data-itemid="password_label" {$item_password_label} data-pageid="{$pageid}" data-page=".global_login" data-small class="r-edit-label control-label" for="password">
{BEGIN password_label}Password{END password_label}
</label>
<div class="r-edit-field" data-itemtype="password" data-itemid="password" {$item_password} data-pageid="{$pageid}" >
Expand All @@ -133,7 +136,7 @@

data-cellId="grid_c4" data-pageid="{$pageid}">

<div class="checkbox r-edit-field" data-itemtype="remember_password" data-itemid="remember_password" {$item_remember_password} data-pageid="{$pageid}" >
<div class="checkbox r-edit-field" data-itemtype="remember_password" data-itemid="remember_password" {$item_remember_password} data-pageid="{$pageid}" data-page=".global_login" >
<label>
<input type="checkbox" id="remember_password{$id}" name="remember_password" value="1" {$rememberbox_attrs}> Remember me </label>
</div></td>
Expand All @@ -143,8 +146,8 @@
data-cellId="grid_c6" data-pageid="{$pageid}">

{BEGIN guestlink_block}
<span data-itemtype="guest_login" data-itemid="guest_login" {$item_guest_login} data-pageid="{$pageid}" data-small data-button-item>
<a type="button" title="" class="btn btn-link
<span data-itemtype="guest_login" data-itemid="guest_login" {$item_guest_login} data-pageid="{$pageid}" data-page=".global_login" data-small data-button-item>
<a type="button" title="" class="btn btn-warning
" {$guestlink_attrs} >
Login as Guest </a>
</span>
Expand Down Expand Up @@ -193,7 +196,7 @@

data-cellId="footer_c" data-pageid="{$pageid}">

<span data-itemtype="text" data-itemid="text" {$item_text} data-pageid="{$pageid}" data-small >
<span data-itemtype="text" data-itemid="text" {$item_text} data-pageid="{$pageid}" data-page=".global_login" data-small >
<p><br></p><a href="../../" target="" rel=""><strong>Go Back to Home Page</strong></a></span>
</td>
<td
Expand Down

0 comments on commit 431daef

Please sign in to comment.