Changeset 16821

Timestamp:

07/08/08 16:57:26 (5 months ago)

Author:

adrenalin

Message:

Forward-porting a bunch of changes: r16626, r16699, r16700, r16771 and
r16772

Files:

• trunk/midcom/midgard.admin.asgard/config/config.inc (modified) (1 diff)
• trunk/midcom/midgard.admin.asgard/handler/type.php (modified) (2 diffs)
• trunk/midcom/midgard.admin.asgard/navigation.php (modified) (2 diffs)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type.php (modified) (2 diffs)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type_children_footer.php (added)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type_children_header.php (added)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type_children_item.php (added)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type_children_start.php (added)
• trunk/midcom/midgard.admin.asgard/tree.php (modified) (1 diff)

trunk/midcom/midgard.admin.asgard/config/config.inc

@@ -94 +94 @@
-'midgard_types' => '',              // List of types, imploded and wrapped (e.g. |midgard_article|,|midgard_topic|)
-'midgard_types_regexp' => '',       // Perl-styled regular expression
-'edit_mode' => false,               // Enable to enter straight to the edit mode and to skip viewing mode
-
-// Welcome page

trunk/midcom/midgard.admin.asgard/handler/type.php

@@ -16 +16 @@
-{
-    var $type = '';
+    var $_show_type_children_headers = true;
-
-    /**
@@ -298 +299 @@
-        midcom_show_style('midgard_admin_asgard_middle');
-
+        // Show the garbage bins of child types
-        $data['type'] = $this->type;
+        $data['reflector'] = new midcom_helper_reflector_tree($this->type);
+        $data['type_name'] = $this->type;
+        $data['type_translated'] = $data['reflector']->get_class_label();
+        
-        midcom_show_style('midgard_admin_asgard_type');
+        
+        $class = $this->type;
+        
+        $data['used_types'][] = $data['type'];
+        $data['used_types'][] = $_MIDCOM->dbclassloader->get_midcom_class_name_for_legacy_midgard_class($this->type);
+        
+        $data['prefix'] = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
+        
+        $this->_show_headers = false;
+        
+        $types = $data['reflector']->get_child_classes();
+        
+        if (count($types) > 0)
+        {
+            midcom_show_style('midgard_admin_asgard_type_children_start');
+            $this->show_child_types($this->type, &$data);
+            midcom_show_style('midgard_admin_asgard_type_children_end');
+        }
+        
-        midcom_show_style('midgard_admin_asgard_footer');
+    }
+    
+    function show_child_types($type, &$data)
+    {
+        $types = $data['reflector']->get_child_classes();
+        $first = true;
+        
+        foreach ($types as $child_type)
+        {
+            if (in_array($child_type, $data['used_types']))
+            {
+                continue;
+            }
+            
+            // Show the header on first item. Has to be inside foreach loop, since we are
+            // 
+            if ($first)
+            {
+                $first = false;
+                midcom_show_style('midgard_admin_asgard_type_children_header');
+            }
+            
+            $data['reflector'] = new midcom_helper_reflector_tree($child_type);
+            
+            $data['type_name'] = $child_type;
+            $data['type_translated'] = $data['reflector']->get_class_label();
+            
+            $data['used_types'][] = $child_type;
+            
+            midcom_show_style('midgard_admin_asgard_type_children_item');
+        }
+        
+        // Not a single type was shown, skip the footer item
+        if ($first)
+        {
+            return;
+        }
+        
+        midcom_show_style('midgard_admin_asgard_type_children_footer');
-    }
-}

trunk/midcom/midgard.admin.asgard/navigation.php

@@ -247 +247 @@
-            echo "<a href=\"{$_MIDGARD['self']}__mfa/asgard/object/{$this->_request_data['default_mode']}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-
-
-
-
+
-            if ($selected || sizeof($root_objects) == 1)
-            {
@@ -445 +443 @@
-                    $this->_list_root_elements($root_objects, &$ref);
-                }
-
-            }
-            midcom_show_style('midgard_admin_asgard_navigation_section_footer');

trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_type.php

@@ -94 +94 @@
-            echo "        <tr>\n";
-            echo "            <td><a href=\"{$prefix}__mfa/asgard/object/{$data['default_mode']}/{$result->guid}/\">{$icon} {$label}</a></td>\n";
- class=\"nowrap\"
+
-
-            if ($persons[$result->metadata->creator]->guid)
@@ -113 +113 @@
-        echo "            \$j('#search_results').tablesorter(\n";
-        echo "            {\n ";
-\n
+
-        echo "                sortList: [[0,0]]\n";
-        echo "            });\n";

trunk/midcom/midgard.admin.asgard/tree.php

@@ -12 +12 @@
- * @package midgard.admin.asgard
- */
- 
+
-{
-    /**