diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index 3fccbf85..aaf3df52 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -205,6 +205,10 @@ tr.highlight { white-space: nowrap; } +div.ui-progressbar-value { + background-image: url(images/pbar-ani.gif); +} + /** * table style for delete.php * diff --git a/lam/style/images/pbar-ani.gif b/lam/style/images/pbar-ani.gif new file mode 100644 index 00000000..cb59a04f Binary files /dev/null and b/lam/style/images/pbar-ani.gif differ diff --git a/lam/templates/massDoUpload.php b/lam/templates/massDoUpload.php index 0997d3e7..2beb0efc 100644 --- a/lam/templates/massDoUpload.php +++ b/lam/templates/massDoUpload.php @@ -69,10 +69,17 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po echo "
\n"; echo "

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

\n"; echo "
"; - echo "\n"; - echo ""; - echo "\n"; - echo "
  
"; + $progress = ($_SESSION['mass_counter'] * 100) / sizeof($accounts); + ?> +
+ + time())) { @@ -92,6 +99,17 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po } $_SESSION['mass_counter']++; } + $progress = ($_SESSION['mass_counter'] * 100) / sizeof($accounts); + ?> + + = sizeof($accounts)) { $data = unserialize($_SESSION['ldap']->decrypt($_SESSION['mass_data'])); @@ -101,11 +119,18 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po } for ($i = 0; $i < sizeof($return['errors']); $i++) $_SESSION['mass_errors'][] = $return['errors'][$i]; echo "

" . _("Additional tasks for module:") . ' ' . getModuleAlias($return['module'], $_SESSION['mass_scope']) . "

\n"; - echo "\n"; - echo ""; - echo "\n"; - echo "
  
"; + ?> +
+ + time())) { $return = doUploadPostActions($_SESSION['mass_scope'], $data, $_SESSION['mass_ids'], $_SESSION['mass_failed'], $_SESSION['mass_selectedModules'], $accounts); if ($return['status'] == 'finished') {