diff --git a/bl-plugins/tinymce/css/bludit.css b/bl-plugins/tinymce/css/bludit.css index 5514c63e..19646263 100644 --- a/bl-plugins/tinymce/css/bludit.css +++ b/bl-plugins/tinymce/css/bludit.css @@ -8,6 +8,10 @@ body { height: auto; } +.mce-content-body .mce-pagebreak { + height: 5px !important; +} + .mce-content-body a { color: #4a90e2; text-decoration: none; diff --git a/bl-plugins/tinymce/plugin.php b/bl-plugins/tinymce/plugin.php index 7b41646d..fa12cf42 100644 --- a/bl-plugins/tinymce/plugin.php +++ b/bl-plugins/tinymce/plugin.php @@ -10,9 +10,8 @@ class pluginTinymce extends Plugin { public function init() { $this->dbFields = array( - 'toolbar1'=>'formatselect bold italic bullist numlist blockquote alignleft aligncenter alignright link unlink pagebreak image removeformat code', + 'toolbar1'=>'formatselect bold italic bullist numlist | blockquote alignleft aligncenter alignright | link unlink pagebreak image removeformat code', 'toolbar2'=>'', - 'mobileToolbar'=>'bold italic bullist formatselect', 'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern' ); } @@ -31,11 +30,6 @@ class pluginTinymce extends Plugin { $html .= ''; $html .= ''; - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
'; - $html .= '
'; $html .= ''; $html .= ''; @@ -61,19 +55,10 @@ class pluginTinymce extends Plugin { return false; } - // Detect if the user is browsing in a mobile - if ($this->isMobile()) { - $toolbar1 = $this->getValue('mobileToolbar'); - $toolbar2 = ''; - $min_height = '320'; - $content_css = $this->htmlPath().'css/bludit.css'; - } else { - $toolbar1 = $this->getValue('toolbar1'); - $toolbar2 = $this->getValue('toolbar2'); - $min_height = '500'; - $content_css = $this->htmlPath().'css/bludit.css'; - } - + $toolbar1 = $this->getValue('toolbar1'); + $toolbar2 = $this->getValue('toolbar2'); + $min_height = '500'; + $content_css = $this->htmlPath().'css/bludit.css'; $plugins = $this->getValue('plugins'); $lang = 'en'; @@ -139,7 +124,4 @@ EOF; return $script; } - private function isMobile() { - return preg_match("/(android|avantgo|blackberry|bolt|boost|cricket|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i", $_SERVER["HTTP_USER_AGENT"]); - } } \ No newline at end of file diff --git a/install.php b/install.php index 1086a86c..f0593e94 100644 --- a/install.php +++ b/install.php @@ -515,9 +515,8 @@ function install($adminPassword, $timezone) $dataHead.json_encode( array( 'position'=>1, - 'toolbar1'=>'formatselect bold italic bullist numlist blockquote alignleft aligncenter alignright link unlink pagebreak image removeformat code', + 'toolbar1'=>'formatselect bold italic bullist numlist | blockquote alignleft aligncenter alignright | link unlink pagebreak image removeformat code', 'toolbar2'=>'', - 'mobileToolbar'=>'bold italic bullist formatselect', 'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern' ), JSON_PRETTY_PRINT),