From 2151a7e373fc1087ccc42c4987f4a19b930403a6 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 9 Jun 2015 19:02:24 +0000 Subject: [PATCH] support jobs --- lam/graphics/clock.png | Bin 0 -> 3484 bytes lam/templates/config/confmain.php | 14 +++++++++++++- lam/templates/config/confmodules.php | 14 +++++++++++++- lam/templates/config/conftypes.php | 14 +++++++++++++- lam/templates/config/moduleSettings.php | 14 +++++++++++++- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 lam/graphics/clock.png diff --git a/lam/graphics/clock.png b/lam/graphics/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..1af37c06923d2d8546dd58f385a54e63b2d67c2e GIT binary patch literal 3484 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\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 ''; ?>