diff --git a/lam/graphics/gear.png b/lam/graphics/gear.png index 430a6234..fc14700f 100644 Binary files a/lam/graphics/gear.png and b/lam/graphics/gear.png differ diff --git a/lam/graphics/moduleSettings.png b/lam/graphics/moduleSettings.png deleted file mode 100644 index f0030b66..00000000 Binary files a/lam/graphics/moduleSettings.png and /dev/null differ diff --git a/lam/graphics/modules.png b/lam/graphics/modules.png index eb2d9e61..7de3f48b 100644 Binary files a/lam/graphics/modules.png and b/lam/graphics/modules.png differ diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index 7419af42..f72b29e1 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -99,6 +99,14 @@ tr.highlight { text-align: right; } +.saveButton { + background-image: url(../graphics/save.png) !important; +} + +.cancelButton { + background-image: url(../graphics/del.png) !important; +} + table.settingsTab { border-width:0px; border-style:solid; diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 86653cee..0b9affb5 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -120,7 +120,15 @@ $tabindex = 1; echo $_SESSION['header']; echo ("" . _("LDAP Account Manager Configuration") . "\n"); -echo ("\n"); + +// include all CSS files +$cssDirName = dirname(__FILE__) . '/../../style'; +$cssDir = dir($cssDirName); +while ($cssEntry = $cssDir->read()) { + if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + echo "\n"; +} + echo "\n"; echo ("\n"); echo ("\n"); @@ -157,80 +165,66 @@ if (sizeof($errorsToDisplay) > 0) { // display formular echo ("
\n"); -echo "\n"; -echo "\n"; -echo "
"; -// show tabs -echo ""; -echo "\n"; - $buttonSpace = '         '; - // general settings - echo "'; - // account types - echo "'; - // module selection - echo "'; - // module settings - echo "'; - echo ""; - // spacer - echo ""; - // save button - echo "'; - // cancel button - echo "'; - echo "
\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/bigTools.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/gear.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/modules.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/moduleSettings.png);'; - echo "\n"; - echo "
\n"; - echo '		  \n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/pass.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/fail.png);'; - echo "\n"; - echo "
\n"; - echo '
\n"; -// end tabs -echo "


\n"; +echo '
'; +echo ""; +echo " "; +echo ""; +echo "

\n"; +echo '
'; + +// hidden submit buttons which are clicked by tabs +echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; +echo "
\n"; + +// tabs +echo '
'; + +echo ''; + +?> + + + +
+\"profiles.png\" " . _("Server settings") . "
\n"); echo (""); // serverURL @@ -537,10 +531,8 @@ echo ("
\n"); echo ("\n"); echo ("

* = ". _("required") . "

"); -echo ("

 

\n"); -echo '
'; -echo ("
\n"); +echo ("\n"); echo ("\n"); echo ("\n"); diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index 7fc205ba..e8b64476 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -95,7 +95,15 @@ $types = $conf->get_ActiveTypes(); echo $_SESSION['header']; echo "" . _("LDAP Account Manager Configuration") . "\n"; -echo "\n"; + +// include all CSS files +$cssDirName = dirname(__FILE__) . '/../../style'; +$cssDir = dir($cssDirName); +while ($cssEntry = $cssDir->read()) { + if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + echo "\n"; +} + echo "\n"; for ($i = 0; $i < sizeof($types); $i++){ echo "\n"; @@ -124,80 +132,65 @@ while ($jsEntry = $jsDir->read()) { for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); echo ("
\n"); -echo "\n"; -echo "\n"; -echo "
"; -// show tabs -echo ""; -echo "\n"; - $buttonSpace = '         '; - // general settings - echo "'; - // account types - echo "'; - // module selection - echo "'; - // module settings - echo "'; - echo ""; - // spacer - echo ""; - // save button - echo "'; - // cancel button - echo "'; - echo "
\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/bigTools.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/gear.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/modules.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/moduleSettings.png);'; - echo "\n"; - echo "
\n"; - echo '		  \n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/pass.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/fail.png);'; - echo "\n"; - echo "
\n"; - echo '
\n"; -// end tabs -echo "


\n"; +echo '
'; +echo ""; +echo " "; +echo ""; +echo "

