Fixes for Monstra 3

monstra-cms · Aug 7, 2014 · 9dc3078 · 9dc3078
1 parent d8401fe
commit 9dc3078
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/cleditor.plugin.php b/cleditor.plugin.php
@@ -22,7 +22,6 @@
 
 
     // Add hooks
-    /*Action::add('admin_editor', 'Cleditor::editor', 10, array());  */  
     Action::add('admin_header', 'Cleditor::headers');
 
 
@@ -32,10 +31,11 @@ class Cleditor {
          * Set editor headers
          */
         public static function headers() {
-            echo '
-          <link rel="stylesheet" type="text/css" href="'.Option::get('siteurl').'plugins/cleditor/cleditor/jquery.cleditor.css" />
-          <script type="text/javascript" src="'.Option::get('siteurl').'plugins/cleditor/cleditor/jquery.cleditor.min.js"></script>
-          <script type="text/javascript" src="'.Option::get('siteurl').'plugins/cleditor/cleditor/jquery.cleditor.plugins.js"></script>    
+            echo '            
+          <link rel="stylesheet" type="text/css" href="'.Option::get('siteurl').'/plugins/cleditor/cleditor/jquery.cleditor.css" />
+          <script type="text/javascript" src="'.Option::get('siteurl').'/plugins/cleditor/cleditor/jquery-migrate-1.2.1.js"></script>
+          <script type="text/javascript" src="'.Option::get('siteurl').'/plugins/cleditor/cleditor/jquery.cleditor.min.js"></script>
+          <script type="text/javascript" src="'.Option::get('siteurl').'/plugins/cleditor/cleditor/jquery.cleditor.plugins.js"></script>    
           <script type="text/javascript">
             // CLEditor plusimage Plugin v1.0
             (function($) {
@@ -127,7 +127,7 @@ function openKCFinder(field) {
                   }
               };
 
-              window.open("'.Option::get('siteurl').'plugins/cleditor/kcfinder/browse.php?type=image&lang='.Option::get('language').'", "kcfinder_textbox",
+              window.open("'.Option::get('siteurl').'/plugins/cleditor/kcfinder/browse.php?type=image&lang='.Option::get('language').'", "kcfinder_textbox",
                   "status=0, toolbar=0, location=0, menubar=0, directories=0, " +
                   "resizable=0, scrollbars=0, width=800, height=600"
               );

diff --git a/cleditor/jquery-migrate-1.2.1.js b/cleditor/jquery-migrate-1.2.1.js
diff --git a/kcfinder/tpl/tpl_javascript.php b/kcfinder/tpl/tpl_javascript.php
@@ -1,4 +1,5 @@
-<script src="../../../public/assets/js/jquery.js" type="text/javascript"></script>
+<script src="../../../public/assets/js/jquery.min.js" type="text/javascript"></script>
+<script src="../../../plugins/cleditor/cleditor/jquery-migrate-1.2.1.js" type="text/javascript"></script>
 <script src="js/jquery.rightClick.js" type="text/javascript"></script>
 <script src="js/jquery.drag.js" type="text/javascript"></script>
 <script src="js/helper.js" type="text/javascript"></script>