WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow to display technical attribute names in help window

This commit is contained in:
Roland Gruber 2012-01-31 18:31:54 +00:00
parent 5d18525cb6
commit 78795c2d60
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/lib/modules.inc
View File

@ -610,6 +610,9 @@ function printHelpLink($entry, $number, $module='', $scope='') {
if (is_file("./help.php")) $helpPath = ""; if (is_file("./help.php")) $helpPath = "";
$title = $entry['Headline']; $title = $entry['Headline'];
$message = $entry['Text']; $message = $entry['Text'];
if (isset($entry['attr'])) {
$message .= '<br><br><hr class="dotted">' . _('Technical name') . ': <i>' . $entry['attr'] . '</i>';
}
// replace special characters // replace special characters
$message = str_replace(array("'", '"', "\n"), array("\\'", '&quot;', ''), $message); $message = str_replace(array("'", '"', "\n"), array("\\'", '&quot;', ''), $message);
$title = str_replace(array("'", '"', "\n"), array("\\'", '&quot;', ''), $title); $title = str_replace(array("'", '"', "\n"), array("\\'", '&quot;', ''), $title);

16
lam/style/500_layout.css
View File

@ -3,7 +3,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 Leonhard Walchshaeusl Copyright (C) 2003 Leonhard Walchshaeusl
Copyright (C) 2005 - 2011 Roland Gruber Copyright (C) 2005 - 2012 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -211,6 +211,13 @@ tr.highlight {
white-space: nowrap; white-space: nowrap;
} }
hr.dotted {
border-bottom: 1px dotted black;
border-top: none;
border-right: none;
border-left: none;
}
div.ui-progressbar-value { div.ui-progressbar-value {
background-image: url(images/pbar-ani.gif); background-image: url(images/pbar-ani.gif);
} }
@ -363,13 +370,6 @@ input.smallImageButton {
cursor:pointer; cursor:pointer;
} }
hr.modulePage {
width: 100%;
height: 2px;
margin-bottom: 20px;
margin-top: 3px;
}
/* schema browser */ /* schema browser */

5
lam/templates/help.php
View File

@ -4,7 +4,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Michael Duergner Copyright (C) 2003 - 2006 Michael Duergner
2008 - 2009 Roland Gruber 2008 - 2012 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -85,6 +85,9 @@ function displayHelp($helpEntry,$helpVariables) {
echoHTMLHead(); echoHTMLHead();
echo " <h1 class=\"help\">" . $helpEntry['Headline'] . "</h1>\n"; echo " <h1 class=\"help\">" . $helpEntry['Headline'] . "</h1>\n";
$format = " <p class=\"help\">" . $helpEntry['Text'] . "</p>\n"; $format = " <p class=\"help\">" . $helpEntry['Text'] . "</p>\n";
if (isset($helpEntry['attr'])) {
$format .= '<br><hr>' . _('Technical name') . ': <i>' . $helpEntry['attr'] . '</i>';
}
array_unshift($helpVariables,$format); array_unshift($helpVariables,$format);
call_user_func_array("printf",$helpVariables); call_user_func_array("printf",$helpVariables);
if(isset($helpEntry['SeeAlso']) && is_array($helpEntry['SeeAlso'])) { if(isset($helpEntry['SeeAlso']) && is_array($helpEntry['SeeAlso'])) {