holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle/fix missed ckeditor3 calls

Browse Source
This commit is contained in:
Klaus Leithoff 2013-03-15 11:50:48 +00:00
parent d226d759cd
commit d4d2096a39
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
admin/inc/class.uimainscreen.inc.php
View File

@ -29,13 +29,13 @@
{ {
$acl_ok['loginscreen'] = True; $acl_ok['loginscreen'] = True;
} }
if ($_POST['cancel'] && !isset($_POST['message']) || if ($_POST['cancel'] && !isset($_POST['message']) ||
!count($acl_ok) || $_POST['submit'] && !isset($acl_ok[$section])) !count($acl_ok) || $_POST['submit'] && !isset($acl_ok[$section]))
{ {
$GLOBALS['egw']->redirect_link('/admin/index.php'); $GLOBALS['egw']->redirect_link('/admin/index.php');
} }
egw_framework::validate_file('ckeditor3','ckeditor','phpgwapi'); egw_framework::validate_file('ckeditor','ckeditor','phpgwapi');
$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl')); $GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
$GLOBALS['egw']->template->set_block('message','form','form'); $GLOBALS['egw']->template->set_block('message','form','form');
@ -46,7 +46,7 @@
{ {
$GLOBALS['egw']->translation->write($select_lang,$section,$section.'_message',$message); $GLOBALS['egw']->translation->write($select_lang,$section,$section.'_message',$message);
$feedback_message = '<center>'.lang('message has been updated').'</center>'; $feedback_message = '<center>'.lang('message has been updated').'</center>';
$section = ''; $section = '';
} }
if ($_POST['cancel']) // back to section/lang-selection if ($_POST['cancel']) // back to section/lang-selection
@ -69,8 +69,8 @@
{ {
$GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->common->egw_header();
echo parse_navbar(); echo parse_navbar();
$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index')); $GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index'));
$GLOBALS['egw']->template->set_var('tr_color',$GLOBALS['egw_info']['theme']['th_bg']); $GLOBALS['egw']->template->set_var('tr_color',$GLOBALS['egw_info']['theme']['th_bg']);
$GLOBALS['egw']->template->set_var('value','&nbsp;'); $GLOBALS['egw']->template->set_var('value','&nbsp;');
@ -82,11 +82,11 @@
$lang_select = '<select name="select_lang">'; $lang_select = '<select name="select_lang">';
foreach($GLOBALS['egw']->translation->get_installed_langs() as $lang => $lang_name) foreach($GLOBALS['egw']->translation->get_installed_langs() as $lang => $lang_name)
{ {
$lang_select .= '<option value="' . $lang . '"'.($lang == $select_lang ? ' selected="selected"' : '').'>' . $lang_select .= '<option value="' . $lang . '"'.($lang == $select_lang ? ' selected="selected"' : '').'>' .
$lang . ' - ' . $lang_name . "</option>\n"; $lang . ' - ' . $lang_name . "</option>\n";
} }
$lang_select .= '</select>'; $lang_select .= '</select>';
$GLOBALS['egw']->template->set_var('label',lang('Language')); $GLOBALS['egw']->template->set_var('label',lang('Language'));
$GLOBALS['egw']->template->set_var('value',$lang_select); $GLOBALS['egw']->template->set_var('value',$lang_select);
$GLOBALS['egw']->template->fp('rows','row',True); $GLOBALS['egw']->template->fp('rows','row',True);
@ -97,7 +97,7 @@
foreach($acl_ok as $key => $val) foreach($acl_ok as $key => $val)
{ {
$select_section .= ' <option value="'.$key.'"'. $select_section .= ' <option value="'.$key.'"'.
($key == $_POST['section'] ? ' selected' : '') . '>' . ($key == $_POST['section'] ? ' selected' : '') . '>' .
($key == 'mainscreen' ? lang('Main screen') : lang("Login screen")) . "</option>\n"; ($key == 'mainscreen' ? lang('Main screen') : lang("Login screen")) . "</option>\n";
} }
$select_section .= '</select>'; $select_section .= '</select>';
@ -114,7 +114,7 @@
else else
{ {
$current_message = $GLOBALS['egw']->translation->read($select_lang,$section,$section.'_message'); $current_message = $GLOBALS['egw']->translation->read($select_lang,$section,$section.'_message');
if ($_POST['no-htmlarea']) $current_message = strip_tags($current_message); if ($_POST['no-htmlarea']) $current_message = strip_tags($current_message);
if($_POST['htmlarea'] || strlen($current_message) > strlen(strip_tags($current_message))) if($_POST['htmlarea'] || strlen($current_message) > strlen(strip_tags($current_message)))
{ {
$text_or_htmlarea = html::fckEditorQuick('message','advanced',$current_message,'400px','800px'); $text_or_htmlarea = html::fckEditorQuick('message','advanced',$current_message,'400px','800px');
@ -123,7 +123,7 @@
} }
else else
{ {
$text_or_htmlarea='<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">' . $text_or_htmlarea='<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">' .
html::htmlspecialchars($current_message) . '</textarea>'; html::htmlspecialchars($current_message) . '</textarea>';
$htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''. $htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.
$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'. $GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.
@ -131,7 +131,7 @@
} }
$GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->common->egw_header();
echo parse_navbar(); echo parse_navbar();
$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index')); $GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index'));
$GLOBALS['egw']->template->set_var('select_lang',$select_lang); $GLOBALS['egw']->template->set_var('select_lang',$select_lang);
$GLOBALS['egw']->template->set_var('section',$section); $GLOBALS['egw']->template->set_var('section',$section);
@ -142,11 +142,11 @@
$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color); $tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);
$GLOBALS['egw']->template->set_var('tr_color',$tr_color); $GLOBALS['egw']->template->set_var('tr_color',$tr_color);
$GLOBALS['egw']->template->set_var('value',$text_or_htmlarea); $GLOBALS['egw']->template->set_var('value',$text_or_htmlarea);
$GLOBALS['egw']->template->fp('rows','row_2',True); $GLOBALS['egw']->template->fp('rows','row_2',True);
$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color); $tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);

6
etemplate/js/et2_widget_htmlarea.js
View File

@ -15,9 +15,9 @@
/*egw:uses /*egw:uses
jsapi.jsapi; // Needed for egw_seperateJavaScript jsapi.jsapi; // Needed for egw_seperateJavaScript
jquery.jquery; jquery.jquery;
/phpgwapi/js/ckeditor3/ckeditor.js; /phpgwapi/js/ckeditor/ckeditor.js;
/phpgwapi/js/ckeditor3/config.js; /phpgwapi/js/ckeditor/config.js;
/phpgwapi/js/ckeditor3/adapters/jquery.js; /phpgwapi/js/ckeditor/adapters/jquery.js;
et2_core_baseWidget; et2_core_baseWidget;
*/ */