Commit ad14c384b8f4e3e21eb3e250d977986a6dcc3814
1 parent
58bceeab
added headings
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1575 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
3 changed files
with
15 additions
and
23 deletions
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php
| @@ -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/PatternCreate.inc"); | 14 | require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); |
| 15 | require_once("addGroupUI.inc"); | 15 | require_once("addGroupUI.inc"); |
| 16 | + require_once("../adminUI.inc"); | ||
| 16 | require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); | 17 | require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); |
| 17 | require_once("$default->fileSystemRoot/lib/security/permission.inc"); | 18 | require_once("$default->fileSystemRoot/lib/security/permission.inc"); |
| 18 | require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); | 19 | require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); |
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc
| @@ -15,16 +15,15 @@ function getPage() { | @@ -15,16 +15,15 @@ function getPage() { | ||
| 15 | $aParameterNumbers = array(0); | 15 | $aParameterNumbers = array(0); |
| 16 | $aDisplayColumnTypes = array(1); | 16 | $aDisplayColumnTypes = array(1); |
| 17 | $aRequired = array(1); | 17 | $aRequired = array(1); |
| 18 | - //$aDropDownListTableNames = array(10=>"document_types_lookup"); | ||
| 19 | 18 | ||
| 20 | // create a text field that is required | 19 | // create a text field that is required |
| 21 | $oPatternCreate = & new PatternCreate("Group", "groups/Group.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); | 20 | $oPatternCreate = & new PatternCreate("Group", "groups/Group.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); |
| 22 | $oPatternCreate->setUniqueName("group"); | 21 | $oPatternCreate->setUniqueName("group"); |
| 23 | 22 | ||
| 24 | - $sToRender .= "<br></br>\n"; | ||
| 25 | - $sToRender .= "<b>Add a New Group to the System:</b>\n"; | 23 | + $sToRender .= "<table width=\"600\">" . renderHeading("Add Group") . "</table>"; |
| 24 | + | ||
| 26 | $sToRender .= "<table>\n"; | 25 | $sToRender .= "<table>\n"; |
| 27 | - $sToRender .= "<br></br>\n"; | 26 | + $sToRender .= "<tr><td>Add a New Group to the System</td></tr>\n"; |
| 28 | $sToRender .= "<tr></tr>\n"; | 27 | $sToRender .= "<tr></tr>\n"; |
| 29 | $sToRender .= "<tr>\n"; | 28 | $sToRender .= "<tr>\n"; |
| 30 | $sToRender .= "<td>" . $oPatternCreate->render() . "</td>\n"; | 29 | $sToRender .= "<td>" . $oPatternCreate->render() . "</td>\n"; |
| @@ -33,7 +32,7 @@ function getPage() { | @@ -33,7 +32,7 @@ function getPage() { | ||
| 33 | $sToRender .= "</tr>\n"; | 32 | $sToRender .= "</tr>\n"; |
| 34 | $sToRender .= "<tr>\n"; | 33 | $sToRender .= "<tr>\n"; |
| 35 | $sToRender .= "</tr>\n"; | 34 | $sToRender .= "</tr>\n"; |
| 36 | - $sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n"; | 35 | + $sToRender .= "<td align=\"right\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n"; |
| 37 | $sToRender .= "</table>\n"; | 36 | $sToRender .= "</table>\n"; |
| 38 | 37 | ||
| 39 | return $sToRender; | 38 | return $sToRender; |
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc
| @@ -18,15 +18,12 @@ function getPage($iUserID) { | @@ -18,15 +18,12 @@ function getPage($iUserID) { | ||
| 18 | if (isset($iUserID)) { | 18 | if (isset($iUserID)) { |
| 19 | $oUser = User::get($iUserID); | 19 | $oUser = User::get($iUserID); |
| 20 | } else { | 20 | } else { |
| 21 | - $heading = "<tr>Please select a User: </tr>\n"; | 21 | + $heading = "<tr><td>Please select a User:</td></tr>\n"; |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | - $sToRender .= "<br></br>\n"; | ||
| 25 | - $sToRender .= "<b>Select a User to Remove from a Group:</b>\n"; | 24 | + $sToRender .= "<table width=\"600\">" . renderHeading("Remove User From Group") . "</table>"; |
| 26 | $sToRender .= "<table>\n"; | 25 | $sToRender .= "<table>\n"; |
| 27 | - $sToRender .= "<br></br>\n"; | ||
| 28 | $sToRender .= $heading; | 26 | $sToRender .= $heading; |
| 29 | - $sToRender .= "<br>\n"; | ||
| 30 | $sToRender .= "<tr>\n"; | 27 | $sToRender .= "<tr>\n"; |
| 31 | $sToRender .= "</tr>\n"; | 28 | $sToRender .= "</tr>\n"; |
| 32 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; | 29 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; |
| @@ -71,10 +68,9 @@ function getGroupPage($iUserID, $aGroup) { | @@ -71,10 +68,9 @@ function getGroupPage($iUserID, $aGroup) { | ||
| 71 | $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; | 68 | $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; |
| 72 | } | 69 | } |
| 73 | 70 | ||
| 74 | - $sToRender .= "<br></br>\n"; | ||
| 75 | - $sToRender .= "<b>Select a Group to Remove User from:</b>\n"; | 71 | + $sToRender .= "<table width=\"600\">" . renderHeading("Remove User From Group") . "</table>"; |
| 76 | $sToRender .= "<table>\n"; | 72 | $sToRender .= "<table>\n"; |
| 77 | - $sToRender .= "<br></br>\n"; | 73 | + $sToRender .= "<tr><td>Select a Group to Remove User from:</td></tr>\n"; |
| 78 | $sToRender .= "<tr>\n"; | 74 | $sToRender .= "<tr>\n"; |
| 79 | $sToRender .= "</tr>\n"; | 75 | $sToRender .= "</tr>\n"; |
| 80 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; | 76 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; |
| @@ -104,7 +100,7 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | @@ -104,7 +100,7 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | ||
| 104 | // change headings if User selected | 100 | // change headings if User selected |
| 105 | if (isset($iUserID)) { | 101 | if (isset($iUserID)) { |
| 106 | $oUser = User::get($iUserID); | 102 | $oUser = User::get($iUserID); |
| 107 | - $heading = "<tr>Are you sure you wish to remove this user from the Group?</tr>"; | 103 | + $heading = "<tr><td>Are you sure you wish to remove this user from the Group?</td></tr>"; |
| 108 | } | 104 | } |
| 109 | 105 | ||
| 110 | // change headings if User selected | 106 | // change headings if User selected |
| @@ -113,10 +109,8 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | @@ -113,10 +109,8 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | ||
| 113 | $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; | 109 | $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; |
| 114 | } | 110 | } |
| 115 | 111 | ||
| 116 | - $sToRender .= "<br></br>\n"; | ||
| 117 | - $sToRender .= "<b>Select a Group to Remove User from:</b>\n"; | 112 | + $sToRender .= "<table width=\"600\">" . renderHeading("Remove User From Group") . "</table>"; |
| 118 | $sToRender .= "<table>\n"; | 113 | $sToRender .= "<table>\n"; |
| 119 | - $sToRender .= "<br></br>\n"; | ||
| 120 | $sToRender .= "<tr>\n"; | 114 | $sToRender .= "<tr>\n"; |
| 121 | $sToRender .= $heading; | 115 | $sToRender .= $heading; |
| 122 | $sToRender .= "</tr>\n"; | 116 | $sToRender .= "</tr>\n"; |
| @@ -142,10 +136,9 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | @@ -142,10 +136,9 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { | ||
| 142 | function getPageFail() { | 136 | function getPageFail() { |
| 143 | global $default; | 137 | global $default; |
| 144 | 138 | ||
| 145 | - $sToRender .= "<br></br>\n"; | ||
| 146 | - $sToRender .= "<b>Sorry, Removal Failed</b>\n"; | 139 | + $sToRender .= "<table width=\"600\">" . renderHeading("Remove User From Group") . "</table>"; |
| 147 | $sToRender .= "<table>\n"; | 140 | $sToRender .= "<table>\n"; |
| 148 | - $sToRender .= "<br></br>\n"; | 141 | + $sToRender .= "<tr><td><b>Sorry, Removal Failed</b></td></tr>\n"; |
| 149 | $sToRender .= "<tr></tr>\n"; | 142 | $sToRender .= "<tr></tr>\n"; |
| 150 | $sToRender .= "</tr>\n"; | 143 | $sToRender .= "</tr>\n"; |
| 151 | $sToRender .= "<tr>\n"; | 144 | $sToRender .= "<tr>\n"; |
| @@ -164,10 +157,9 @@ function getPageFail() { | @@ -164,10 +157,9 @@ function getPageFail() { | ||
| 164 | function getPageSuccess() { | 157 | function getPageSuccess() { |
| 165 | global $default; | 158 | global $default; |
| 166 | 159 | ||
| 167 | - $sToRender .= "<br></br>\n"; | ||
| 168 | - $sToRender .= "<b>Success!</b>\n"; | 160 | + $sToRender .= "<table width=\"600\">" . renderHeading("Remove User From Group") . "</table>"; |
| 169 | $sToRender .= "<table>\n"; | 161 | $sToRender .= "<table>\n"; |
| 170 | - $sToRender .= "<br></br>\n"; | 162 | + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n"; |
| 171 | $sToRender .= "<tr></tr>\n"; | 163 | $sToRender .= "<tr></tr>\n"; |
| 172 | $sToRender .= "<tr><td>The User was successfully removed from the Group</td></tr>\n"; | 164 | $sToRender .= "<tr><td>The User was successfully removed from the Group</td></tr>\n"; |
| 173 | $sToRender .= "<tr></tr>\n"; | 165 | $sToRender .= "<tr></tr>\n"; |