diff --git a/lam/graphics/clock.png b/lam/graphics/clock.png new file mode 100644 index 00000000..1af37c06 Binary files /dev/null and b/lam/graphics/clock.png differ diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 6a910500..f4c66137 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -92,7 +92,7 @@ if (isset($_SESSION['conf_messages']) && is_array($_SESSION['conf_messages'])) { // check if button was pressed and if we have to save the settings or go to another tab if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) || isset($_POST['edittypes']) || isset($_POST['generalSettingsButton']) - || isset($_POST['moduleSettings'])) { + || isset($_POST['moduleSettings']) || isset($_POST['jobs'])) { $errorsToDisplay = checkInput(); if (sizeof($errorsToDisplay) == 0) { // go to final page @@ -115,6 +115,11 @@ if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) metaRefresh("moduleSettings.php"); exit; } + // go to jobs page + elseif (isset($_POST['jobs'])) { + metaRefresh("jobs.php"); + exit; + } } } @@ -194,6 +199,7 @@ echo "
\n"; echo ""; echo ""; echo ""; + echo ""; echo "
\n"; // tabs @@ -216,6 +222,12 @@ echo '
  • '; echo _('Module settings') . ''; echo '
  • '; +if (isLAMProVersion()) { + echo '
  • '; + echo ' '; + echo _('Jobs') . ''; + echo '
  • '; +} echo ''; ?> diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index ccea1b02..be1ef4bb 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -65,7 +65,7 @@ $errorsToDisplay = checkInput(); // check if button was pressed and if we have to save the settings or go to another tab if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) || isset($_POST['edittypes']) || isset($_POST['generalSettingsButton']) - || isset($_POST['moduleSettings'])) { + || isset($_POST['moduleSettings']) || isset($_POST['jobs'])) { if (sizeof($errorsToDisplay) == 0) { // go to final page if (isset($_POST['saveSettings'])) { @@ -87,6 +87,11 @@ if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) metaRefresh("moduleSettings.php"); exit; } + // go to jobs page + elseif (isset($_POST['jobs'])) { + metaRefresh("jobs.php"); + exit; + } } } @@ -153,6 +158,7 @@ echo "
    \n"; echo ""; echo ""; echo ""; + echo ""; echo "
    \n"; // tabs @@ -175,6 +181,12 @@ echo '
  • '; echo _('Module settings') . ''; echo '
  • '; +if (isLAMProVersion()) { + echo '
  • '; + echo ' '; + echo _('Jobs') . ''; + echo '
  • '; +} echo ''; ?> diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index 69ea40aa..98403ebc 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -64,7 +64,7 @@ $errorsToDisplay = checkInput(); // check if button was pressed and if we have to save the settings or go to another tab if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) || isset($_POST['edittypes']) || isset($_POST['generalSettingsButton']) - || isset($_POST['moduleSettings'])) { + || isset($_POST['moduleSettings']) || isset($_POST['jobs'])) { if (sizeof($errorsToDisplay) == 0) { // check if all types have modules $activeTypes = $conf->get_ActiveTypes(); @@ -96,6 +96,11 @@ if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) metaRefresh("moduleSettings.php"); exit; } + // go to jobs page + elseif (isset($_POST['jobs'])) { + metaRefresh("jobs.php"); + exit; + } } } @@ -171,6 +176,7 @@ echo "
    \n"; echo ""; echo ""; echo ""; + echo ""; echo "
    \n"; // tabs @@ -193,6 +199,12 @@ echo '
  • '; echo _('Module settings') . ''; echo '
  • '; +if (isLAMProVersion()) { + echo '
  • '; + echo ' '; + echo _('Jobs') . ''; + echo '
  • '; +} echo ''; ?> diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index 65892784..eea1f350 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -64,7 +64,7 @@ $errorsToDisplay = checkInput(); // check if button was pressed and if we have to save the settings or go to another tab if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) || isset($_POST['edittypes']) || isset($_POST['generalSettingsButton']) - || isset($_POST['moduleSettings'])) { + || isset($_POST['moduleSettings']) || isset($_POST['jobs'])) { if (sizeof($errorsToDisplay) == 0) { // go to final page if (isset($_POST['saveSettings'])) { @@ -86,6 +86,11 @@ if (isset($_POST['saveSettings']) || isset($_POST['editmodules']) metaRefresh("confmain.php"); exit; } + // go to jobs page + elseif (isset($_POST['jobs'])) { + metaRefresh("jobs.php"); + exit; + } } } @@ -152,6 +157,7 @@ echo "
    \n"; echo ""; echo ""; echo ""; + echo ""; echo "
    \n"; // tabs @@ -174,6 +180,12 @@ echo '
  • '; echo ' '; echo _('Module settings') . ''; echo '
  • '; +if (isLAMProVersion()) { + echo '
  • '; + echo ' '; + echo _('Jobs') . ''; + echo '
  • '; +} echo ''; ?>