Changeset 14468

Timestamp:

01/17/08 13:44:21 (11 months ago)

Author:

w_i

Message:

Added simple noscript support

Files:

• trunk/midcom/midcom.helper.datamanager2/exec/chooser_handler.php (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager2/static/chooser/jquery.chooser_widget.js (modified) (10 diffs)
• trunk/midcom/midcom.helper.datamanager2/static/chooser/jquery.chooser_widget.pack.js (deleted)
• trunk/midcom/midcom.helper.datamanager2/widget/chooser.php (modified) (16 diffs)

trunk/midcom/midcom.helper.datamanager2/exec/chooser_handler.php

@@ -67 +67 @@
-}
-
-
-
-
-
+// 
+// 
+
+// 
-
-debug_pop();

trunk/midcom/midcom.helper.datamanager2/static/chooser/jquery.chooser_widget.js

@@ -35 +35 @@
-        // });
-    },
-
-
-
+data, 
+
+data, 
-    },
-    midcom_helper_datamanager2_widget_chooser_remove_result_item: function(item_id)
@@ -79 +79 @@
-        insert_after = creation_dialog;
-    }
+    
+    input_element.show();
-    
-    var results_holder = jQuery.midcom_helper_datamanager2_widget_chooser.ResultsHolder(options, input, insert_after, selectCurrent);    
@@ -296 +298 @@
-        input_element.focus();
-        results_holder.activate_item(data);
-
-
+data, 
+data, 
-    }).bind("remove_result_item", function(event, item_id){
-        results_holder.del_item();
@@ -308 +310 @@
-        creation_dialog = jQuery('#' + options.widget_id + '_creation_dialog');
-        create_button = jQuery('#' + options.widget_id + '_create_button');
+        create_button.css('display', 'block');
-        create_button.bind('click', function(){
-            if (jQuery('#' + options.widget_id + '_creation_dialog').css('display') == 'block')
@@ -460 +463 @@
-    }
-    
-
+, item
-    {
-        // console.log('ResultsHolder add');
@@ -468 +471 @@
-        
-        var n=null;
-        jQuery.each( options.result_headers, function(i,n) {
-            //console.log("data."+n.name+": "+data[n.name]);
-        });
-        
-        var item_id = data[options.id_field];
-        //console.log('options.id_field: '+options.id_field);
-        //console.log('item_id: '+item_id);
+        
+        // var static_row = jQuery("#" + options.widget_id + "_existing_item_" + item_id + "_row");
+        // if (typeof static_row[0] != 'undefined')
+        // {
+        //     var static_input = jQuery("#" + options.widget_id + "_existing_item_" + item_id + "_input");
+        //     static_input.delete();
+        //     static_row.delete();
+        // }
+        
-        if (! can_add(item_id))
-        {
@@ -483 +492 @@
-        //console.log("Can add!");
-        
-
+ 
-        {
-            has_content = true;
@@ -550 +559 @@
-        }        
-        
-
+
+
-        {
-            //console.log("use renderer");
-
-
+
-            //          We could use custom javascript function, or require the data
-            //          object to contain a content field which is already formatted html...
-
-
-
+
+
+
+
-            .appendTo(li_elem);
-        }
@@ -568 +578 @@
-            var input_elem = jQuery("<input type=\"hidden\">")
-            .attr({ name: input_elem_name, value: 0, id: options.widget_id + '_result_item_'+item_id+'_input' })
-            .hide()
-            .appendTo(li_elem);
-        }
@@ -734 +743 @@
-            dataToDom();
-        },
-
-
-
-item
+data, 
+
+data, 
+data
-            activate(item_id);
-        },

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

@@ -7 +7 @@
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- */
+
+if (! class_exists('midcom_helper_reflector'))
+{
+    $filename = MIDCOM_ROOT . "/midcom/helper/reflector.php";
+    require_once($filename);
+}
-
-/**
@@ -283 +289 @@
-     */
-    var $widget_elements = array();
-
+
+
+
+
-    var $allow_multiple = true;
-    var $require_corresponding_option = true;
@@ -766 +775 @@
-        {
-            // debug_add("clever class {$this->clever_class} not found in predefined list. Trying to use reflector");
-            $_MIDCOM->componentloader->load_graceful('midgard.admin.asgard');
-
-            $matching_type = false;
@@ -817 +825 @@
-            }
-
-aa_reflector =& new midgard_admin_asgard
+idcom_reflector =& new midcom_helper
-            $mgd_reflector = new midgard_reflection_property($matching_type);
-
@@ -846 +854 @@
-            if (empty($labels))
-            {
-aa
+idcom
-                // debug_print_r('$label_properties',$label_properties);
-                if (is_array($label_properties))
@@ -874 +882 @@
-            if (empty($this->searchfields))
-            {
-aa
+idcom
-                if (empty($this->searchfields))
-                {
@@ -885 +893 @@
-            }
-
-aa
+idcom
-            if (empty($this->result_headers))
-            {
@@ -1079 +1087 @@
-                'class'         => 'shorttext chooser_widget_search_input',
-                'id'            => "{$this->_element_id}_search_input",
+                'style'         => "display: none;",
-            )
-        );
@@ -1097 +1106 @@
-            $dialog_html .= '</div>';
-
-
+ style="display: none;"
-            $button_html .= '</div>';
-
@@ -1143 +1152 @@
-        // debug_pop();
-
+        $this->_static_items_html = "<noscript>\n";        
+        $this->_static_items_html .= "<table class=\"widget_chooser_static_items_table\">\n<thead><tr>\n";
+        
+        if (   !empty($this->reflector_key)
+            && !$this->result_headers)
+        {
+            $title = $_MIDCOM->i18n->get_string('Label', 'midcom');
+            $this->_static_items_html .= "    <th class=\"label\">{$title}&nbsp;</th>\n";
+        }
+        else
+        {
+            foreach ($this->result_headers as $header_item)
+            {
+                $this->_static_items_html .= "    <th class=\"{$header_item['name']}\">{$header_item['title']}&nbsp;</th>\n";
+            }            
+        }
+        
+        $title = $_MIDCOM->i18n->get_string('Selected', 'midcom.helper.datamanager2');
+        $this->_static_items_html .= "    <th class=\"selected\">{$title}&nbsp;</th>\n";
+        
+        $this->_static_items_html .= "</tr></thead>\n<tbody>\n";
+        
-        $ee_script = '';
-        if ($this->_renderer_callback)
@@ -1156 +1187 @@
-                    // debug_add("Got item: {$item}");
-                    $ee_script .= "jQuery('#{$this->_element_id}_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item({$data},'{$item}');\n";
+
+                    $this->_add_existing_item_as_static($key);
-                }
-            }
@@ -1164 +1197 @@
-            {
-                // debug_add("Processing key {$key}");
+                $this->_add_existing_item_as_static($key);
-                $data = $this->_get_key_data($key);
-                if ($data)
@@ -1169 +1203 @@
-                    // debug_add("Got data: {$data}");
-                    $ee_script .= "jQuery('#{$this->_element_id}_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item({$data});\n";
-
-
-
+
+
+
+
+
+
-        $this->_jscript .= $ee_script;
-
-        $this->_jscript .= '});';
-        $this->_jscript .= '</script>';
+
+        $this->_static_items_html .= "</tbody>\n";
+        $this->_static_items_html .= "</table>\n";
+        $this->_static_items_html .= "</noscript>\n";
-
-        //$this->_form->addElement('static', "{$this->_element_id}_initscripts", '', $this->_jscript);
@@ -1186 +1227 @@
-            $this->_jscript
-        );
+        
+        $this->widget_elements[] =& HTML_QuickForm::createElement
+        (
+            'static',
+            "{$this->_element_id}_noscript",
+            '',
+            $this->_static_items_html
+        );
-
-        $group =& $this->_form->addGroup($this->widget_elements, $this->name, $this->_translate($this->_field['title']), '', array('class' => 'midcom_helper_datamanager2_widget_chooser'));
+    }
+    
+    function _add_existing_item_as_static($key)
+    {
+        $object =& $this->_get_key_data($key, false, true);
+        $id_field = $this->id_field;
+        $item_id = @$object->$id_field;
+        
+        if (   empty($item_id)
+            || isset($this->_added_static_items[$item_id]))
+        {
+            return;
+        }
+        
+        $this->_static_items_html .= "<tr id=\"{$this->_element_id}_existing_item_{$item_id}_row\" class=\"chooser_widget_existing_item_static_row\">\n";
+        
+        if (   !empty($this->reflector_key)
+            && !$this->result_headers)
+        {
+            $value = @$object->get_label();
+            $value = rawurlencode($value);
+            //debug_add("adding header item: name=label value={$value}");
+            $title = $_MIDCOM->i18n->get_string('label', 'midcom');
+            $this->_static_items_html .= "<td class=\"label\">{$value}&nbsp;</td>\n";
+        }
+        else
+        {
+            foreach ($this->result_headers as $header_item)
+            {
+                $item_name = $header_item['name'];
+                $value = @$object->$item_name;
+                $value = rawurlencode(utf8_decode($value));
+                // debug_add("adding header item: name={$item_name} value={$value}");
+        //         
+                $this->_static_items_html .= "<td class=\"{$item_name}\">{$value}&nbsp;</td>";
+            }
+        }
+        
+        $this->_static_items_html .= "<td>\n";
+        $this->_static_items_html .= "<input type=\"checkbox\" name=\"{$this->_element_id}_selections[{$item_id}]\" id=\"{$this->_element_id}_existing_item_{$item_id}_value\" class=\"chooser_widget_existing_item_static_input\" checked=\"checked\"/>\n";
+        $this->_static_items_html .= "</td>\n";
+        
+        $this->_static_items_html .= "</tr>\n";
+        
+        $this->_added_static_items[$item_id] = true;
-    }
-
@@ -1284 +1378 @@
-    }
-
-
+, $return_object=false
-    {
-        // debug_push_class(__CLASS__, __FUNCTION__);
@@ -1359 +1453 @@
-
-        $_MIDCOM->auth->drop_sudo();
-
+
-        // debug_pop();
+
+        if ($return_object)
+        {
+            return $object;
+        }
-
-        if ($in_render_mode)