saistart module continued - todo, log, logout/login, cleanup

This commit is contained in:
Ulf Gebhardt 2015-04-08 04:38:28 +02:00
parent 919b3392cd
commit 9f63eb434f
23 changed files with 34 additions and 48 deletions

View File

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

View File

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

View File

@ -1,23 +1,28 @@
#container_top .well{
height: 220px;
width: 21%;
}
#project {
float: left;
min-width: 250px;
}
#analytics {
margin-left: 20px;
margin-left: 10px;
float: left;
min-width: 250px;
}
#git {
margin-left: 20px;
margin-left: 10px;
float: left;
min-width: 250px;
}
#project {
float: left;
#logout {
margin-left: 10px;
float: right;
}
#todo {
clear: both;
}
#login {
position: fixed;
top: 80px;
right: 20px;
width:220px;
}

View File

@ -3,7 +3,7 @@ namespace SYSTEM\SAI;
class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saistart_sys_sai(){
$vars = array('content' => self::html_content(), 'login' => self::html_login());
$vars = array('content' => self::html_content());
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_BASIC),
\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI),
\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI_ERROR));
@ -23,14 +23,17 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
protected static function html_content(){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'));}
$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();
$vars['project_name'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT);
$vars['project_url'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL);
$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['logout'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'));
$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);
}
protected static function html_login(){
return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());}
}

View File

@ -14,4 +14,7 @@
</div>
<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
</div>
<div class="well" id="login">
${login}
</div>

View File

@ -25,19 +25,18 @@
<b>Current Project Version:</b> ${git_project}<br/>
<b>Current SYSTEM Version:</b> ${git_system}
</div>
<div class="well" id="logout">
${logout}
</div>
</div>
<div class="well" id="todo">
<h2 class="muted"><a href="#!todo">Todo</a></h2>
<b>Status:</b> ${project_count}/${project_all}<br/>
<b>Progress:</b> ${project}%
<h4 class="muted">5 Latest User Todos</h4>
${todo_user_entries}
<h4 class="muted">5 Latest Generated Todos</h4>
${todo_gen_entries}
${todo_entries}
</div>
<div class="well" id="log">
<h2 class="muted"><a href="#!log">Log</a></h2>
<b>Count:</b> ${log_count}
<h4 class="muted">10 Latest Log Entries</h4>
<h4 class="muted">100 Latest Log Entries</h4>
${log_entries}
</div>

View File

@ -1,3 +1,2 @@
<div id="content_saistart" style="float:left; width: auto;">${content}</div>
<div class="well" id="login" style="position: fixed; top: 80px; right: 20px; width:220px;">${login}</div>
<div style="clear:both;"></div>
<!--<div style="clear:both;"></div>-->

View File

@ -1,15 +0,0 @@
/*
Document : index.css
Created on : 31.01.2013, 01:59:37
Author : CHRIS MEURISCH
Description:
Purpose of the stylesheet follows.
*/
.footer{
text-align: right;
}
#div-content{
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View File

@ -3,7 +3,6 @@ namespace SYSTEM\SAI;
class default_page extends \SYSTEM\PAGE\Page {
private static function menu_sys(){
$result = '';
$mods = \SYSTEM\SAI\sai::getSysModules();
foreach($mods as $mod){
if(\call_user_func(array($mod, 'right_public')) ||
@ -35,7 +34,6 @@ class default_page extends \SYSTEM\PAGE\Page {
$result = '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/libs/bootstrap.min.css').'" type="text/css" />'.
'<link rel="stylesheet" href="./api.php?call=files&amp;cat=sys&amp;id=system.css" type="text/css" />'.
'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />';
//'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_table.css').'" type="text/css" />';
return $result;
}
@ -54,13 +52,8 @@ class default_page extends \SYSTEM\PAGE\Page {
private static function lang_switcher(){
$result = '';
$langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
if(in_array('deDE', $langs)){
$result .= '<a href="javascript:system.language(\'deDE\');"><img src="${PATH_LOCAL_IMG}flag_germany.png" alt="Deutsch"></a>&nbsp;';
}
if(in_array('enUS', $langs)){
$result .= '<a href="javascript:system.language(\'enUS\');"><img src="${PATH_LOCAL_IMG}flag_usa.png" alt="English"></a>';
}
foreach($langs as $lang){
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/language.tpl'),array('lang' => $lang));}
return $result;
}
@ -76,11 +69,9 @@ class default_page extends \SYSTEM\PAGE\Page {
$vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG);
$vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE);
$vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT);
//$vars['lang_switcher'] = self::lang_switcher();
$vars['lang_switcher'] = '';
$vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/');
$vars['lang_switcher'] = self::lang_switcher();
$vars = array_merge($vars,\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/sai.tpl'), $vars);
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1 @@
<a href="javascript:system.language(\'${lang}\');"><img src="./api.php?call=files&cat=saistart_sys_sai&id=flag_${lang}.png" alt="${lang}"></a>&nbsp;