\n"; +echo '
'; + +// hidden submit buttons which are clicked by tabs +echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; +echo "
\n"; + +// tabs +echo '
'; + +echo ''; + +?> + + + +
+



\n"; - -echo '
'; +echo "

\n"; echo "\n"; -echo "
\n"; +echo ("\n"); echo "\n"; echo "\n"; diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index 6d0a88f0..ac91ab71 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -113,7 +113,15 @@ natcasesort($availableTypes); echo $_SESSION['header']; echo "" . _("LDAP Account Manager Configuration") . "\n"; -echo "\n"; + +// include all CSS files +$cssDirName = dirname(__FILE__) . '/../../style'; +$cssDir = dir($cssDirName); +while ($cssEntry = $cssDir->read()) { + if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + echo "\n"; +} + echo "\n"; for ($i = 0; $i < sizeof($allTypes); $i++){ echo "\n"; @@ -142,80 +150,66 @@ while ($jsEntry = $jsDir->read()) { for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); echo ("
\n"); -echo "\n"; -echo "\n"; -echo "
"; -// show tabs -echo ""; -echo "\n"; - $buttonSpace = '         '; - // general settings - echo "'; - // account types - echo "'; - // module selection - echo "'; - // module settings - echo "'; - echo ""; - // spacer - echo ""; - // save button - echo "'; - // cancel button - echo "'; - echo "
\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/bigTools.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/gear.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/modules.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/moduleSettings.png);'; - echo "\n"; - echo "
\n"; - echo '		  \n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/pass.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/fail.png);'; - echo "\n"; - echo "
\n"; - echo '
\n"; -// end tabs -echo "


\n"; +echo '
'; +echo ""; +echo " "; +echo ""; +echo "

\n"; +echo '
'; + +// hidden submit buttons which are clicked by tabs +echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; +echo "
\n"; + +// tabs +echo '
'; + +echo ''; + +?> + + + +
+ 0) { @@ -274,14 +268,11 @@ if (sizeof($activeTypes) > 0) { echo "
\n"; } echo "\n"; - echo "



\n"; } echo "\n"; -echo "



\n"; -echo '
'; -echo "
\n"; +echo ("\n"); echo "\n"; echo "\n"; diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index c1629053..4754a998 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -94,7 +94,15 @@ $allTypes = getTypes(); echo $_SESSION['header']; echo "" . _("LDAP Account Manager Configuration") . "\n"; -echo "\n"; + +// include all CSS files +$cssDirName = dirname(__FILE__) . '/../../style'; +$cssDir = dir($cssDirName); +while ($cssEntry = $cssDir->read()) { + if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + echo "\n"; +} + echo "\n"; for ($i = 0; $i < sizeof($allTypes); $i++){ echo "\n"; @@ -123,80 +131,66 @@ while ($jsEntry = $jsDir->read()) { for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); echo ("
\n"); -echo "\n"; -echo "\n"; -echo "
"; -// show tabs -echo ""; -echo "\n"; - $buttonSpace = '         '; - // general settings - echo "'; - // account types - echo "'; - // module selection - echo "'; - // module settings - echo "'; - echo ""; - // spacer - echo ""; - // save button - echo "'; - // cancel button - echo "'; - echo "
\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/bigTools.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/gear.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/modules.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/moduleSettings.png);'; - echo "\n"; - echo "
\n"; - echo '		  \n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/pass.png);'; - echo "\n"; - echo "
\n"; - echo '		\n"; - echo "\n"; - echo "
\n"; - $buttonStyle = 'background-image: url(../../graphics/fail.png);'; - echo "\n"; - echo "
\n"; - echo '
\n"; -// end tabs -echo "


\n"; +echo '
'; +echo ""; +echo " "; +echo ""; +echo "

\n"; +echo '
'; + +// hidden submit buttons which are clicked by tabs +echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; +echo "
\n"; + +// tabs +echo '
'; + +echo ''; + +?> + + + +
+get_ActiveTypes(); @@ -236,9 +230,7 @@ for ($i = 0; $i < sizeof($modules); $i++) { echo "\n"; -echo "



\n"; -echo '
'; -echo "
\n"; +echo ("\n"); echo "\n"; echo "\n";