openrat-cms

commit e114249cfcb566aae8ebe7f3f8a57bcc49a2c287
parent 4940664a7f958b0223d8afcf5ba539c6621be433
Author: Jan Dankert <devnull@localhost>
Date:   Thu,  9 Aug 2012 23:01:59 +0200

Den ckEditor aktiviert.

Diffstat:
M
action/FilebrowserAction.class.php
 | 
8
++++----
M
themes/default/js/openrat.js
 | 
9
+++------
M
themes/default/layout/index.php
 | 
5
++++-

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/action/FilebrowserAction.class.php b/action/FilebrowserAction.class.php
@@ -81,7 +81,7 @@ class FilebrowserAction extends ObjectAction
 	 * Datei-Upload.
 	 *
 	 */
-	function directupload()
+	public function directuploadPost()
 	{
 		$upload = new Upload( $this->getRequestVar('name','abc') );
 		
@@ -111,7 +111,7 @@ class FilebrowserAction extends ObjectAction
 	}
 
 	
-	function browse()
+	public function browseView()
 	{
 		global $conf_php;
 		$funcNum = $this->getRequestVar('CKEditorFuncNum',OR_FILTER_NUMBER);
@@ -176,7 +176,7 @@ class FilebrowserAction extends ObjectAction
 	}
 
 
-	function addfolder()
+	public function addfolderPost()
 	{
 		
 		$filename = $this->getRequestVar('name');
@@ -208,7 +208,7 @@ class FilebrowserAction extends ObjectAction
 	
 	
 	
-	function upload()
+	public function uploadPost()
 	{
 		if	( $this->hasRequestVar('name') )
 			$name = $this->getRequestVar('name','abc');
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -199,7 +199,7 @@ function loadView(jo, url )
 	};
 
 	/*
-	if	( $(jo).find('textarea#pageelement_edit_editor').length > 0 )
+	if	( $(jo).find('textarea#pageelement_edit_editor').size() > 0 )
 	{
 	var o=CKEDITOR.instances[ $('textarea.editor').attr('name') ];
 	if (o) o.destroy();
@@ -283,9 +283,7 @@ function loadView(jo, url )
 				   }
 			});
 			
-			/*
-			 * 
-			if	( $(jo).find('textarea#pageelement_edit_editor').length > 0 )
+			if	( $(jo).find('textarea#pageelement_edit_editor').size() > 0 )
 			{
 				var instance = CKEDITOR.instances['pageelement_edit_editor'];
 			    if(instance)
@@ -294,7 +292,6 @@ function loadView(jo, url )
 			    }
 			    CKEDITOR.replace( 'pageelement_edit_editor',{customConfig:'config-openrat.js'} );
 			}
-			 */
 			
 			// Wiki-Editor
 			var markitupSettings = {	markupSet:  [ 	
@@ -335,7 +332,7 @@ function loadView(jo, url )
 					               {'name': 'Preview', 'title': 'Preview', 'css': 'wym_tools_preview'}
 					             ]
 					          };
-			$(jo).find('.htmleditor').wymeditor(wymSettings);
+			//$(jo).find('.htmleditor').wymeditor(wymSettings);
 			resizeWorkbench();
 		});
 }
diff --git a/themes/default/layout/index.php b/themes/default/layout/index.php
@@ -30,12 +30,15 @@
   <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-1.6.2.min.js"></script>
   <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/js/jquery-ui-1.8.16.custom.min.js"></script>
   <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.scrollTo.js"></script>
+  <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.simplemodal.1.4.2.min.js"></script>
+  <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.mjs.nestedSortable.js"></script>
+
   <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/openrat.js"></script>
   <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/wymeditor/wymeditor/jquery.wymeditor.min.js"></script>
   <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/jquery.markitup.js"></script>
-  <!-- 
   <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/ckeditor.js"></script>
   <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/adapters/jquery.js"></script>
+  <!-- 
   <script src="/~dankert/cms-test/cms09/themes/default/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>
   <script src="/~dankert/cms/themes/default/js/xxxxxxxxxxxjquery-plugin-orSearchBox.js"></script>
   <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/css/pepper-grinder/jquery-ui-1.8.9.custom.css" >