extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. migration of mainscreen to et2:

Browse Source 
- Fix data not being loaded on initiation
This commit is contained in:
Hadi Nategh 2018-10-29 17:50:55 +01:00
parent 95268be609
commit 631e554d56
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
admin/inc/class.admin_messages.inc.php
View File

@ -22,8 +22,6 @@ class admin_messages
{ {
var $public_functions = array('index' => True); var $public_functions = array('index' => True);
var $sections = array ('mainscreen', 'loginscreen');
const MAINSCREEN = 'mainscreen'; const MAINSCREEN = 'mainscreen';
const LOGINSCREEN = 'loginscreen'; const LOGINSCREEN = 'loginscreen';
@ -38,13 +36,14 @@ class admin_messages
if (!is_array($content)) if (!is_array($content))
{ {
$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
$content = array( $content = array_merge(array(
'html' => true, 'html' => true,
'lang' => $GLOBALS['egw_info']['user']['preferences']['common']['lang'] 'lang' => $lang
); ), $this->_getMessages($lang));
} }
else { else
{
list($button) = @each($content['button']); list($button) = @each($content['button']);
if ($button) if ($button)
@ -53,7 +52,7 @@ class admin_messages
{ {
case 'apply': case 'apply':
case 'save': case 'save':
foreach (self::$sections as $section) foreach (array ('mainscreen', 'loginscreen') as $section)
{ {
$prefix = $content['html'] == true ? 'html_' : 'text_'; $prefix = $content['html'] == true ? 'html_' : 'text_';
if ($content[$prefix.$section] && $content[$prefix.$section]) if ($content[$prefix.$section] && $content[$prefix.$section])
@ -71,6 +70,10 @@ class admin_messages
), 'admin'); ), 'admin');
} }
} }
else if ($content['lang'])
{
$content = array_merge($content, $this->_getMessages($content['lang'], $content['html']));
}
} }
$readonlys = array( $readonlys = array(
'tabs' => array( 'tabs' => array(
@ -80,4 +83,29 @@ class admin_messages
); );
$tpl->exec('admin.admin_messages.index', $content, array(), $readonlys); $tpl->exec('admin.admin_messages.index', $content, array(), $readonlys);
} }
/**
* Get messages content
*
* @param type $lang
* @param type $html
* @return array returns an array of content
*/
private function _getMessages ($lang, $html = true)
{
if ($html)
{
return array (
'html_mainscreen' => Api\Translation::read($lang, self::MAINSCREEN, self::MAINSCREEN.'_message'),
'html_loginscreen' => Api\Translation::read($lang, self::LOGINSCREEN, self::LOGINSCREEN.'_message'),
);
}
else
{
return array (
'text_mainscreen' => strip_tags(Api\Translation::read($lang, self::MAINSCREEN, self::MAINSCREEN.'_message')),
'text_loginscreen' => strip_tags(Api\Translation::read($lang, self::LOGINSCREEN, self::LOGINSCREEN.'_message'))
);
}
}
} }

6
admin/templates/default/mainscreen_message.xet
View File

@ -4,14 +4,14 @@
<overlay> <overlay>
<template id ="admin.mainscreen_message.mainscreen" version="18.1"> <template id ="admin.mainscreen_message.mainscreen" version="18.1">
<vbox> <vbox>
<htmlarea id="html_mainscreen" height="500" width="100%" disabled="true"/> <htmlarea id="html_mainscreen" height="500" width="100%" disabled="!$cont[html]"/>
<textbox id="text_mainscreen" disabled="$cont[html]"/> <textbox id="text_mainscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
</vbox> </vbox>
</template> </template>
<template id ="admin.mainscreen_message.loginscreen" version="18.1"> <template id ="admin.mainscreen_message.loginscreen" version="18.1">
<vbox> <vbox>
<htmlarea id="html_loginscreen" height="500" width="100%" disabled="!$cont[html]"/> <htmlarea id="html_loginscreen" height="500" width="100%" disabled="!$cont[html]"/>
<textbox id="text_loginscreen" disabled="$cont[html]"/> <textbox id="text_loginscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
</vbox> </vbox>
</template> </template>
<template id="admin.mainscreen_message" template="" lang="" group="0" version="18.1"> <template id="admin.mainscreen_message" template="" lang="" group="0" version="18.1">