style changes

This commit is contained in:
Roland Gruber 2016-08-27 10:40:05 +02:00
parent faba43680c
commit 5bde5554aa
6 changed files with 34 additions and 43 deletions

View File

@ -2557,10 +2557,13 @@ class htmlFieldset extends htmlElement {
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
$class = 'ui-corner-all'; $classes = $this->cssClasses;
$classes[] = 'ui-corner-all';
if ($scope != null) { if ($scope != null) {
$class .= ' ' . $scope . '-border ' . $scope . '-bright'; $classes[] = $scope . '-border';
$classes[] = $scope . '-bright';
} }
$class = implode(' ', $classes);
echo "<fieldset class=\"$class\">\n"; echo "<fieldset class=\"$class\">\n";
// generate legend // generate legend
if (($this->label != null) || ($this->labelImage != null)) { if (($this->label != null) || ($this->labelImage != null)) {

View File

@ -85,8 +85,7 @@ a.classicBold {
} }
fieldset { fieldset {
background-color:#fff3c8; border:1px solid black;
border:1px solid #af8800;
padding:10px; padding:10px;
} }
@ -519,12 +518,6 @@ div.confModList {
overflow-y: auto; overflow-y: auto;
} }
div.licenseInfo {
display: inline-block;
padding: 20px;
min-width: 200px;
}
/* schema browser */ /* schema browser */
table.schema_oclasses { table.schema_oclasses {

View File

@ -3,7 +3,7 @@
$Id$ $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 - 2015 Roland Gruber Copyright (C) 2003 - 2016 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
@ -114,9 +114,6 @@ echo $_SESSION['header'];
<td align="left" height="30"> <td align="left" height="30">
<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a> <a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
</td> </td>
<td align="right" height=20>
<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
</td>
</tr> </tr>
</table> </table>
<br><br> <br><br>
@ -199,7 +196,7 @@ echo $_SESSION['header'];
</table> </table>
</td></tr> </td></tr>
<tr><td> <tr><td>
<br><a href="../login.php"> <?php echo _("Back to login"); ?> </a> <br><a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login"); ?> </a>
</td></tr> </td></tr>
</table> </table>
</form> </form>

View File

@ -3,7 +3,7 @@
$Id$ $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 - 2013 Roland Gruber Copyright (C) 2003 - 2016 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
@ -75,18 +75,18 @@ echo $_SESSION['header'];
<td align="left" height="30"> <td align="left" height="30">
<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a> <a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
</td> </td>
<td align="right" height=20>
<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
</td>
</tr> </tr>
</table> </table>
<br><br> <br><br>
<fieldset class="ui-corner-all"> <fieldset class="ui-corner-all roundedShadowBox fullwidth">
<legend><b> <?php echo _("LAM configuration"); ?> </b></legend>
<TABLE border="0"> <TABLE border="0">
<?php <?php
if (is_dir("../selfService")) echo "<tr><td rowspan=4 width=20>&nbsp;</td><td></td><td></td></tr>\n"; if (isLAMProVersion()) {
else echo "<tr><td rowspan=3 width=20>&nbsp;</td><td></td><td></td></tr>\n"; echo "<tr><td rowspan=4 width=20>&nbsp;</td><td></td><td></td></tr>\n";
}
else {
echo "<tr><td rowspan=3 width=20>&nbsp;</td><td></td><td></td></tr>\n";
}
?> ?>
<TR> <TR>
<TD width="60" height="70"> <TD width="60" height="70">
@ -113,7 +113,7 @@ echo $_SESSION['header'];
</TD> </TD>
</TR> </TR>
<?php <?php
if (is_dir("../selfService")) { if (isLAMProVersion()) {
echo "<TR>\n"; echo "<TR>\n";
echo "<TD height=\"70\">\n"; echo "<TD height=\"70\">\n";
echo "<a href=\"../selfService/adminLogin.php\" target=\"_self\">\n"; echo "<a href=\"../selfService/adminLogin.php\" target=\"_self\">\n";
@ -130,7 +130,18 @@ echo $_SESSION['header'];
?> ?>
</TABLE> </TABLE>
</fieldset> </fieldset>
<p>&nbsp;<a href="../login.php"><?php echo _("Back to login") ?></a></p> <p><br></p>
<?php
if (isLAMProVersion()) {
include_once("../../lib/env.inc");
$printer = new \LAM\ENV\LAMLicenseInfoPrinter();
$printer->printLicenseInfo();
echo "<br><br>";
}
?>
<p>&nbsp;<a href="../login.php"><IMG alt="back" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a></p>
<p><br><br></p> <p><br><br></p>
</body> </body>

View File

@ -123,9 +123,6 @@ echo $_SESSION['header'];
<td align="left" height="30"> <td align="left" height="30">
<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a> <a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
</td> </td>
<td align="right" height=20>
<a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login") ?></a>
</td>
</tr> </tr>
</table> </table>
<br> <br>
@ -181,18 +178,11 @@ echo $_SESSION['header'];
</table> </table>
</td></tr> </td></tr>
<tr><td align="left"> <tr><td align="left">
<br><a href="../login.php"> <?php echo _("Back to login"); ?> </a> <br><a href="../login.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to login"); ?> </a>
</td></tr> </td></tr>
</table> </table>
</form> </form>
<?php
if (isLAMProVersion()) {
$printer = new \LAM\ENV\LAMLicenseInfoPrinter();
$printer->printLicenseInfo();
}
?>
<p><br><br></p> <p><br><br></p>
</body> </body>

View File

@ -177,9 +177,6 @@ echo $_SESSION['header'];
<td align="left" height="30"> <td align="left" height="30">
<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a> <a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
</td> </td>
<td align="right" height=20>
<a href="conflogin.php"><IMG alt="configuration" src="../../graphics/undo.png">&nbsp;<?php echo _("Back to profile login") ?></a>
</td>
</tr> </tr>
</table> </table>
<br> <br>
@ -327,12 +324,12 @@ $dialogDiv->setCSSClasses(array('hidden'));
$container->addElement($dialogDiv, true); $container->addElement($dialogDiv, true);
$mainDiv = new htmlDiv('mainDiv', $container); $mainDiv = new htmlDiv('mainDiv', $container);
$mainDiv->setCSSClasses(array('filled', 'ui-corner-all')); $mainDiv->setCSSClasses(array('roundedShadowBox', 'fullwidth', 'ui-corner-all'));
$mainContainer = new htmlGroup(); $mainContainer = new htmlGroup();
$mainContainer->addElement($mainDiv); $mainContainer->addElement($mainDiv);
$mainContainer->addElement(new htmlOutputText('<br>', false)); $mainContainer->addElement(new htmlOutputText('<p><br></p>', false));
$mainContainer->addElement(new htmlLink(_("Back to profile login"), 'conflogin.php')); $mainContainer->addElement(new htmlLink(_("Back to profile login"), 'conflogin.php', '../../graphics/undo.png'));
parseHtml('', $mainContainer, array(), false, $tabindex, 'user'); parseHtml('', $mainContainer, array(), false, $tabindex, 'user');