Changeset 14487

Timestamp:

01/17/08 16:46:15 (11 months ago)

Author:

bergie

Message:

Minor UI tweaking

Files:

• trunk/midcom/midcom.helper.reflector/config/config.inc (modified) (1 diff)
• trunk/midcom/midgard.admin.asgard/handler/component/configuration.php (modified) (3 diffs)
• trunk/midcom/midgard.admin.asgard/handler/components.php (modified) (1 diff)
• trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_trash_type.php (modified) (1 diff)

trunk/midcom/midcom.helper.reflector/config/config.inc

@@ -47 +47 @@
-    'midgard_group',
-    'org_openpsa_organization',
+    /* Replicator subscriptions have their own specific admin UI */
+    'midcom_helper_replicator_subscription',
-),
-// Classes that should always be listed as root class (mainly workaround for schema bugs)

trunk/midcom/midgard.admin.asgard/handler/component/configuration.php

@@ -79 +79 @@
-        midgard_admin_asgard_plugin::get_common_toolbar($this->_request_data);
-    }
+    
+    function _prepare_breadcrumbs($handler_id)
+    {
+        // Set the breadcrumb data
+        $tmp = array();
+        $tmp[] = array
+        (
+            MIDCOM_NAV_URL => '__mfa/asgard/',
+            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('midgard.admin.asgard', 'midgard.admin.asgard'),
+        );
+        $tmp[] = array
+        (
+            MIDCOM_NAV_URL => '__mfa/asgard/components/',
+            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('components', 'midgard.admin.asgard'),
+        );
+        $tmp[] = array
+        (
+            MIDCOM_NAV_URL => "__mfa/asgard/components/{$this->_request_data['name']}/",
+            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string($this->_request_data['name'], $this->_request_data['name']),
+        );
+        $tmp[] = array
+        (
+            MIDCOM_NAV_URL => "__mfa/asgard/components/configuration/{$this->_request_data['name']}/",
+            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('component configuration', 'midcom'),
+        );
+        
+        if ($handler_id == '____mfa-asgard-components_configuration_edit')
+        {
+            $tmp[] = array
+            (
+                MIDCOM_NAV_URL => "__mfa/asgard/components/configuration/{$this->_request_data['name']}/edit/",
+                MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('edit', 'midcom'),
+            );
+        }
+        
+        $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);
+    }
-
-    function _load_configs($component, $object = null)
@@ -214 +251 @@
-        $this->_prepare_toolbar($handler_id);
-        $_MIDCOM->set_pagetitle($data['view_title']);
-
+
-        return true;
-    }
@@ -509 +546 @@
-            $this->_prepare_toolbar($handler_id);
-            $data['view_title'] = sprintf($this->_l10n->get('edit configuration for %s'), $data['name']);
+            $this->_prepare_breadcrumbs($handler_id);
-        }
-

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

@@ -206 +206 @@
-        midgard_admin_asgard_plugin::get_common_toolbar($data);
-
+        $data['asgard_toolbar']->add_item
+        (
+            array
+            (
+                MIDCOM_TOOLBAR_URL => "__mfa/asgard/components/configuration/{$data['component']}",
+                MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('component configuration', 'midcom'),
+                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
+            )
+        );
-
-        // Set the breadcrumb data

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

@@ -38 +38 @@
-        $disabled = ' disabled="disabled"';
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    echo "{$prefix}    <td class=\"checkbox\"><input type=\"checkbox\" name=\"undelete[]\"{$disabled} value=\"{$object->guid}\" id=\"{$object->guid}\" /></td>\n";
-    //echo "{$prefix}    <td class=\"label\" style=\"padding-left: {$indent}px\"><label for=\"{$object->guid}\"><a href=\"{$url_prefix}__mfa/asgard/object/view/{$object->guid}/\">{$icon} {$object->$label}</a></label></td>\n";