diff --git a/lam/help/help.inc b/lam/help/help.inc index f2a09e45..e8998b35 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -137,9 +137,16 @@ $helpArray = array ( "Text" => _("Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten.")), "361" => array ("ext" => "FALSE", "Headline" => _("DN suffix"), "Text" => _("The new account will be saved under this LDAP suffix.")), - // 400 - 599 - // unused - + // 400 - 499 + // account pages + "401" => array ("ext" => "FALSE", "Headline" => _("Load profile"), + "Text" => _("Here you can load an account profile to set default settings for your account. The default profile is automatically loaded for new accounts.")), + "402" => array ("ext" => "FALSE", "Headline" => _("Save account"), + "Text" => _("This saves your account to the LDAP database.")), + "403" => array ("ext" => "FALSE", "Headline" => _("Create PDF file"), + "Text" => _("Here you can select a PDF structure and export the account to a PDF file.")), + // 500 - 599 + // unused // 600 - 699 // Roland Gruber // OU-editor, domain page diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 7921c948..a11150c8 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -934,10 +934,9 @@ class accountContainer { } } // Create left module-menu - echo "\n\n\n
"; - echo ""; + echo "
\n\n"; - echo "
"; - echo "
type."edit\">"; + echo "
type."edit\">"; echo _('Please select page:'); echo "\n"; // calculate button width @@ -973,15 +972,15 @@ class accountContainer { if ($this->subpage == 'finish') echo " disabled"; echo ">
\n"; } - echo "
"; + echo "\n"; + echo ""; if ($this->current_page==0) { - echo "
type."edit\">"; + echo "
type."edit\">"; echo _('Main'); echo "\n"; } else { - echo "
type."edit\">"; + echo "
type."edit\">"; echo $this->module[$this->order[$this->current_page]]->get_alias(); echo "\n"; } @@ -1004,14 +1003,14 @@ class accountContainer { $return[] = array( 0 => array('kind' => 'input', 'type' => 'submit', 'name' => 'createagain', 'value' => _('Create another account')), 1 => array('kind' => 'input', 'type' => 'submit', 'name' => 'backmain', 'value' => _('Back to account list'))); - $return[] = array( - 0 => array('kind' => 'text', 'text' => ' ') - ); + $return[] = array(0 => array('kind' => 'text', 'text' => ' ')); // empty line + $return[] = array(0 => array('kind' => 'text', 'text' => ' ')); // empty line $pdfStructures = getPDFStructureDefinitions($this->type); $return[] = array( 0 => array('kind' => 'fieldset', 'legend' => 'PDF', 'td' => array('colspan' => 2), 'value' => array(array( 0 => array('kind' => 'select', 'name' => 'pdfStructure', 'options' => $pdfStructures), - 1 => array('kind' => 'input', 'type' => 'submit', 'name' => 'outputpdf', 'value' => _('Create PDF file'))) + 1 => array('kind' => 'input', 'type' => 'submit', 'name' => 'outputpdf', 'value' => _('Create PDF file')), + 2 => array('kind' => 'help', 'value' => '403')) ))); } else { @@ -1024,7 +1023,7 @@ class accountContainer { $return[] = array( 0 => array('kind' => 'text', 'text' => _('Suffix')), 1 => array('kind' => 'select', 'name' => 'suffix', 'options' => $suffixes, 'options_selected' => array($options_selected), 'noSorting' => true), - 2 => array ('kind' => 'help', 'value' => 'suffix')); + 2 => array ('kind' => 'help', 'value' => '361')); // RDN selection $rdnlist = getRDNAttributes($this->type); $rdnSelected = array(); @@ -1047,15 +1046,16 @@ class accountContainer { 1 => array('kind' => 'table', 'value' => array(0 => array( 0 => array('kind' => 'select', 'name' => 'selectLoadProfile', 'options' => $profilelist), 1 => array('kind' => 'input', 'type' => 'submit', 'name' => 'loadProfile', 'value' => _('Load profile')) - )), - 2 => array('kind' => 'help', 'value' => 'selectLoadProfile')) + ))), + 2 => array('kind' => 'help', 'value' => '401') ); } + $return[] = array(0 => array('kind' => 'text', 'text' => ' ')); // empty line if ($this->dn_orig!='') $text = _('Modify Account'); else $text = _('Create Account'); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => $text ), 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'create', 'value' => $text, 'disabled' => $disabled), - 2 => array ('kind' => 'help', 'value' => 'create')); + 2 => array ('kind' => 'help', 'value' => '402')); } } else $return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage), $post); diff --git a/lam/templates/help.php b/lam/templates/help.php index b95ceb75..67d73c2c 100644 --- a/lam/templates/help.php +++ b/lam/templates/help.php @@ -129,7 +129,8 @@ if(!isset($_GET['HelpNumber'])) $helpEntry = array(); -if(isset($_GET['module'])) { +// module help +if(isset($_GET['module']) && !($_GET['module'] == 'main')) { include_once("../lib/modules.inc"); if(isset($_GET['scope'])) { $helpEntry = getHelp($_GET['module'],$_GET['HelpNumber'],$_GET['scope']); @@ -148,6 +149,7 @@ if(isset($_GET['module'])) { exit; } } +// help entry in help.inc else { /* If submitted help number is not in help/help.inc print error message */ if(!array_key_exists($_GET['HelpNumber'],$helpArray))