From 877b33b265898163cc776cd8373acb645bbabdef Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 25 Apr 2016 03:07:46 +0200 Subject: [PATCH] Default editor now is ckeditor --- src/CoreFields/SlugifyField.php | 8 ++++- src/CoreFields/TextHTMLField.php | 12 +++---- src/Forms/TextAreaEditor.php | 60 +++++++++++++++++++++++++++----- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/src/CoreFields/SlugifyField.php b/src/CoreFields/SlugifyField.php index bcb60e5..72f0e6c 100644 --- a/src/CoreFields/SlugifyField.php +++ b/src/CoreFields/SlugifyField.php @@ -31,6 +31,12 @@ class SlugifyField extends CharField { } + } + else + { + + $value=\PhangoApp\PhaUtils\Utils::slugify($value); + } if($value=='') @@ -61,4 +67,4 @@ class SlugifyField extends CharField { } -?> \ No newline at end of file +?> diff --git a/src/CoreFields/TextHTMLField.php b/src/CoreFields/TextHTMLField.php index 5ce95b5..1789209 100644 --- a/src/CoreFields/TextHTMLField.php +++ b/src/CoreFields/TextHTMLField.php @@ -35,7 +35,7 @@ class TextHTMLField extends PhangoField { //Delete Javascript tags and simple quotes. - $txt_without_tags=str_replace(' ', '', strip_tags($value, '') ); + /*$txt_without_tags=str_replace(' ', '', strip_tags($value, '') ); $txt_without_tags=trim(str_replace(' ', '', $txt_without_tags)); @@ -50,15 +50,15 @@ class TextHTMLField extends PhangoField { if(Utils::$textbb_type=='') { - $this->value=Utils::unform_text($value); + $value=Utils::unform_text($value); - } - else + }*/ + /*else { $this->value=$value; - } + }*/ $value=Utils::form_text_html($value, $this->allowedtags); @@ -134,4 +134,4 @@ class TextHTMLField extends PhangoField { } -?> \ No newline at end of file +?> diff --git a/src/Forms/TextAreaEditor.php b/src/Forms/TextAreaEditor.php index b60ad51..8d3cbbb 100644 --- a/src/Forms/TextAreaEditor.php +++ b/src/Forms/TextAreaEditor.php @@ -10,10 +10,48 @@ use PhangoApp\PhaI18n\I18n; class TextAreaEditor extends BaseForm { + public $load_image_url=''; + + public function __construct($name, $value, $load_image_url='') + { + + parent::__construct($name, $value); + $this->load_image_url=$load_image_url; + + } + public function form() { //PhangoVar::$arr_cache_jscript[]='tinymce_path.js'; + + if(!isset(View::$header['ckeditor'])) + { + + View::$js[]='jquery.min.js'; + View::$js[]='ckeditor/ckeditor.js'; + + ob_start(); + + ?> + + load_image_url; ?>" + /* file_browser_callback: function(field_name, url, type, win){ - var filebrowser = ""; + var filebrowser = "load_image_url; ?>"; tinymce.activeEditor.windowManager.open({ - title : "", + title : "", width : 520, height : 400, url : filebrowser @@ -50,9 +94,9 @@ class TextAreaEditor extends BaseForm { input : field_name }); return false; - } + }*/ - }); + /* }); @@ -67,12 +111,12 @@ class TextAreaEditor extends BaseForm { ob_end_clean(); } - + */ ?> -

+

\ No newline at end of file +?>