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

WIP image upload via drag into ckeditor 4.5:

Browse Source 
-Add extraPlugins into ckeditor config
-Activate imageUpload for mail compose htmlarea
This commit is contained in:
Hadi Nategh 2015-08-07 15:51:15 +00:00
parent a2b96f0c9c
commit e91a88e80d
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/templates/default/compose.xet
View File

@ -86,7 +86,7 @@
</vbox> </vbox>
<vbox class="mailComposeBodySection" width="99%"> <vbox class="mailComposeBodySection" width="99%">
<hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer"> <hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
<htmlarea span="all" name="mail_htmltext" id="mail_htmltext" imageDataUrl="true" expand_toolbar="true" height="478px" width="100%" resize_ratio="0"/> <htmlarea span="all" name="mail_htmltext" id="mail_htmltext" imageUpload="link_to" expand_toolbar="true" height="478px" width="100%" resize_ratio="0"/>
</hbox> </hbox>
<hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer"> <hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
<textbox multiline="true" rows="40" cols="120" width="100%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/> <textbox multiline="true" rows="40" cols="120" width="100%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/>

29
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -309,7 +309,7 @@ drwxr-xr-x 3 kl kl 4096 Dez 9 14:26 office2013
) )
{ {
$spellchecker_button = 'SpellCheck'; $spellchecker_button = 'SpellCheck';
$config['extraPlugins'] = "aspell"; self::append_extraPlugins_config_array($config, array("aspell"));
} }
if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT' && if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT' &&
$GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased' $GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased'
@ -423,9 +423,34 @@ drwxr-xr-x 3 kl kl 4096 Dez 9 14:26 office2013
self::add_spellchecker_options($config, $spellchecker_button, $scayt_button); self::add_spellchecker_options($config, $spellchecker_button, $scayt_button);
self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button); self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button);
//error_log(__METHOD__."('$mode', $height, ".array2string($expanded_toolbar).") returning ".array2string($config)); //error_log(__METHOD__."('$mode', $height, ".array2string($expanded_toolbar).") returning ".array2string($config));
// Add extra plugins
self::append_extraPlugins_config_array($config, array('uploadimage','uploadwidget','widget','notification','notificationaggregator','lineutils'));
return $config; return $config;
} }
/**
* Adds extra
* @param array $config
* @param array $plugins plugins name which needs to be appended into extraPlugins
*/
public static function append_extraPlugins_config_array (&$config, $plugins)
{
if (is_array($plugins))
{
foreach ($plugins as &$plugin)
{
if (!empty($config['extraPlugins']) && $config['extraPlugins'] !== '')
{
$config['extraPlugins'] .= ',' . $plugin;
}
else
{
$config['extraPlugins'] = $plugin;
}
}
}
}
/** /**
* Returns a json encoded string containing the configuration for the ckeditor. * Returns a json encoded string containing the configuration for the ckeditor.
* @param string $mode specifies the count of toolbar buttons available to the user. Possible * @param string $mode specifies the count of toolbar buttons available to the user. Possible