From baf7228a954ae6da91785958c255df439682be74 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 24 Oct 2010 13:53:44 +0000 Subject: [PATCH] use new design --- lam/templates/initsuff.php | 27 ++++++++++++++++++--------- lam/templates/massBuildAccounts.php | 17 ++++++++--------- lam/templates/massDoUpload.php | 18 +++++++++++++----- lam/templates/masscreate.php | 17 ++++++++--------- 4 files changed, 47 insertions(+), 32 deletions(-) diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php index 38312397..d590060a 100644 --- a/lam/templates/initsuff.php +++ b/lam/templates/initsuff.php @@ -173,18 +173,27 @@ $new_suff = str_replace("'", "", $new_suff); $new_suff = explode(";", $new_suff); include 'main_header.php'; - echo "

 

\n"; - echo "

" . _("The following suffix(es) are missing in LDAP. LAM can create them for you.") . "

\n"; - echo "

 

\n"; + echo '
'; + echo "
\n"; + $container = new htmlTable(); + $container->addElement(new htmlOutputText(_("The following suffix(es) are missing in LDAP. LAM can create them for you.")), true); + $container->addElement(new htmlSpacer(null, '10px'), true); // print missing suffixes for ($i = 0; $i < sizeof($new_suff); $i++) { - echo "

" . $new_suff[$i] . "

\n"; + $container->addElement(new htmlOutputText($new_suff[$i]), true); } - echo "

 

\n"; - echo "\n"; - echo "\n"; - echo ""; - echo ""; + $container->addElement(new htmlSpacer(null, '10px'), true); + + $buttonContainer = new htmlTable(); + $buttonContainer->addElement(new htmlButton('add_suff', _("Create"))); + $buttonContainer->addElement(new htmlButton('cancel', _("Cancel"))); + $buttonContainer->addElement(new htmlHiddenInput('new_suff', implode(";", $new_suff))); + $container->addElement($buttonContainer); + + $tabindex = 1; + parseHtml(null, $container, array(), false, $tabindex, 'user'); + echo "

\n"; + echo "
\n"; include 'main_footer.php'; ?> diff --git a/lam/templates/massBuildAccounts.php b/lam/templates/massBuildAccounts.php index ab05bfe9..2c22014f 100644 --- a/lam/templates/massBuildAccounts.php +++ b/lam/templates/massBuildAccounts.php @@ -84,6 +84,7 @@ if (isset($_GET['showldif'])) { } include 'main_header.php'; +echo '
'; if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) { $selectedModules = explode(',', $_POST['selectedModules']); @@ -191,16 +192,13 @@ if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) { $_SESSION['mass_scope'] = $_POST['scope']; $_SESSION['mass_selectedModules'] = $selectedModules; // show links for upload and LDIF export - echo "

" . _("LAM has checked your input and is now ready to create the accounts.") . "

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

" . _("LAM has checked your input and is now ready to create the accounts.") . "

\n"; + echo "
"; echo "

 

\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - echo "" . _("Upload accounts to LDAP") . ""; - echo "\n"; - echo "" . _("Show LDIF file") . ""; - echo "
\n"; + echo "" . _("Upload accounts to LDAP") . ""; + echo "    "; + echo "" . _("Show LDIF file") . ""; } } } @@ -210,6 +208,7 @@ else { echo '
' . _('Back') . ''; } +echo '
'; include 'main_footer.php'; ?> \ No newline at end of file diff --git a/lam/templates/massDoUpload.php b/lam/templates/massDoUpload.php index b35aa966..5cbf4f0e 100644 --- a/lam/templates/massDoUpload.php +++ b/lam/templates/massDoUpload.php @@ -58,6 +58,7 @@ if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) { setlanguage(); include 'main_header.php'; +echo '
'; // create accounts $accounts = unserialize($_SESSION['ldap']->decrypt($_SESSION['mass_accounts'])); @@ -67,7 +68,9 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po if ($maxTime > 60) $maxTime = 60; if ($maxTime <= 0) $maxTime = 60; $refreshTime = $maxTime + 7; - echo "

" . _("LDAP upload in progress. Please wait.") . "

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

" . _("LDAP upload in progress. Please wait.") . "

\n"; + echo "
"; echo "\n"; echo ""; echo "\n"; @@ -117,20 +120,25 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po echo "\n"; - include 'main_footer.php'; } // all accounts have been created else { $_SESSION['cache']->refresh_cache(true); - echo "

" . _("LDAP upload has finished") . "

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

" . _("LDAP upload has finished") . "

\n"; + echo "
"; if (sizeof($_SESSION['mass_errors']) > 0) { - echo "

" . _("There were errors while uploading:") . "

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

" . _("There were errors while uploading:") . "

\n"; + echo "
"; for ($i = 0; $i < sizeof($_SESSION['mass_errors']); $i++) { call_user_func_array('StatusMessage', $_SESSION['mass_errors'][$i]); + echo "
"; } } - include 'main_footer.php'; } +echo ''; +include 'main_footer.php'; ?> \ No newline at end of file diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php index 3a80dc80..b4a695e6 100644 --- a/lam/templates/masscreate.php +++ b/lam/templates/masscreate.php @@ -68,7 +68,7 @@ if (isset($_GET['getCSV'])) { } include 'main_header.php'; -echo '
'; +echo '
'; // get possible types and remove those which do not support file upload $types = $_SESSION['config']->get_ActiveTypes(); @@ -108,7 +108,9 @@ if (isset($_POST['type'])) { } // show start page -echo "

" . _("Account creation via file upload") . "

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

" . _("Account creation via file upload") . "

\n"; +echo "
"; echo "

 

\n"; echo "

\n"; @@ -117,13 +119,6 @@ echo "

\n"; echo "

 

\n"; -echo ''; - echo "
\n"; echo "
  
\n"; @@ -199,6 +194,10 @@ echo "
\n";