Changeset 13663

Timestamp:

11/27/07 16:51:21 (1 year ago)

Author:

adrenalin

Message:

Proceeding with the sortable widget.

Files:

• trunk/midcom/midcom.helper.datamanager2/locale/default.en.txt (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager2/locale/default.fi.txt (modified) (2 diffs)
• trunk/midcom/midcom.helper.datamanager2/static/jquery.widget_sortable.js (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager2/widget/select.php (modified) (2 diffs)
• trunk/midcom/midcom.helper.datamanager2/widget/sortable.php (modified) (4 diffs)

trunk/midcom/midcom.helper.datamanager2/locale/default.en.txt

@@ -205 +205 @@
----STRINGEND
-
+---STRING write the order, lower numbers are placed first
+Write the order, lower numbers are placed first
+---STRINGEND
+
+---STRING drag and drop to sort
+Drag and drop to sort
+---STRINGEND
+

trunk/midcom/midcom.helper.datamanager2/locale/default.fi.txt

@@ -92 +92 @@
----STRINGEND
-
+---STRING rotate left
+KierrÀ vasemmalle
+---STRINGEND
+
+---STRING rotate right
+KierrÀ oikealle
+---STRINGEND
+
----STRING type blobs: file size
-Tiedoston koko
----STRINGEND
-
+---STRING type image: actions
+Kuvan toiminnot
+---STRINGEND
+
----STRING type image: available sizes
-Saatavilla olevat koot
@@ -192 +204 @@
----STRINGEND
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+

trunk/midcom/midcom.helper.datamanager2/static/jquery.widget_sortable.js

@@ -1 +1 @@
-jQuery.fn.create_sortable = function()
-{
+    // Hide the inputs
+    $j(this).find('input[@type="text"]').css({display: 'none'});
+    
-    $j(this).each(function(i)
-    {
-        $j(this).sortable({
-
+
+
+
+
+
+
+
+
+
-        });
-    });
-}
+
+$j(document).ready(function()
+{
+    $j('body p.sortable-help').css({display: 'none !important'});
+    $j('body p.sortable-help-jquery').css({display: 'block !important'});
+});

trunk/midcom/midcom.helper.datamanager2/widget/select.php

@@ -49 +49 @@
-
-    /**
-pe
+ep
-     * group code. This makes tracking of empty return values much easier. It is
-     * populated during add_elements_to_form().
@@ -255 +255 @@
-
-    }
-
-}
-
-?>

trunk/midcom/midcom.helper.datamanager2/widget/sortable.php

@@ -35 +35 @@
-    
-    /**
+     * Select automatically every object. This is for using the widget only to sort, not to select what
+     * has been sorted.
+     *
+     * @access public
+     * @var boolean
+     */
+    var $select_all = false;
+    
+    /**
-     * The initialization event handler post-processes the maxlength setting.
-     *
@@ -91 +100 @@
-    function _create_select_element()
-    {
-        $this->_elements['s_header'] =& HTML_QuickForm::createElement('static', 's_header', '', "<ul id=\"{$this->name}_sortable\" class=\"sortable\">\n");
-        
-        $readonly = $this->_field['readonly'];
-        
@@ -117 +124 @@
-        }
-        
+        // Show the help text
+        // jQuery help text, hide for now
+        $html  = "<p style=\"display: none;\" class=\"sortable-help-jquery\">\n";
+        $html .= $this->_l10n->get('drag and drop to sort') . '.';
+        $html .= "</p>\n";
+        
+        // Non-jQuery help, show on default, but hide with jQuery
+        $html  .= "<p class=\"sortable-help\">\n";
+        $html .= $this->_l10n->get('write the order, lower numbers are placed first') . '.';
+        $html .= "</p>\n";
+        $html .= "<ul id=\"{$this->name}_sortable\" class=\"midcom_helper_datamanager2_widget_sortable\">\n";
+        
+        $this->_elements['s_header'] =& HTML_QuickForm::createElement('static', 's_header', '', $html);
+        
+        $i = 1;
+        
+        // Temporary array for the selection set
+        $temp = array();
+        
+        $all = $this->_type->list_all();
+        
+        foreach ($this->_type->selection as $key => $value)
+        {
+            if (isset($all[$value]))
+            {
+                $temp[$value] = $all[$value];
+            }
+            else
+            {
+                $temp[$value] = $value;
+            }
+        }
+        
+        foreach ($this->_type->list_all() as $key => $value)
+        {
+            if (array_key_exists($key, $temp))
+            {
+                continue;
+            }
+            
+            $temp[$key] = $value;
+        }
+        
+        // Reset the form data
-        $html = '';
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $html .= "    <li>\n";
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $html .= "    </li>\n";
-            $i++;
@@ -153 +228 @@
-    function sync_type_with_widget($results)
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}