From a6299e6ef8e27943655a36dd590ec6a239e5a284 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Fri, 14 Mar 2003 14:06:12 +0000 Subject: [PATCH] added headings; removed non-standard success page --- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php | 10 +++++----- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php | 46 ---------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc | 50 ++++++++++++++------------------------------------ 3 files changed, 19 insertions(+), 87 deletions(-) delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php index 5fd2f6c..0094d16 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php @@ -13,6 +13,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("editUserUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/lib/users/User.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); @@ -21,16 +22,15 @@ if (checkSession()) { require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); - $oPatternCustom = & new PatternCustom(); if (isset($fUserID)){ // post back on User select from manual edit page $oPatternCustom->setHtml(getUserDetailsPage($fUserID)); - $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editUserSuccess")); - - - } else { + $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editUser&fSuccess=1")); + } else if ($fSuccess) { + $oPatternCustom->setHtml(getEditPageSuccess()); + } else { // if nothing happens...just reload edit page $oPatternCustom->setHtml(getEditPage(null)); $main->setFormAction($_SERVER["PHP_SELF"]); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php deleted file mode 100644 index 483902e..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php +++ /dev/null @@ -1,46 +0,0 @@ -fileSystemRoot/presentation/webpageTemplate.inc"); - -$Center = "

\n" ; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "
Update SuccessFul!
rootUrl/control.php?action=editUser\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - - -$oPatternCustom = & new PatternCustom(); -$oPatternCustom->setHtml($Center); -$main->setCentralPayload($oPatternCustom); -$main->render(); - - - - -} - -?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc index 2f6cf27..d88bedf 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc @@ -14,14 +14,10 @@ function getEditPage($iUserID) { $oUser = null; if (isset($iUserID)) { $oUser = User::get($iUserID); - } - - $sToRender .= "

\n"; - $sToRender .= "Edit User Properties:\n"; + $sToRender .= "" . renderHeading("Edit User Properties") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -30,11 +26,9 @@ function getEditPage($iUserID) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "" . getUpdateButton($oUser); - $sToRender .= getCancelButton($oUser); + $sToRender .= ""; $sToRender .= "
Please select a User:
Username: " . getUserDisplay($oUser) . "
" . getCancelButton($oUser) . "
\n"; - return $sToRender; } @@ -42,9 +36,6 @@ function getUserDetailsPage($iUserID) { global $default; $oUser = null; - //if (isset($iUserID)) { - // $oUser = User::get($iUserID); - //} $sQuery = "SELECT * FROM $default->owl_users_table WHERE id = $iUserID"; $aDisplayColumns = array( "username","name","email", "mobile", "email_notification", "sms_notification", "max_sessions"); @@ -58,8 +49,7 @@ function getUserDetailsPage($iUserID) { $oPattern->setUniqueName("userEdit"); $oPattern->setColumnsRequired(array(1,1,0,0,0,0,0)); - $sToRender .= "

\n"; - $sToRender .= "Edit User Properties:\n"; + $sToRender .= "" . renderHeading("Edit User Properties") . "
"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -67,28 +57,20 @@ function getUserDetailsPage($iUserID) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "\n"; + $sToRender .= ""; $sToRender .= "
graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/>
graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/>\n"; + $sToRender .= getCancelButton(User::get($iUserID)) . "
\n"; - - - + return $sToRender; - - - } // if edition is successful print otu success page function getEditPageSuccess() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "" . renderHeading("Edit User Properties") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -107,10 +89,9 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "

\n"; - $sToRender .= "FAILED!\n"; + $sToRender .= "
Success!
The User was successfully modified
" . renderHeading("Edit User Properties") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -130,8 +111,7 @@ function getUserDisplay($oUser) { global $default; if (!isset($oUser)) { $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID"); - //$oPatternListBox->setIncludeDefaultValue(true); - $oPatternListBox->setPostBackOnChange(true); + $oPatternListBox->setPostBackOnChange(true); return $oPatternListBox->render(); } else { return "iId . "\">\n" . @@ -145,8 +125,6 @@ function getUserDisplay($oUser) { function getUpdateButton($oUser) { global $default; if (!isset($oUser)) { - return "Please select a User: "; - } else { return "\n"; } } @@ -155,9 +133,9 @@ function getUpdateButton($oUser) { function getCancelButton($oUser) { global $default; if (!isset($oUser)) { - //return "\n"; + return "rootUrl/control.php?action=userManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border=\"0\"/>\n"; } else { - return "\n"; + return "rootUrl/control.php?action=editUser\">graphicsUrl/widgets/cancel.gif\" border=\"0\" />\n"; } } ?> \ No newline at end of file -- libgit2 0.21.4
Failed!
User modification Failed!
graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/>rootUrl/control.php?action=UserManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" />rootUrl/control.php?action=editUser\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />