Changeset 16679

Timestamp:

06/23/08 17:30:52 (5 months ago)

Author:

adrenalin

Message:

Tabledata widget in beta stage. Fixed widgets downloads and images to
fit the current JavaScript? sorting model.

Files:

• branches/MidCOM_2_8/midcom.helper.datamanager2/static/datamanager2.tablesorter.js (modified) (7 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/static/legacy.css (modified) (1 diff)
• branches/MidCOM_2_8/midcom.helper.datamanager2/type/blobs.php (modified) (1 diff)
• branches/MidCOM_2_8/midcom.helper.datamanager2/type/tabledata.php (modified) (8 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/widget/downloads.php (modified) (2 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/widget/images.php (modified) (2 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/widget/tabledata.php (modified) (4 diffs)

branches/MidCOM_2_8/midcom.helper.datamanager2/static/datamanager2.tablesorter.js

@@ -1 +1 @@
-jQuery.fn.create_sortable = function(options)
-{
-    console.log(options);
-    
-    jQuery(this).addClass('jquery-enabled');
-    jQuery(this).find('th.index').text('');
@@ -13 +11 @@
-    });
-    
+    jQuery(this).find('tfoot td.new_row')
+        .unbind('click')
+        .click(function()
+        {
+            var new_row = jQuery(this).parent().clone(true);
+            jQuery(new_row).find('img.add-row').remove();
+            
+            // Insert the rows
+            jQuery(new_row)
+                .appendTo(jQuery(this).parents('table.jquery-enabled').find('tbody'));
+            
+            jQuery(new_row).find('input').each(function(i)
+            {
+                var name = jQuery(this).attr('name');
+                var size = jQuery(this).parents('table.jquery-enabled').find('tbody tr').size() - 1;
+                
+                if (name)
+                {
+                    name = name.replace(/index/, size);
+                    jQuery(this).attr('name', name);
+                }
+                
+                var id = jQuery(this).attr('id');
+                
+                if (id)
+                {
+                    id = id.replace(/index/, size);
+                    jQuery(this).attr('id', id);
+                }
+                
+                var value = jQuery(this).attr('value');
+                
+                if (value)
+                {
+                    value = value.replace(/__new_row__index/, '__new_row__' + size);
+                    jQuery(this).attr('value', value);
+                }
+            });
+            
+            jQuery(new_row).find('td.new_row')
+                .unbind('click')
+                .removeClass('new_row');
+            
+            jQuery(this).parents('table.jquery-enabled').create_sortable(options);
+            jQuery(this).rearrange_scores();
+            
+            // Check the amount of rows presented
+            var row_count = jQuery(this).parents('table.jquery-enabled').find('tbody tr').size();
+            
+            if (   options.max_count != 0
+                && row_count >= options.max_count)
+            {
+                jQuery(this)
+                    .fadeTo(500, 0.5)
+                    .unbind('click');
+                return false;
+            }
+        });
+    
-    // Less than two, no point in initializing the sortable
-
-
-
+
+
+
+
-        jQuery(this).find('th.index').css({display: 'none'});
-        return;
-    }
+    
+    jQuery('tbody td.midcom_helper_datamanager2_helper_sortable').css({display: 'table-cell'});
+    jQuery(this).find('th.index').css({display: 'table-cell'});
-    
-    // IE6 compliant hovering
@@ -35 +96 @@
-    
-    
-
+body t
-    {
-        if (jQuery(this).find('img.down').size() == 0)
@@ -70 +131 @@
-    });
-    
-
-
+
+
+
+
+
+
+
+
-        jQuery('<img />')
-            .addClass('delete')
@@ -105 +172 @@
-            .prependTo(jQuery(this));
-    });
-
+
+
+
+
+
+
+
+
+
+
+
-    jQuery(this).rearrange_scores();
-}
@@ -122 +199 @@
-        case 'up':
-            jQuery(parent).insertBefore(jQuery(parent).prev('tr'));
-
+.jquery-enabled
-            break;
-        case 'down':
-            jQuery(parent).insertAfter(jQuery(parent).next('tr'));
-
+.jquery-enabled
-            break;
-    }
@@ -133 +210 @@
-jQuery.fn.rearrange_scores = function()
-{
-
-
-
+body t
+
+body t
-    {
-        var last_index = size - 1;

branches/MidCOM_2_8/midcom.helper.datamanager2/static/legacy.css

@@ -345 +345 @@
-}
-
+form.datamanager2 table.jquery-enabled tfoot td.new_row
+{
+  display: table-cell;
+}
+
-form.datamanager2 table.jquery-enabled tr.deleted td input
-{

branches/MidCOM_2_8/midcom.helper.datamanager2/type/blobs.php

@@ -353 +353 @@
-        $temp = array();
-        
-
+
+
+
-        foreach ($this->attachments as $identifier => $attachment)
-        {

branches/MidCOM_2_8/midcom.helper.datamanager2/type/tabledata.php

@@ -92 +92 @@
-    
-    /**
+     * Should adding new columns be allowed?
+     *
+     * @access public
+     * @var boolean
+     */
+    var $allow_new_columns = false;
+    
+    /**
-     * Parameter domain that will be used to store the data
-     * 
@@ -131 +139 @@
-    function _on_initialize()
-    {
-
+
+
+
+
+
+
+
+
-        if ($this->sortable_rows)
-        {
-
-
-
-
-
-
+
+
+
+
+
-        }
-        
@@ -148 +162 @@
-                jQuery('#midcom_helper_datamanager2_{$this->name}_widget_tabledata')
-                    .create_sortable({
-
+
+
+
-                    });
-            });
@@ -242 +258 @@
-            
-            if (   $order
-
+
+
-            {
-                // Reinitialize the returned array
@@ -468 +485 @@
-                }
-                
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    {
-                        $index++;
@@ -483 +508 @@
-                    }
-                    
+                    // Remove the existing row and replace it with new
+                    unset($this->_storage_data[$row]);
+                    
+                    $this->_storage_data["{$index}"] = $array;
+                    
+                    if (in_array($row, $this->_row_order))
+                    {
+                        $key = array_search($row, $this->_row_order);
+                        $this->_row_order[$key] = "{$index}";
+                    }
+                    
-                    // Store to new indexes
-
-
-
-
+
+
+
+
+
+
+
+
-                foreach ($array as $column => $value)
-                {
+                    if ($value)
+                    {
+                        $hits = true;
+                    }
+                    
-                    $this->storage->object->set_parameter($this->parameter_domain, "{$this->name}{$this->storage_mode_parameter_limiter}{$row}{$this->storage_mode_parameter_limiter}{$column}", $value);
+                }
+                
+                if (!$hits)
+                {
+                    $key = array_search($row, $this->_row_order);
+                    unset($this->_row_order[$key]);
+                    unset($this->_storage_data[$row]);
-                }
-            }
@@ -530 +582 @@
-            {
-                $key = array_search($old, $this->_row_order);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $this->storage->object->set_parameter('midcom.helper.datamanager2.type.tabledata.order', $this->name, serialize($this->_row_order));
-        }
@@ -623 +690 @@
-        $output .= "</table>\n";
-        
-        echo $output;
-        return $output;
-    }

branches/MidCOM_2_8/midcom.helper.datamanager2/widget/downloads.php

@@ -117 +117 @@
-            $this->max_count = $this->_type->max_count;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return true;
-    }
@@ -246 +263 @@
-        if ($this->_type->sortable)
-        {
-
+
+
+
+
-            $this->_sort_index++;
-        }

branches/MidCOM_2_8/midcom.helper.datamanager2/widget/images.php

@@ -122 +122 @@
-        }
-
+        // Create sortable
+        if ($this->_type->sortable)
+        {
+            // Configuration options
+            $_MIDCOM->add_jscript("
+                jQuery(document).ready(function()
+                {
+                    jQuery('#{$this->_namespace}{$this->name}')
+                        .create_sortable({
+                            max_count: 0,
+                            sortable: true,
+                            allow_delete: false
+                        });
+                });
+            ");
+        }
+        
-        $_MIDCOM->add_jscript($this->_get_filename_validation_script());
-
@@ -394 +411 @@
-        if ($this->_type->sortable)
-        {
-" . $info['object']->guid . "
+{$this->_sort_index}
-            $this->_sort_index++;
-        }

branches/MidCOM_2_8/midcom.helper.datamanager2/widget/tabledata.php

@@ -82 +82 @@
-            $html .= "    <tfoot>\n";
-            $html .= "        <tr>\n";
-
+
+
+
+
-            $html .= $this->_add_columns('__new_row__index');
-            $html .= "        </tr>\n";
@@ -114 +117 @@
-            if ($this->_type->sortable_rows)
-            {
-
+
+
+
-            }
-            
@@ -195 +200 @@
-                || count($rows) < $this->_type->row_limit))
-        {
-
+0
-        }
-        
@@ -212 +217 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            && isset($_REQUEST['midcom_helper_datamanager2_sortable'])
-            && isset($_REQUEST['midcom_helper_datamanager2_sortable'][$this->name]))
-        {
-
+
+
+
+
-        }
-    }