Peter M. Groen / knowledgetree

Commit a6299e6ef8e27943655a36dd590ec6a239e5a284

Authored by Michael Joseph
1 parent 37f26f43

added headings; removed non-standard success page 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1581 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 19 additions and 87 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php
  View file @a6299e6
@@ -13,6 +13,7 @@ if (checkSession()) { @@ -13,6 +13,7 @@ if (checkSession()) {
13 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); 13 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
14 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); 14 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
15 require_once("editUserUI.inc"); 15 require_once("editUserUI.inc");
  16 + require_once("../adminUI.inc");
16 require_once("$default->fileSystemRoot/lib/security/permission.inc"); 17 require_once("$default->fileSystemRoot/lib/security/permission.inc");
17 require_once("$default->fileSystemRoot/lib/users/User.inc"); 18 require_once("$default->fileSystemRoot/lib/users/User.inc");
18 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 19 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
@@ -21,16 +22,15 @@ if (checkSession()) { @@ -21,16 +22,15 @@ if (checkSession()) {
21 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); 22 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
22 require_once("$default->fileSystemRoot/presentation/Html.inc"); 23 require_once("$default->fileSystemRoot/presentation/Html.inc");
23 24
24 -  
25 $oPatternCustom = & new PatternCustom(); 25 $oPatternCustom = & new PatternCustom();
26 26
27 if (isset($fUserID)){ 27 if (isset($fUserID)){
28 // post back on User select from manual edit page 28 // post back on User select from manual edit page
29 $oPatternCustom->setHtml(getUserDetailsPage($fUserID)); 29 $oPatternCustom->setHtml(getUserDetailsPage($fUserID));
30 - $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editUserSuccess"));  
31 -  
32 -  
33 - } else { 30 + $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editUser&fSuccess=1"));
  31 + } else if ($fSuccess) {
  32 + $oPatternCustom->setHtml(getEditPageSuccess());
  33 + } else {
34 // if nothing happens...just reload edit page 34 // if nothing happens...just reload edit page
35 $oPatternCustom->setHtml(getEditPage(null)); 35 $oPatternCustom->setHtml(getEditPage(null));
36 $main->setFormAction($_SERVER["PHP_SELF"]); 36 $main->setFormAction($_SERVER["PHP_SELF"]);
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserSuccess.php deleted
View file @37f26f4
1 -<?php  
2 -/**  
3 -* Presentation information when updating User properties is successful  
4 -*  
5 -* @author Mukhtar Dharsey  
6 -* @date 5 February 2003  
7 -* @package presentation.lookAndFeel.knowledgeTree.  
8 -*  
9 -*/  
10 -  
11 -require_once("../../../../../config/dmsDefaults.php");  
12 -  
13 -global $default;  
14 -  
15 -if(checkSession())  
16 -{  
17 -  
18 -// include the page template (with navbar)  
19 -require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  
20 -  
21 -$Center = "<br></br>\n" ;  
22 -$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";  
23 -$Center .= "<tr>\n";  
24 -$Center .= "<td>Update SuccessFul!</td>\n";  
25 -$Center .= "</tr>\n";  
26 -$Center .= "<tr></tr>\n";  
27 -$Center .= "<tr></tr>\n";  
28 -$Center .= "<tr></tr>\n";  
29 -$Center .= "<tr></tr>\n";  
30 -$Center .= "<tr>\n";  
31 -$Center .= "<td align = right><a href=\"$default->rootUrl/control.php?action=editUser\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";  
32 -$Center .= "</tr>\n";  
33 -$Center .= "</table>\n";  
34 -  
35 -  
36 -$oPatternCustom = & new PatternCustom();  
37 -$oPatternCustom->setHtml($Center);  
38 -$main->setCentralPayload($oPatternCustom);  
39 -$main->render();  
40 -  
41 -  
42 -  
43 -  
44 -}  
45 -  
46 -?>  
47 \ No newline at end of file 0 \ No newline at end of file
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc
  View file @a6299e6
@@ -14,14 +14,10 @@ function getEditPage($iUserID) { @@ -14,14 +14,10 @@ function getEditPage($iUserID) {
14 $oUser = null; 14 $oUser = null;
15 if (isset($iUserID)) { 15 if (isset($iUserID)) {
16 $oUser = User::get($iUserID); 16 $oUser = User::get($iUserID);
17 -  
18 } 17 }
19 -  
20 - $sToRender .= "<br></br>\n";  
21 - $sToRender .= "<b>Edit User Properties:</b>\n"; 18 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit User Properties") . "</table>";
22 $sToRender .= "<table>\n"; 19 $sToRender .= "<table>\n";
23 - $sToRender .= "<br></br>\n";  
24 - $sToRender .= "<tr></tr>\n"; 20 + $sToRender .= "<tr><td>Please select a User: </td></tr>\n";
25 $sToRender .= "<tr>\n"; 21 $sToRender .= "<tr>\n";
26 $sToRender .= "<td>Username: </td><td>" . getUserDisplay($oUser) . "</td>\n"; 22 $sToRender .= "<td>Username: </td><td>" . getUserDisplay($oUser) . "</td>\n";
27 $sToRender .= "</tr>\n"; 23 $sToRender .= "</tr>\n";
@@ -30,11 +26,9 @@ function getEditPage($iUserID) { @@ -30,11 +26,9 @@ function getEditPage($iUserID) {
30 $sToRender .= "<tr>\n"; 26 $sToRender .= "<tr>\n";
31 $sToRender .= "<tr>\n"; 27 $sToRender .= "<tr>\n";
32 $sToRender .= "</tr>\n"; 28 $sToRender .= "</tr>\n";
33 - $sToRender .= "<td></td>" . getUpdateButton($oUser);  
34 - $sToRender .= getCancelButton($oUser); 29 + $sToRender .= "<tr><td colspan=\"2\" align=\"right\">" . getCancelButton($oUser) . "</td></tr>";
35 $sToRender .= "</table>\n"; 30 $sToRender .= "</table>\n";
36 31
37 -  
38 return $sToRender; 32 return $sToRender;
39 } 33 }
40 34
@@ -42,9 +36,6 @@ function getUserDetailsPage($iUserID) { @@ -42,9 +36,6 @@ function getUserDetailsPage($iUserID) {
42 36
43 global $default; 37 global $default;
44 $oUser = null; 38 $oUser = null;
45 - //if (isset($iUserID)) {  
46 - // $oUser = User::get($iUserID);  
47 - //}  
48 39
49 $sQuery = "SELECT * FROM $default->owl_users_table WHERE id = $iUserID"; 40 $sQuery = "SELECT * FROM $default->owl_users_table WHERE id = $iUserID";
50 $aDisplayColumns = array( "username","name","email", "mobile", "email_notification", "sms_notification", "max_sessions"); 41 $aDisplayColumns = array( "username","name","email", "mobile", "email_notification", "sms_notification", "max_sessions");
@@ -58,8 +49,7 @@ function getUserDetailsPage($iUserID) { @@ -58,8 +49,7 @@ function getUserDetailsPage($iUserID) {
58 $oPattern->setUniqueName("userEdit"); 49 $oPattern->setUniqueName("userEdit");
59 $oPattern->setColumnsRequired(array(1,1,0,0,0,0,0)); 50 $oPattern->setColumnsRequired(array(1,1,0,0,0,0,0));
60 51
61 - $sToRender .= "<br></br>\n";  
62 - $sToRender .= "<b>Edit User Properties:</b>\n"; 52 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit User Properties") . "</table>";
63 $sToRender .= "<table>\n"; 53 $sToRender .= "<table>\n";
64 $sToRender .= "<tr></tr>\n"; 54 $sToRender .= "<tr></tr>\n";
65 $sToRender .= "<tr>\n"; 55 $sToRender .= "<tr>\n";
@@ -67,28 +57,20 @@ function getUserDetailsPage($iUserID) { @@ -67,28 +57,20 @@ function getUserDetailsPage($iUserID) {
67 $sToRender .= "</tr>\n"; 57 $sToRender .= "</tr>\n";
68 $sToRender .= "<tr>\n"; 58 $sToRender .= "<tr>\n";
69 $sToRender .= "</tr>\n"; 59 $sToRender .= "</tr>\n";
70 - $sToRender .= "<tr>\n";  
71 - $sToRender .= "</tr>\n";  
72 -  
73 - $sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/></td>\n"; 60 + $sToRender .= "<tr><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/>\n";
  61 + $sToRender .= getCancelButton(User::get($iUserID)) . "</td></tr>";
74 $sToRender .= "</table>\n"; 62 $sToRender .= "</table>\n";
75 -  
76 -  
77 - 63 +
78 return $sToRender; 64 return $sToRender;
79 -  
80 -  
81 -  
82 } 65 }
83 66
84 // if edition is successful print otu success page 67 // if edition is successful print otu success page
85 function getEditPageSuccess() { 68 function getEditPageSuccess() {
86 global $default; 69 global $default;
87 70
88 - $sToRender .= "<br></br>\n";  
89 - $sToRender .= "<b>Success!</b>\n"; 71 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit User Properties") . "</table>";
90 $sToRender .= "<table>\n"; 72 $sToRender .= "<table>\n";
91 - $sToRender .= "<br></br>\n"; 73 + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
92 $sToRender .= "<tr></tr>\n"; 74 $sToRender .= "<tr></tr>\n";
93 $sToRender .= "<tr><td>The User was successfully modified</td></tr>\n"; 75 $sToRender .= "<tr><td>The User was successfully modified</td></tr>\n";
94 $sToRender .= "<tr></tr>\n"; 76 $sToRender .= "<tr></tr>\n";
@@ -107,10 +89,9 @@ function getEditPageSuccess() { @@ -107,10 +89,9 @@ function getEditPageSuccess() {
107 function getEditPageFail() { 89 function getEditPageFail() {
108 global $default; 90 global $default;
109 91
110 - $sToRender .= "<br></br>\n";  
111 - $sToRender .= "<b>FAILED!</b>\n"; 92 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit User Properties") . "</table>";
112 $sToRender .= "<table>\n"; 93 $sToRender .= "<table>\n";
113 - $sToRender .= "<br></br>\n"; 94 + $sToRender .= "<tr><td><b>Failed!</b></td></tr>\n";
114 $sToRender .= "<tr></tr>\n"; 95 $sToRender .= "<tr></tr>\n";
115 $sToRender .= "<tr><td>User modification Failed!</td></tr>\n"; 96 $sToRender .= "<tr><td>User modification Failed!</td></tr>\n";
116 $sToRender .= "<tr></tr>\n"; 97 $sToRender .= "<tr></tr>\n";
@@ -130,8 +111,7 @@ function getUserDisplay($oUser) { @@ -130,8 +111,7 @@ function getUserDisplay($oUser) {
130 global $default; 111 global $default;
131 if (!isset($oUser)) { 112 if (!isset($oUser)) {
132 $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID"); 113 $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
133 - //$oPatternListBox->setIncludeDefaultValue(true);  
134 - $oPatternListBox->setPostBackOnChange(true); 114 + $oPatternListBox->setPostBackOnChange(true);
135 return $oPatternListBox->render(); 115 return $oPatternListBox->render();
136 } else { 116 } else {
137 return "<input type=\"hidden\" name=\"fUserID\" value=\"" . $oUser->iId . "\">\n" . 117 return "<input type=\"hidden\" name=\"fUserID\" value=\"" . $oUser->iId . "\">\n" .
@@ -145,8 +125,6 @@ function getUserDisplay($oUser) { @@ -145,8 +125,6 @@ function getUserDisplay($oUser) {
145 function getUpdateButton($oUser) { 125 function getUpdateButton($oUser) {
146 global $default; 126 global $default;
147 if (!isset($oUser)) { 127 if (!isset($oUser)) {
148 - return "Please select a User: ";  
149 - } else {  
150 return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/></td>\n"; 128 return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/></td>\n";
151 } 129 }
152 } 130 }
@@ -155,9 +133,9 @@ function getUpdateButton($oUser) { @@ -155,9 +133,9 @@ function getUpdateButton($oUser) {
155 function getCancelButton($oUser) { 133 function getCancelButton($oUser) {
156 global $default; 134 global $default;
157 if (!isset($oUser)) { 135 if (!isset($oUser)) {
158 - //return "<td align = right><a href=\"$default->rootUrl/control.php?action=UserManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n"; 136 + return "<a href=\"$default->rootUrl/control.php?action=userManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border=\"0\"/></a>\n";
159 } else { 137 } else {
160 - return "<td align = right><a href=\"$default->rootUrl/control.php?action=editUser\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n"; 138 + return "<a href=\"$default->rootUrl/control.php?action=editUser\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a>\n";
161 } 139 }
162 } 140 }
163 ?> 141 ?>
164 \ No newline at end of file 142 \ No newline at end of file