moved files, removed several config options, sai language switching fix

This commit is contained in:
Ulf Gebhardt 2015-04-08 04:59:02 +02:00
parent 9f63eb434f
commit 55326931b3
7 changed files with 4 additions and 10 deletions

View File

@ -26,8 +26,6 @@ class config_ids {
const SYS_CRON_LOG2SQLITE_PATH = 30;
const SYS_SAI_CONFIG_BASEURL = 50;
const SYS_SAI_CONFIG_NAVIMG = 51;
const SYS_SAI_CONFIG_TITLE = 52;
const SYS_SAI_CONFIG_COPYRIGHT = 53;
const SYS_SAI_CONFIG_PROJECT = 54;

View File

@ -79,8 +79,6 @@ File config.php - Your Server and Project config
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'dbpw'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'dbname'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, '/system/sai/page/default_page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.project.eu/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.project.eu/" target="_blank">mojotrollz</a>, &copy; WebCraft Media 2013'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -22,8 +22,7 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD'. '</td>'.'<td>'.'&lt;hidden&gt;'. '</td>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME). '</td>'.'</tr>';
$result .= '<tr>'.'<th>System Admin Interface</th>'.'<th></th><th></th>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL). '</td>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG). '</td>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT). '</td>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT). '</td>'.'</tr>';
$result .= '<tr>'.'<td>'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE. '</td>'.'<td>'.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE'. '</td>'.'<td>'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE). '</td>'.'</tr>';

View File

@ -66,7 +66,6 @@ class default_page extends \SYSTEM\PAGE\Page {
$vars['menu_start'] = self::menu_start();
$vars['menu_sys'] = self::menu_sys();
$vars['menu_proj'] = self::menu_proj();
$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();

View File

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

View File

@ -3,7 +3,7 @@
<head>
<title>${title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" type="image/png" href="${navimg}" />
<link rel="icon" type="image/png" href="./api.php?call=files&cat=saistart_sys_sai&id=logo.png"/>
${css}
${js}
</head>
@ -11,7 +11,7 @@
<div id="sai_navbar" class="navbar navbar-fixed-top" style="height:40px;">
<div class="navbar-inner">
<div class="brand-logo" style="padding-left: 10px;">
<img src="${navimg}" height="24" width="24"/>
<img src="./api.php?call=files&cat=saistart_sys_sai&id=logo.png" height="24" width="24"/>
</div>
<a class="brand" href="#" style="width: 159px;">SAI</a>
${lang_switcher}