use new design

This commit is contained in:
Roland Gruber 2010-10-24 13:53:44 +00:00
parent 6c7e017ac0
commit baf7228a95
4 changed files with 47 additions and 32 deletions

View File

@ -173,18 +173,27 @@ $new_suff = str_replace("'", "", $new_suff);
$new_suff = explode(";", $new_suff);
include 'main_header.php';
echo "<p>&nbsp;</p>\n";
echo "<p>" . _("The following suffix(es) are missing in LDAP. LAM can create them for you.") . "</p>\n";
echo "<p>&nbsp;</p>\n";
echo '<div class="userlist-bright smallPaddingContent">';
echo "<form action=\"initsuff.php\" method=\"post\">\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 "<p>" . $new_suff[$i] . "</p>\n";
$container->addElement(new htmlOutputText($new_suff[$i]), true);
}
echo "<p>&nbsp;</p>\n";
echo "<form action=\"initsuff.php\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"new_suff\" value=\"" . implode(";", $new_suff) . "\">\n";
echo "<input type=\"submit\" name=\"add_suff\" value=\"" . _("Create") . "\">";
echo "<input type=\"submit\" name=\"cancel\" value=\"" . _("Cancel") . "\">";
$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 "</form><br>\n";
echo "</div>\n";
include 'main_footer.php';
?>

View File

@ -84,6 +84,7 @@ if (isset($_GET['showldif'])) {
}
include 'main_header.php';
echo '<div class="userlist-bright smallPaddingContent">';
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 "<h1 align=\"center\">" . _("LAM has checked your input and is now ready to create the accounts.") . "</h1>\n";
echo "<div class=\"title\">\n";
echo "<h2 class=\"titleText\">" . _("LAM has checked your input and is now ready to create the accounts.") . "</h2>\n";
echo "</div>";
echo "<p>&nbsp;</p>\n";
echo "<table align=\"center\" width=\"80%\"><tr>\n";
echo "<td align=\"center\" width=\"50%\">\n";
echo "<a href=\"massDoUpload.php\"><b>" . _("Upload accounts to LDAP") . "</b></a>";
echo "</td>\n";
echo "<td align=\"center\" width=\"50%\">\n";
echo "<a href=\"massBuildAccounts.php?showldif=true\"><b>" . _("Show LDIF file") . "</b></a>";
echo "</td>\n";
echo "</tr></table>\n";
echo "<a href=\"massDoUpload.php\">" . _("Upload accounts to LDAP") . "</a>";
echo "&nbsp;&nbsp;&nbsp;&nbsp;";
echo "<a href=\"massBuildAccounts.php?showldif=true\">" . _("Show LDIF file") . "</a>";
}
}
}
@ -210,6 +208,7 @@ else {
echo '<br><a href="masscreate.php">' . _('Back') . '</a>';
}
echo '</div>';
include 'main_footer.php';
?>

View File

@ -58,6 +58,7 @@ if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
setlanguage();
include 'main_header.php';
echo '<div class="userlist-bright smallPaddingContent">';
// 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 "<h1>" . _("LDAP upload in progress. Please wait.") . "</h1>\n";
echo "<div class=\"title\">\n";
echo "<h2 class=\"titleText\">" . _("LDAP upload in progress. Please wait.") . "</h2>\n";
echo "</div>";
echo "<table align=\"center\" width=\"80%\" style=\"border-color: grey\" border=\"2\" cellspacing=\"0\" rules=\"none\">\n";
echo "<tr><td bgcolor=\"blue\" width=\"" . ($_SESSION['mass_counter'] * 100) / sizeof($accounts) . "%\">&nbsp;</td>";
echo "<td bgcolor=\"grey\" width=\"" . (100 - (($_SESSION['mass_counter'] * 100) / sizeof($accounts))) . "%\">&nbsp;</td></tr>\n";
@ -117,20 +120,25 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po
echo "<script type=\"text/javascript\">\n";
echo "top.location.href = \"massDoUpload.php\";\n";
echo "</script>\n";
include 'main_footer.php';
}
// all accounts have been created
else {
$_SESSION['cache']->refresh_cache(true);
echo "<h1>" . _("LDAP upload has finished") . "</h1>\n";
echo "<div class=\"title\">\n";
echo "<h2 class=\"titleText\">" . _("LDAP upload has finished") . "</h2>\n";
echo "</div>";
if (sizeof($_SESSION['mass_errors']) > 0) {
echo "<h2>" . _("There were errors while uploading:") . "</h2>\n";
echo "<div class=\"subTitle\">\n";
echo "<h4 class=\"subTitleText\">" . _("There were errors while uploading:") . "</h4>\n";
echo "</div>";
for ($i = 0; $i < sizeof($_SESSION['mass_errors']); $i++) {
call_user_func_array('StatusMessage', $_SESSION['mass_errors'][$i]);
echo "<br>";
}
}
}
echo '</div>';
include 'main_footer.php';
}
?>

View File

@ -68,7 +68,7 @@ if (isset($_GET['getCSV'])) {
}
include 'main_header.php';
echo '<div class="smallPaddingContent">';
echo '<div class="userlist-bright smallPaddingContent">';
// 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 "<h1>" . _("Account creation via file upload") . "</h1>\n";
echo "<div class=\"title\">\n";
echo "<h2 class=\"titleText\">" . _("Account creation via file upload") . "</h2>\n";
echo "</div>";
echo "<p>&nbsp;</p>\n";
echo "<p>\n";
@ -117,13 +119,6 @@ echo "</p>\n";
echo "<p>&nbsp;</p>\n";
echo '<script type="text/javascript">';
echo 'function changeVisibleModules(element) {';
echo 'jQuery(\'div.typeOptions\').toggle(false);';
echo 'jQuery(\'div#\' + element.options[element.selectedIndex].value).toggle();';
echo '}';
echo '</script>';
echo "<form enctype=\"multipart/form-data\" action=\"masscreate.php\" method=\"post\">\n";
echo "<table style=\"border-color: grey\" cellpadding=\"10\" border=\"0\" cellspacing=\"0\">\n";
@ -199,6 +194,10 @@ echo "<table style=\"border-color: grey\" cellpadding=\"10\" border=\"0\" cellsp
jQuery(document).ready(function() {
jQuery('#okButton').button();
});
function changeVisibleModules(element) {
jQuery('div.typeOptions').toggle(false);
jQuery('div#' + element.options[element.selectedIndex].value).toggle();
}
</script>
<?php
echo "</td></tr>\n";