webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saistart logout rework, more info, cleanup

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-04-08 17:47:56 +02:00
parent 2a2330b6d2
commit 248313c005
5 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sai/modules/saistart_sys_sai/saistart_sys_sai.php
View File

@ -24,7 +24,6 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
protected static function html_content(){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
$vars = array();
$vars['login'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'),$vars);
}
$vars = array();
@ -33,7 +32,10 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
$vars['todo_entries'] = \SYSTEM\SAI\saimod_sys_todo::sai_mod__SYSTEM_SAI_saimod_sys_todo_action_todolist();
$vars['log_entries'] = \SYSTEM\SAI\saimod_sys_log::sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter();
$vars['analytics'] = \SYSTEM\SAI\saimod_sys_log::analytics();
$vars['logout'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'));
$user = \SYSTEM\SECURITY\Security::getUser();
$vars['username'] = $user->username;
$vars['locale'] = $user->locale;
$vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no";
$vars = array_merge($vars,\SYSTEM\SAI\saimod_sys_todo::statistics());
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
}

34
sai/modules/saistart_sys_sai/tpl/content.tpl
View File

@ -16,5 +16,37 @@
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
</div>
<div class="well" id="login">
${login}
<h2 class="muted">${basic_login}</h2>
${basic_text_login}
<br/>
<br/>
<form class="textbox" style="" id="login_form">
<div class="control-group">
<div class="controls">
<input type="text"
size="30"
style="margin-bottom: 15px;"
id="bt_login_user"
placeholder="${basic_placeholder_username}"
minlength="3" data-validation-minlength-message="${sai_error_username_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_username_long}"
required data-validation-required-message="${sai_error_username_miss}"/>
</div>
<div class="controls">
<input type="password"
size="30"
style="margin-bottom: 15px;"
id="bt_login_password"
placeholder="${basic_placeholder_password}"
minlength="5" data-validation-minlength-message="${sai_error_password_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_password_long}"
required data-validation-required-message="${sai_error_password_miss}"/>
</div>
<div class="help-block"></div>
<input type="hidden" />
<button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;"
type="submit"
id="login_submit">${basic_login}</button>
</div>
</form>
</div>

24
sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
View File

@ -19,7 +19,29 @@
<b>Current SYSTEM Version:</b> ${git_system}
</div>
<div class="well" id="logout">
${logout}
<h2 class="muted"><a href="#!login">${basic_logout}</a></h2>
<table class="table table-hover table-condensed sai_table">
<tr>
<th>${basic_username}</th>
<td>${username}</td>
</tr>
<tr>
<th>${basic_locale}</th>
<td>${locale}</td>
</tr>
<tr>
<th>${basic_admin_rights}</th>
<td>${isadmin}</td>
</tr>
</table>
${basic_text_logout}
<form class="textbox" style="" id="logout_form">
<div class="control-group">
<div class="help-block"></div>
<input type="hidden" />
<button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="logout_submit">${basic_logout}</button>
</div>
</form>
</div>
</div>
<div class="well" id="todo">

33
sai/modules/saistart_sys_sai/tpl/login.tpl
View File

@ -1,33 +0,0 @@
<h2 class="muted">${basic_login}</h2>
${basic_text_login}
<br/>
<br/>
<form class="textbox" style="" id="login_form">
<div class="control-group">
<div class="controls">
<input type="text"
size="30"
style="margin-bottom: 15px;"
id="bt_login_user"
placeholder="${basic_placeholder_username}"
minlength="3" data-validation-minlength-message="${sai_error_username_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_username_long}"
required data-validation-required-message="${sai_error_username_miss}"/>
</div>
<div class="controls">
<input type="password"
size="30"
style="margin-bottom: 15px;"
id="bt_login_password"
placeholder="${basic_placeholder_password}"
minlength="5" data-validation-minlength-message="${sai_error_password_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_password_long}"
required data-validation-required-message="${sai_error_password_miss}"/>
</div>
<div class="help-block"></div>
<input type="hidden" />
<button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;"
type="submit"
id="login_submit">${basic_login}</button>
</div>
</form>

11
sai/modules/saistart_sys_sai/tpl/logout.tpl
View File

@ -1,11 +0,0 @@
<h3 class="muted">${basic_logout}</h3>
${basic_text_logout}
<br/>
<br/>
<form class="textbox" style="" id="logout_form">
<div class="control-group">
<div class="help-block"></div>
<input type="hidden" />
<button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="logout_submit">${basic_logout}</button>
</div>
</form>