Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify

[friendica.git] / view / theme / testbubble / smarty3 / jot-header.tpl

diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
index 13d1673946f754a3a0e1668c3781e8a725ec2dda..6b082738def04738831c0ecc9c8dc197376f76f9 100644 (file)
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ b/view/theme/testbubble/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
@@ -14,9 +19,9 @@ function initEditor(cb) {
             $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
             $(".jothidden").show();
             editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
+            $("a#jot-perms-icon").colorbox({
+                               'inline' : true,
+                               'transition' : 'elastic'
             });
                                    $("#profile-jot-submit-wrapper").show();
                                                                {{if $newpost}}
@@ -53,9 +58,9 @@ function initEditor(cb) {
                 entity_encoding : "raw",
                 add_unload_trigger : false,
                 remove_linebreaks : false,
-                force_p_newlines : false,
-                force_br_newlines : true,
-                forced_root_block : '',
+                //force_p_newlines : false,
+                //force_br_newlines : true,
+                forced_root_block : 'div',
                 convert_urls: false,
                 content_css: "{{$baseurl}}/view/custom_tinymce.css",
                 theme_advanced_path : false,
@@ -133,9 +138,9 @@ function initEditor(cb) {
         });
         editor = true;
         // setup acl popup
-        $("a#jot-perms-icon").fancybox({
-            'transitionIn' : 'none',
-            'transitionOut' : 'none'
+        $("a#jot-perms-icon").colorbox({
+                       'inline' : true,
+                       'transition' : 'elastic'
         }); 
     } else {
         if (typeof cb!="undefined") cb();
@@ -315,7 +320,7 @@ function initEditor(cb) {
                var bordercolor = $("input").css("border-color");
                
                $.get('filer/', function(data){
-                       $.fancybox(data);
+                       $.colorbox({html:data});
                        $("#id_term").keypress(function(){
                                $(this).css("border-color",bordercolor);
                        })
@@ -333,7 +338,7 @@ function initEditor(cb) {
                                        if(timer) clearTimeout(timer);
                                        timer = setTimeout(NavUpdate,3000);
                                        liking = 1;
-                                       $.fancybox.close();
+                                       $.colorbox.close();
                                } else {
                                        $("#id_term").css("border-color","#FF0000");
                                }