Changeset 23046 for main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js

Timestamp:

2010-10-05T17:08:06+13:00 (14 years ago)

Author:

sjb48

Message:

 

File:

• main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js (modified) (21 diffs)

main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js

@@ -11 +11 @@
 
     $(".element_type_gsf_template").draggable({
+            cursor: 'crosshair',
             connectToSortable: '#formatStatement',
             helper: 'clone',
@@ -17 +18 @@
 
     $(".element_type_table").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_template',
             helper: 'clone',
@@ -23 +25 @@
 
     $(".element_type_tr").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_table',
             helper: 'clone',
@@ -29 +32 @@
 
     $(".element_type_td").draggable({
+            cursor: 'crosshair',
             //connectToSortable: '.td',
             helper: 'clone',
@@ -35 +39 @@
 
     $(".element_type_text").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_otherwise, .gsf_link',
             helper: 'clone',
@@ -41 +46 @@
     
     $(".element_type_gsf_choose_metadata").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.td-div',
             helper: 'clone',
@@ -46 +52 @@
     });
 
-    $(".element_type_gsf_metadata").draggable({
+    //$(".element_type_gsf_metadata").draggable({
+    $(".gsf_metadata").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_choose_metadata, .gsf_when, .gsf_otherwise, .td-div',
             helper: 'clone',
@@ -53 +61 @@
 
     $(".element_type_gsf_link").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.td-div',
             helper: 'clone',
@@ -60 +69 @@
     // switch, when, otherwise, icon
     $(".element_type_gsf_switch").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.td-div',
             helper: 'clone',
@@ -66 +76 @@
 
     $(".element_type_gsf_when").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_switch',
             helper: 'clone',
@@ -72 +83 @@
 
     $(".element_type_gsf_otherwise").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_switch',
             helper: 'clone',
@@ -78 +90 @@
 
     $(".element_type_gsf_icon").draggable({
+            cursor: 'crosshair',
             connectToSortable: '.gsf_link',
             helper: 'clone',
@@ -147 +160 @@
                 }, });
 
+    //$(".droppable").sortable({
+    //        'cursor':'pointer',
+    //        'tolerance': 'pointer',
+    //        'items':'.column, .td-div',
+    //        'placeholder':'placeholder'
+    //});
+
     $(".droppable").droppable({
             accept: '.element_type_td',
@@ -153 +173 @@
             deactivate: function(event, ui) { $(this).removeClass("droppable_hl"); }, // console.log("droppable deactivated")},
             drop: function(event, ui) {
+                //if ($(this).hasClass("ui-draggable"))
+                //if (ui.helper.hasClass("ui-draggable"))
+                //{
                  var neverempty = document.createElement("div");
                  neverempty.setAttribute("class","neverempty block");
@@ -177 +200 @@
                  bind_block_mouseover();
                  //bind_all_sortables();
+                //}
+                //else
+                //{
+                //    console.log("Attempting to add");
+                    //$(this).appendTo(ui.draggable[0]);
+                //    $(this).prepend(ui.draggable[0]);
+                    //$(ui.draggable[0]).appendTo($(this));
+                //}
             }
         });
@@ -240 +271 @@
 function bind_td_sortable()
 {
+
+    $('tr').sortable({
+            'cursor':'pointer',
+            'tolerance': 'intersect',
+            'items':'.column',
+            'placeholder':'placeholder_td',
+            'connectWith':'column'});
+
+    //$('.column').sortable({
+    //    connectWith:['.column'],
+    //    placeholder: 'placeholder',
+    //    items:'td-div'
+    //});
+
+
+    //$('.column').sortable({
+    //        'cursor':'pointer',
+    //        'tolerance': 'pointer',
+    //        'items':'.td-div',
+    //        'placeholder':'placeholder',
+    //        'connectWith':'.column'
+            //'nested':'.gsf:metadata'
+            //receive: function(event, ui) { alert("Attempted to receive"); },
+            //stop: function(event, ui) {
+            //    if (ui.item.hasClass("ui-draggable") && ui.item.hasClass('element_type_gsf_metadata')) { replace_with(ui.item, gsf_metadata_element); }
+
+    //});
+
     //console.log('function bind_td_sortable()');
     $('.td-div').sortable({
@@ -246 +305 @@
             'items':'.gsf_metadata, .gsf_choose_metadata, .gsf_link, .gsf_switch',
             'placeholder':'placeholder',
-            'connectWith':'.td-div',
+            //'connectWith':'.td-div',
             //'nested':'.gsf:metadata'
             receive: function(event, ui) { alert("Attempted to receive"); },
@@ -278 +337 @@
             stop: function(event, ui) {
                 //alert("STOP");
-                if (ui.item.hasClass("ui-draggable") && ui.item.hasClass('element_type_gsf_metadata')) { replace_with(ui.item, gsf_metadata_element); }
+                //if (ui.item.hasClass("ui-draggable") && ui.item.hasClass('element_type_gsf_metadata')) { replace_with(ui.item, gsf_metadata_element); }
+                bind_all_sortables();
             }
     });
@@ -354 +414 @@
     {
         $(this).parents().css("border", "");
-        $(this).css("border", "1px solid blue");
+        $(this).css("border", "2px solid blue");
         return false;
     }).mouseout(function(){
@@ -372 +432 @@
     //console.log('var removeContent = (function ()');
         // this -> a -> td -> tr -> tbody -> table -> div
-        $(this).parent().parent().parent().parent().parent().remove();
+        //$(this).parent().parent().parent().parent().parent().remove();
+        $(this).closest(".block").remove();
     });
 
@@ -381 +442 @@
     console.log('parent: ' + $(this).html());
     if ($(this).html() == '[+]'){ //targetContent.css('display') == 'none') {
-        $(this).parent().parent().parent().parent().parent().children(".block,.table").slideDown(300);
+        //$(this).parent().parent().parent().parent().parent().children(".block,.table").slideDown(300);
+        //$(this).parents().children(".block,.table").stopPropagation().slideDown(300);
+        //var x = $(this).parent().parent().parent().parent().parent();
+        //var y = $(this).parent().parent().parent().parent().parent().children(".block,.table");
+        //var z = $(this).closest(".block").children(".table, .block");
+        $(this).closest(".block").children(".table, .block").slideDown(300);
         $(this).html('[-]');
         $(this).removeClass("ui-icon-plusthick");
         $(this).addClass("ui-icon-minusthick");
     } else {
-        $(this).parent().parent().parent().parent().parent().children(".block,.table").slideUp(300);
+        //$(this).parent().parent().parent().parent().parent().children(".block,.table").slideUp(300);
+        //$(this).parents().children(".block,.table").slideUp(300);
+        $(this).closest(".block").children(".table, .block").slideUp(300);
         $(this).html('[+]');
         $(this).removeClass("ui-icon-minusthick");