Merge https://github.com/friendica/friendica into pull

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

diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
old mode 100755 (executable)
new mode 100644 (file)
index b44ea78..9c0037f
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -14,9 +14,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 +53,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 +133,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();
@@ -195,21 +195,26 @@ function initEditor(cb) {
        });
 
        function deleteCheckedItems() {
-               var checkedstr = '';
-
-               $('.item-select').each( function() {
-                       if($(this).is(':checked')) {
-                               if(checkedstr.length != 0) {
-                                       checkedstr = checkedstr + ',' + $(this).val();
-                               }
-                               else {
-                                       checkedstr = $(this).val();
-                               }
-                       }       
-               });
-               $.post('item', { dropitems: checkedstr }, function(data) {
-                       window.location.reload();
-               });
+               if(confirm('$delitems')) {
+                       var checkedstr = '';
+
+                       $("#item-delete-selected").hide();
+                       $('#item-delete-selected-rotator').show();
+
+                       $('.item-select').each( function() {
+                               if($(this).is(':checked')) {
+                                       if(checkedstr.length != 0) {
+                                               checkedstr = checkedstr + ',' + $(this).val();
+                                       }
+                                       else {
+                                               checkedstr = $(this).val();
+                                       }
+                               }       
+                       });
+                       $.post('item', { dropitems: checkedstr }, function(data) {
+                               window.location.reload();
+                       });
+               }
        }
 
        function jotGetLink() {
@@ -304,6 +309,41 @@ function initEditor(cb) {
                        }
                }
        }
+       
+       function itemFiler(id) {
+               
+               var bordercolor = $("input").css("border-color");
+               
+               $.get('filer/', function(data){
+                       $.colorbox({html:data});
+                       $("#id_term").keypress(function(){
+                               $(this).css("border-color",bordercolor);
+                       })
+                       $("#select_term").change(function(){
+                               $("#id_term").css("border-color",bordercolor);
+                       })
+                       
+                       $("#filer_save").click(function(e){
+                               e.preventDefault();
+                               reply = $("#id_term").val();
+                               if(reply && reply.length) {
+                                       commentBusy = true;
+                                       $('body').css('cursor', 'wait');
+                                       $.get('filer/' + id + '?term=' + reply);
+                                       if(timer) clearTimeout(timer);
+                                       timer = setTimeout(NavUpdate,3000);
+                                       liking = 1;
+                                       $.colorbox.close();
+                               } else {
+                                       $("#id_term").css("border-color","#FF0000");
+                               }
+                               return false;
+                       });
+               });
+               
+       }
+
+       
 
        function jotClearLocation() {
                $('#jot-coord').val('');