Peter M. Groen / knowledgetree

Commit 2ee9154cd9522268735b45cfae6223cd2488b978

Authored by Michael Joseph
1 parent a2adc4b4

added headings 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1579 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 21 additions and 43 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
  View file @2ee9154
@@ -12,11 +12,9 @@ @@ -12,11 +12,9 @@
12 function getSelectUserPage($aResults) { 12 function getSelectUserPage($aResults) {
13 global $default; 13 global $default;
14 14
15 - //$sToRender = renderHeading("User Administration");  
16 - $sToRender .= "<br></br>\n";  
17 - $sToRender .= "<b>Select the User to add to the System:</b>\n"; 15 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
18 $sToRender .= "<table>\n"; 16 $sToRender .= "<table>\n";
19 - $sToRender .= "<br></br>\n"; 17 + $sToRender .= "<tr><td>Select the User to add to the System:</td></tr>\n";
20 $sToRender .= "<tr><td><select name=\"fName\">\n"; 18 $sToRender .= "<tr><td><select name=\"fName\">\n";
21 foreach ($aResults as $sName => $aAttributes) { 19 foreach ($aResults as $sName => $aAttributes) {
22 $sToRender .= "<option value=\"$sName\">$sName</option>"; 20 $sToRender .= "<option value=\"$sName\">$sName</option>";
@@ -33,12 +31,10 @@ function getAddPage($unitID) { @@ -33,12 +31,10 @@ function getAddPage($unitID) {
33 31
34 global $default; 32 global $default;
35 33
36 - //$sToRender = renderHeading("User Administration");  
37 - $sToRender .= "<br></br>\n";  
38 - $sToRender .= "<b>Add a New User to the System:</b>\n"; 34 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
39 $sToRender .= "<table>\n"; 35 $sToRender .= "<table>\n";
40 - $sToRender .= "<br></br>\n";  
41 - $sToRender .= "<tr>Please enter a VALID Username to search for in the text box below</tr>\n"; 36 + $sToRender .= "<tr><td>Add a New User to the System:</td></tr>\n";
  37 + $sToRender .= "<tr><td>Please enter a VALID Username to search for in the text box below</td></tr>\n";
42 $sToRender .= "<tr>\n"; 38 $sToRender .= "<tr>\n";
43 $sToRender .= "<td>Username: </td><td><input size = \"40\" type=\"text\" name=\"fName\"> </td>\n"; 39 $sToRender .= "<td>Username: </td><td><input size = \"40\" type=\"text\" name=\"fName\"> </td>\n";
44 $sToRender .= "</tr>\n"; 40 $sToRender .= "</tr>\n";
@@ -56,14 +52,12 @@ function getAddPage($unitID) { @@ -56,14 +52,12 @@ function getAddPage($unitID) {
56 function getDetailsDBPage($suserName, $aAttributes) { 52 function getDetailsDBPage($suserName, $aAttributes) {
57 53
58 global $default; 54 global $default;
  55 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
59 foreach ($aAttributes as $sUserName => $aUserAttributes) { 56 foreach ($aAttributes as $sUserName => $aUserAttributes) {
60 - $sToRender .= "<br></br>\n";  
61 - $sToRender .= "<b>User Details: </b>\n";  
62 $sToRender .= "<table>\n"; 57 $sToRender .= "<table>\n";
63 - $sToRender .= "<br></br>\n"; 58 + $sToRender .= "<tr><td><b>User Details: </b></td></tr>\n";
64 $sToRender .= "<tr>\n"; 59 $sToRender .= "<tr>\n";
65 $sToRender .= "<td>Username: </td><td><input size = \"40\" type=\"text\" name=\"fUsername\" value = \"". $aUserAttributes["username"]. "\"> </td>\n"; 60 $sToRender .= "<td>Username: </td><td><input size = \"40\" type=\"text\" name=\"fUsername\" value = \"". $aUserAttributes["username"]. "\"> </td>\n";
66 - //$sToRender .= "<input type=\"hidden\" name=\"fUsername\" value = \"" . $aUserAttributes["username"] ."\">\n";  
67 $sToRender .= "</tr>\n"; 61 $sToRender .= "</tr>\n";
68 $sToRender .= "<tr>\n"; 62 $sToRender .= "<tr>\n";
69 $sToRender .= "<td>Password: </td><td><input size = \"40\" type=\"password\" name=\"fPassword\"></td>\n"; 63 $sToRender .= "<td>Password: </td><td><input size = \"40\" type=\"password\" name=\"fPassword\"></td>\n";
@@ -81,17 +75,10 @@ function getDetailsDBPage($suserName, $aAttributes) { @@ -81,17 +75,10 @@ function getDetailsDBPage($suserName, $aAttributes) {
81 $sToRender .= "<td>Email Notification: </td><td><input type=\"checkbox\" name=\"fEmailNotification\" value=\"" . $aUserAttributes["email_notification"] . "\" " . ($aUserAttributes["email_notification"] == "1" ? "checked" : "") . "\"> </td>\n"; 75 $sToRender .= "<td>Email Notification: </td><td><input type=\"checkbox\" name=\"fEmailNotification\" value=\"" . $aUserAttributes["email_notification"] . "\" " . ($aUserAttributes["email_notification"] == "1" ? "checked" : "") . "\"> </td>\n";
82 $sToRender .= "</tr>\n"; 76 $sToRender .= "</tr>\n";
83 $sToRender .= "<tr>\n"; 77 $sToRender .= "<tr>\n";
84 - $sToRender .= "<td>Sms Notification: </td><td><input type=\"checkbox\" name=\"fSmsNotification\" value=\"" . $aUserAttributes["sms_notification"] . "\" " . ($aUserAttributes["sms_notification"] == "1" ? "checked" : "") . "\"> </td>\n"; 78 + $sToRender .= "<td>Sms Notification: </td><td><input type=\"checkbox\" name=\"fSmsNotification\" value=\"" . $aUserAttributes["sms_notification"] . "\" " . ($aUserAttributes["sms_notification"] == "1" ? "checked" : "") . "> </td>\n";
85 $sToRender .= "</tr>\n"; 79 $sToRender .= "</tr>\n";
86 $sToRender .= "<tr>\n"; 80 $sToRender .= "<tr>\n";
87 - $sToRender .= "</tr>\n";  
88 - $sToRender .= "<tr>\n";  
89 - $sToRender .= "</tr>\n";  
90 - $sToRender .= "<tr>\n";  
91 - $sToRender .= "</tr>\n";  
92 - $sToRender .= "<tr>\n";  
93 - $sToRender .= "<td></td><td>" . getAddButton();  
94 - $sToRender .= "<td></td><td>" . getCancelButton(); 81 + $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>";
95 $sToRender .= "</tr>\n"; 82 $sToRender .= "</tr>\n";
96 $sToRender .= "</table>\n"; 83 $sToRender .= "</table>\n";
97 } 84 }
@@ -101,12 +88,11 @@ function getDetailsDBPage($suserName, $aAttributes) { @@ -101,12 +88,11 @@ function getDetailsDBPage($suserName, $aAttributes) {
101 88
102 function getDetailsLDAPPage($suserName, $aAttributes) { 89 function getDetailsLDAPPage($suserName, $aAttributes) {
103 90
  91 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
104 global $default; 92 global $default;
105 foreach ($aAttributes as $sUserName => $aUserAttributes) { 93 foreach ($aAttributes as $sUserName => $aUserAttributes) {
106 - $sToRender .= "<br></br>\n";  
107 - $sToRender .= "<b>User Details: </b>\n";  
108 $sToRender .= "<table>\n"; 94 $sToRender .= "<table>\n";
109 - $sToRender .= "<br></br>\n"; 95 + $sToRender .= "<tr><td><b>User Details: </b></td></tr>\n";
110 $sToRender .= "<tr>\n"; 96 $sToRender .= "<tr>\n";
111 $sToRender .= "<td>LDAP DN: </td><td><input disabled size = \"40\" type=\"text\" name=\"fLdap\" value = \"". $aUserAttributes["dn"]. "\"> </td>\n"; 97 $sToRender .= "<td>LDAP DN: </td><td><input disabled size = \"40\" type=\"text\" name=\"fLdap\" value = \"". $aUserAttributes["dn"]. "\"> </td>\n";
112 $sToRender .= "<input type=\"hidden\" name=\"fLdap\" value = \"". $aUserAttributes["dn"]. "\">\n"; 98 $sToRender .= "<input type=\"hidden\" name=\"fLdap\" value = \"". $aUserAttributes["dn"]. "\">\n";
@@ -130,19 +116,14 @@ function getDetailsLDAPPage($suserName, $aAttributes) { @@ -130,19 +116,14 @@ function getDetailsLDAPPage($suserName, $aAttributes) {
130 $sToRender .= "</tr>\n"; 116 $sToRender .= "</tr>\n";
131 $sToRender .= "<tr>\n"; 117 $sToRender .= "<tr>\n";
132 $sToRender .= "<td>Sms Notification: </td><td><input type=\"checkbox\" name=\"fSmsNotification\"/> </td>\n"; 118 $sToRender .= "<td>Sms Notification: </td><td><input type=\"checkbox\" name=\"fSmsNotification\"/> </td>\n";
133 - $sToRender .= "<tr>\n";  
134 - $sToRender .= "</tr>\n";  
135 - $sToRender .= "<tr>\n";  
136 $sToRender .= "</tr>\n"; 119 $sToRender .= "</tr>\n";
137 $sToRender .= "<tr>\n"; 120 $sToRender .= "<tr>\n";
138 - $sToRender .= "<td></td><td>" . getAddButton();  
139 - $sToRender .= "<td></td><td>" . getCancelButton(); 121 + $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>";
140 $sToRender .= "</tr>\n"; 122 $sToRender .= "</tr>\n";
141 $sToRender .= "</table>\n"; 123 $sToRender .= "</table>\n";
142 } 124 }
143 - 125 +
144 return $sToRender; 126 return $sToRender;
145 -  
146 } 127 }
147 128
148 129
@@ -150,10 +131,9 @@ function getDetailsLDAPPage($suserName, $aAttributes) { @@ -150,10 +131,9 @@ function getDetailsLDAPPage($suserName, $aAttributes) {
150 function getPageSuccess() { 131 function getPageSuccess() {
151 global $default; 132 global $default;
152 133
153 - $sToRender .= "<br></br>\n";  
154 - $sToRender .= "<b>Addition Successful!</b>\n"; 134 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
155 $sToRender .= "<table>\n"; 135 $sToRender .= "<table>\n";
156 - $sToRender .= "<br></br>\n"; 136 + $sToRender .= "<tr><td><b>Addition Successful!</b></td></tr>\n";
157 $sToRender .= "<tr></tr>\n"; 137 $sToRender .= "<tr></tr>\n";
158 $sToRender .= "<tr><td>The User was successfully added to the System</td></tr>\n"; 138 $sToRender .= "<tr><td>The User was successfully added to the System</td></tr>\n";
159 $sToRender .= "<tr></tr>\n"; 139 $sToRender .= "<tr></tr>\n";
@@ -170,10 +150,9 @@ function getPageSuccess() { @@ -170,10 +150,9 @@ function getPageSuccess() {
170 function getPageFail() { 150 function getPageFail() {
171 global $default; 151 global $default;
172 152
173 - $sToRender .= "<br></br>\n";  
174 - $sToRender .= "<b>Addition Unsuccessful</b>\n"; 153 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
175 $sToRender .= "<table>\n"; 154 $sToRender .= "<table>\n";
176 - $sToRender .= "<br></br>\n"; 155 + $sToRender .= "<tr><td><b>Addition Successful!</b></td></tr>\n";
177 $sToRender .= "<tr></tr>\n"; 156 $sToRender .= "<tr></tr>\n";
178 $sToRender .= "<tr><td>The User was not added. Username Already exists!</td></tr>\n"; 157 $sToRender .= "<tr><td>The User was not added. Username Already exists!</td></tr>\n";
179 $sToRender .= "<tr></tr>\n"; 158 $sToRender .= "<tr></tr>\n";
@@ -192,10 +171,9 @@ function getPageFail() { @@ -192,10 +171,9 @@ function getPageFail() {
192 function getPageUsernameNotFound() { 171 function getPageUsernameNotFound() {
193 global $default; 172 global $default;
194 173
195 - $sToRender .= "<br></br>\n";  
196 - $sToRender .= "<b>Username not found!</b>\n"; 174 + $sToRender .= "<table width=\"600\">" . renderHeading("Add User To System") . "</table>";
197 $sToRender .= "<table>\n"; 175 $sToRender .= "<table>\n";
198 - $sToRender .= "<br></br>\n"; 176 + $sToRender .= "<tr><td><b>Username not found!</b></td></tr>\n";
199 $sToRender .= "<tr></tr>\n"; 177 $sToRender .= "<tr></tr>\n";
200 $sToRender .= "<tr><td>Please ensure that the username that you entered Exists!</td></tr>\n"; 178 $sToRender .= "<tr><td>Please ensure that the username that you entered Exists!</td></tr>\n";
201 $sToRender .= "<tr></tr>\n"; 179 $sToRender .= "<tr></tr>\n";
@@ -213,13 +191,13 @@ function getPageUsernameNotFound() { @@ -213,13 +191,13 @@ function getPageUsernameNotFound() {
213 // show delete button or select button 191 // show delete button or select button
214 function getAddButton() { 192 function getAddButton() {
215 global $default; 193 global $default;
216 - return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/></td>\n"; 194 + return "<input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n";
217 } 195 }
218 196
219 // show cancel button 197 // show cancel button
220 function getCancelButton() { 198 function getCancelButton() {
221 global $default; 199 global $default;
222 - return "<td align = right><a href=\"$default->rootUrl/control.php?action=addUser\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n"; 200 + return "<a href=\"$default->rootUrl/control.php?action=addUser\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a>\n";
223 201
224 } 202 }
225 203