vertical tabs and new title bar on new/edit page

This commit is contained in:
Roland Gruber 2010-12-11 15:58:25 +00:00
parent 74e64ea788
commit d9cfabcba0
4 changed files with 203 additions and 54 deletions

View File

@ -104,6 +104,32 @@ class baseType {
return true; return true;
} }
/**
* Returns the the title text for the title bar on the new/edit page.
*
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text
*/
public function getTitleBarTitle($attributes) {
if ($attributes == null) {
return null;
}
if (isset($attributes['entryDN'][0])) {
return $attributes['entryDN'][0];
}
return null;
}
/**
* Returns the the title text for the title bar on the new/edit page.
*
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text
*/
public function getTitleBarSubtitle($attributes) {
return null;
}
} }
?> ?>

View File

@ -1034,6 +1034,11 @@ class accountContainer {
/** cache for existing OUs */ /** cache for existing OUs */
private $cachedOUs = null; private $cachedOUs = null;
/** main title in title bar */
private $titleBarTitle = null;
/** subtitle in title bar */
private $titleBarSubtitle = null;
/** /**
* Returns the account module with the given class name * Returns the account module with the given class name
* *
@ -1224,7 +1229,7 @@ class accountContainer {
*/ */
private function printModuleContent($result, $stopProcessing) { private function printModuleContent($result, $stopProcessing) {
$this->printPageHeader(); $this->printPageHeader();
// Display error-messages // display error messages
if (is_array($result)) { if (is_array($result)) {
for ($i=0; $i<sizeof($result); $i++) { for ($i=0; $i<sizeof($result); $i++) {
call_user_func_array("StatusMessage", $result[$i]); call_user_func_array("StatusMessage", $result[$i]);
@ -1240,14 +1245,55 @@ class accountContainer {
$this->printCommonControls(); $this->printCommonControls();
echo "</td></tr>\n"; echo "</td></tr>\n";
} }
// create module menu
echo "<tr class=\"".$this->type."list-bright\" valign=\"top\"><td style=\"padding: 15px;\">"; echo "<tr class=\"".$this->type."list-bright\" valign=\"top\"><td style=\"padding: 15px;\">";
echo '<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">'; // print title bar
echo '<div class="titleBar ui-corner-top">';
echo '<table width="100%"><tr>';
echo '<td><div class="titleBarTitle">';
echo $this->titleBarTitle;
echo '</div></td>';
echo '<td align="right">';
echo _('Suffix');
echo " <select class=\"rightToLeftText\" name=\"accountContainerSuffix\" size=1>\n";
// loop through all suffixes
$rootsuffix = $_SESSION['config']->get_Suffix($this->type);
foreach ($this->getOUs() as $suffix) {
echo '<option value="' . $suffix . '" ';
if ($this->dn == $suffix) {
echo 'selected';
}
echo ">" . getAbstractDN($suffix) . "</option>\n";
}
if (!($this->dn == '') && !in_array($this->dn, $this->getOUs())) {
echo '<option value="' . $this->dn . '" selected>' . getAbstractDN($this->dn) . "</option>\n";;
}
echo "</select>\n";
echo '&nbsp;&nbsp;&nbsp;&nbsp;';
// RDN selection
$rdnlist = getRDNAttributes($this->type);
echo _('RDN identifier');
echo " <select name=\"accountContainerRDN\" size=1>\n";
for ($i = 0; $i < sizeof($rdnlist); $i++) {
echo "<option ";
if ($this->rdn === $rdnlist[$i]) {
echo 'selected';
}
echo ">" . $rdnlist[$i] . "</option>\n";
}
echo "</select>\n";
printHelpLink(getHelp('', '301'), '301');
echo '</td>';
echo '</tr></table>';
if ($this->titleBarSubtitle != null) {
echo '<div class="titleBarSubtitle">';
echo $this->titleBarSubtitle;
echo '</div>';
}
echo '</div>';
echo '<div id="lamVerticalTabs" class="ui-tabs ui-widget ui-widget-content ui-corner-bottom ui-helper-clearfix">';
// tab menu // tab menu
$this->printModuleTabs(); $this->printModuleTabs();
echo "<div class=\"ui-tabs-panel ui-widget-content ui-corner-bottom\">\n"; echo "<div class=\"ui-tabs-panel ui-widget-content ui-corner-bottom\">\n";
// content header
$this->printContentHeader();
// content area // content area
// display html-code from modules // display html-code from modules
$return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage)); $return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage));
@ -1542,7 +1588,7 @@ class accountContainer {
$activatedClass = ' ui-tabs-selected ui-state-active ' . $this->type . 'list-bright'; $activatedClass = ' ui-tabs-selected ui-state-active ' . $this->type . 'list-bright';
} }
// print button // print button
echo '<li class="ui-state-default ui-corner-top' . $activatedClass . '">'; echo '<li class="ui-state-default ui-corner-left' . $activatedClass . '">';
$buttonStyle = 'background-color:transparent;;border:0px solid;'; $buttonStyle = 'background-color:transparent;;border:0px solid;';
echo "<button style=\"" . $buttonStyle . "\" name=\"form_main_".$this->order[$i]."\""; echo "<button style=\"" . $buttonStyle . "\" name=\"form_main_".$this->order[$i]."\"";
echo " tabindex=$x"; echo " tabindex=$x";
@ -1559,53 +1605,6 @@ class accountContainer {
echo '</ul>'; echo '</ul>';
} }
/**
* Prints the head part of the content area.
*/
private function printContentHeader() {
echo "<table width=\"100%\" border=0><tr>\n";
echo "<td align=\"left\">\n";
// display DN
if (isset($this->dn_orig) && ($this->dn_orig != '')) {
echo _("DN") . ": " . htmlspecialchars($this->dn_orig);
}
echo "</td>\n";
echo "<td align=\"right\">\n";
echo _('Suffix') . ": ";
echo "<select class=\"rightToLeftText\" name=\"accountContainerSuffix\" size=1>\n";
// loop through all suffixes
$rootsuffix = $_SESSION['config']->get_Suffix($this->type);
foreach ($this->getOUs() as $suffix) {
echo '<option value="' . $suffix . '" ';
if ($this->dn == $suffix) {
echo 'selected';
}
echo ">" . getAbstractDN($suffix) . "</option>\n";
}
if (!($this->dn == '') && !in_array($this->dn, $this->getOUs())) {
echo '<option value="' . $this->dn . '" selected>' . getAbstractDN($this->dn) . "</option>\n";;
}
echo "</select>\n";
echo '&nbsp;&nbsp;&nbsp;&nbsp;';
// RDN selection
$rdnlist = getRDNAttributes($this->type);
echo _('RDN identifier') . ": ";
echo "<select name=\"accountContainerRDN\" size=1>\n";
for ($i = 0; $i < sizeof($rdnlist); $i++) {
echo "<option ";
if ($this->rdn === $rdnlist[$i]) {
echo 'selected';
}
echo ">" . $rdnlist[$i] . "</option>\n";
}
echo "</select>\n";
printHelpLink(getHelp('', '301'), '301');
echo "</td>\n";
echo "</tr></table>\n";
// separator line
echo '<hr class="modulePage" noshade>';
}
/** /**
* This function checks which LDAP attributes have changed while the account was edited. * This function checks which LDAP attributes have changed while the account was edited.
* *
@ -1736,6 +1735,10 @@ class accountContainer {
// sort module buttons // sort module buttons
$this->sortModules(); $this->sortModules();
// get titles
$typeObject = new $this->type();
$this->titleBarTitle = $typeObject->getTitleBarTitle($this->attributes_orig);
$this->titleBarSubtitle = $typeObject->getTitleBarSubtitle($this->attributes_orig);
return array(); return array();
} }
@ -1842,8 +1845,12 @@ class accountContainer {
if (isset($profile['ldap_suffix'][0])) { if (isset($profile['ldap_suffix'][0])) {
$this->dn = $profile['ldap_suffix'][0]; $this->dn = $profile['ldap_suffix'][0];
} }
// get titles
$typeObject = new $this->type();
$this->titleBarTitle = $typeObject->getTitleBarTitle(null);
$this->titleBarSubtitle = $typeObject->getTitleBarSubtitle(null);
return 0; return 0;
} }
/** /**
* This function will save an account to the LDAP database. * This function will save an account to the LDAP database.

View File

@ -103,6 +103,66 @@ class user extends baseType {
); );
} }
/**
* Returns the the title text for the title bar on the new/edit page.
*
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text
*/
public function getTitleBarTitle($attributes) {
if ($attributes == null) {
return _("New user");
}
// check if first and last name can be shown
if (isset($attributes['sn'][0]) && isset($attributes['givenName'][0])) {
return htmlspecialchars($attributes['givenName'][0] . ' ' . $attributes['sn'][0]);
}
// check if a display name is set
if (isset($attributes['displayName'][0])) {
return htmlspecialchars($attributes['displayName'][0]);
}
// check if a common name is set
if (isset($attributes['cn'][0])) {
return htmlspecialchars($attributes['cn'][0]);
}
// check if a user name is set
if (isset($attributes['uid'][0])) {
return htmlspecialchars($attributes['uid'][0]);
}
// fall back to default
return parent::getTitleBarTitle($attributes);
}
/**
* Returns the the title text for the title bar on the new/edit page.
*
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text
*/
public function getTitleBarSubtitle($attributes) {
if ($attributes == null) {
return null;
}
$subtitle = '';
$spacer = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
// check if an email address can be shown
if (isset($attributes['mail'][0])) {
$subtitle .= '<a href="mailto:' . htmlspecialchars($attributes['mail'][0]) . '">' . htmlspecialchars($attributes['mail'][0]) . '</a>' . $spacer;
}
// check if an telephone number can be shown
if (isset($attributes['telephoneNumber'][0])) {
$subtitle .= _('Telephone number') . ' ' . htmlspecialchars($attributes['telephoneNumber'][0]) . $spacer;
}
// check if an mobile number can be shown
if (isset($attributes['mobile'][0])) {
$subtitle .= _('Mobile number') . ' ' . htmlspecialchars($attributes['mobile'][0]);
}
if ($subtitle == '') {
return null;
}
return $subtitle;
}
} }
/** /**

View File

@ -197,6 +197,62 @@ tr.account {
background-color:#FFFFEE; background-color:#FFFFEE;
} }
/* --- workaround for vertical tabs --- */
#lamVerticalTabs .ui-tabs-nav li {
margin: 0 -1px .2em 0;
clear: left;
width: 100%;
border-bottom-width: 1px !important;
border-right-width: 0 !important;
}
#lamVerticalTabs .ui-tabs-nav li.ui-tabs-selected {
border-right-width: 1px;
border-right-width: 1px;
padding-bottom: 0;
padding-right: .1em;
}
#lamVerticalTabs .ui-tabs-nav {
float: left;
padding: .2em .1em .2em .2em !IMPORTANT;
}
#lamVerticalTabs .ui-tabs-panel {
padding: 1em;
float: left;
}
#lamVerticalTabs .ui-widget-header {
background: #CCCCCC;
}
#lamVerticalTabs .ui-tabs-nav li button {
width: 100%;
text-align: left;
display:block;
}
/* --- end of workaround for vertical tabs --- */
/* title bar */
.titleBar {
background: #AAAAAA url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) repeat-x scroll 50% 50%;
border-top: 1px solid #AAAAAA;
border-left: 1px solid #AAAAAA;
border-right: 1px solid #AAAAAA;
padding: 5px 5px 5px 15px;
}
.titleBarTitle {
font: bold 1em Arial,Tahoma,Verdana,sans-serif;
}
.titleBarSubtitle {
/* font-style: italic;*/
padding: 0px 5px 0px 10px;
}
/** /**
* Color and font definitions for templates/status.php * Color and font definitions for templates/status.php