X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_tabs.inc;h=6d1b5e871781daf574a885a21751473dd6e8ffe6;hb=198fc11cacca32ca2c0dc33505bde39a38b999e6;hp=9f52e45a6af012b8ce4fcac64292d47ea71f2c25;hpb=75ac2800eeca1afdd4a9702e8ada9c5ec9e82783;p=gosa.git diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc index 9f52e45a6..6d1b5e871 100644 --- a/gosa-core/include/class_tabs.inc +++ b/gosa-core/include/class_tabs.inc @@ -54,7 +54,7 @@ class tabs if(!count($data)) { $data[] = array("CLASS" => 'plugin',"NAME" => 'Error'); msg_dialog::display(_("Error"), - sprintf(_("No plugin definitions found to initialize '%s', please check your configuration file."),get_class($this)), + sprintf(_("No plugin definition for %s found: please check the configuration file!"), bold(get_class($this))), "ERROR_DIALOG"); } @@ -63,7 +63,7 @@ class tabs foreach ($data as &$tab){ if (!plugin_available($tab['CLASS'])){ - trigger_error(sprintf("Unknown class '%s'!", $tab['CLASS'])); + trigger_error(sprintf("Unknown class %s!", bold($tab['CLASS']))); continue; } if ($this->current == "") $this->current= $tab['CLASS']; @@ -114,6 +114,8 @@ class tabs $this->current = key($this->by_name); } + pathNavigator::registerPlugin($this); + // Rotate current to last $this->last= $this->current; @@ -140,13 +142,21 @@ class tabs $display= $this->by_object[$this->current]->multiple_execute(); } $tabs= $this->gen_tabs(); - $display = - "\n {$tabs}". - "\n ". - "\n
". - "\n {$display}". - "\n
"; + if($this->is_modal_dialog()){ + $display = + "\n
". + "\n {$display}". + "\n
"; + }else{ + + $display = + "\n {$tabs}". + "\n ". + "\n
". + "\n {$display}". + "\n
"; + } return ($display); } @@ -236,7 +246,7 @@ class tabs foreach (array_reverse($this->by_object) as $key => $obj){ $reason= $obj->allow_remove(); if ($reason != ""){ - msg_dialog::display(_("Warning"), sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason), WARNING_DIALOG); + msg_dialog::display(_("Warning"), sprintf(_("Delete process has been canceled by plugin %s: %s"), bold($key), $reason), WARNING_DIALOG); return; } } @@ -377,6 +387,7 @@ class tabs $this->by_name['reference']= _("References"); $this->by_object['reference']= new reference($this->config, $this->dn); $this->by_object['reference']->parent= &$this; + $this->by_object['reference']->set_acl_category($this->acl_category); } } @@ -437,6 +448,7 @@ class tabs foreach($this->by_object as $name => $obj){ $this->by_object[$name]->read_only = $s; } + $this->read_only = $s; } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: