Peter M. Groen / knowledgetree

Commit a385fa0c50d0e5f437e928b34c945a4936d86693

Authored by Michael Joseph
1 parent 8878f4ff

used refactored cancel button function 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2502 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 8 changed files with 55 additions and 58 deletions
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php
  View file @a385fa0
@@ -8,19 +8,20 @@ @@ -8,19 +8,20 @@
8 * 8 *
9 */ 9 */
10 require_once("../../../../../config/dmsDefaults.php"); 10 require_once("../../../../../config/dmsDefaults.php");
  11 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  12 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
  13 +require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
  14 +require_once("$default->fileSystemRoot/lib/security/permission.inc");
  15 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
  16 +require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  17 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  18 +require_once("$default->fileSystemRoot/presentation/Html.inc");
  19 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
  20 +require_once("addGroupUI.inc");
11 21
12 if (checkSession()) { 22 if (checkSession()) {
13 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");  
14 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");  
15 - require_once("addGroupUI.inc");  
16 - require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");  
17 - require_once("$default->fileSystemRoot/lib/security/permission.inc");  
18 - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  
19 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");  
20 - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");  
21 - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");  
22 - require_once("$default->fileSystemRoot/presentation/Html.inc");  
23 - 23 +
  24 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
24 $oPatternCustom = & new PatternCustom(); 25 $oPatternCustom = & new PatternCustom();
25 $oPatternCustom->setHtml(getPage()); 26 $oPatternCustom->setHtml(getPage());
26 $main->setCentralPayload($oPatternCustom); 27 $main->setCentralPayload($oPatternCustom);
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc
  View file @a385fa0
@@ -33,7 +33,7 @@ function getPage() { @@ -33,7 +33,7 @@ function getPage() {
33 $sToRender .= "<tr>\n"; 33 $sToRender .= "<tr>\n";
34 $sToRender .= "</tr>\n"; 34 $sToRender .= "</tr>\n";
35 $sToRender .= "<td align=\"right\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>"; 35 $sToRender .= "<td align=\"right\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
36 - $sToRender .= generateControllerLink("listGroups", "", "<image border=\"0\" src=\"$default->graphicsUrl/widgets/cancel.gif\"/>") . "</td>\n"; 36 + $sToRender .= getCancelButton("listGroups") . "</td>\n";
37 $sToRender .= "</table>\n"; 37 $sToRender .= "</table>\n";
38 38
39 return $sToRender; 39 return $sToRender;
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
  View file @a385fa0
@@ -8,24 +8,24 @@ @@ -8,24 +8,24 @@
8 * 8 *
9 */ 9 */
10 require_once("../../../../../config/dmsDefaults.php"); 10 require_once("../../../../../config/dmsDefaults.php");
  11 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  12 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
  13 +require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
  14 +require_once("$default->fileSystemRoot/lib/security/permission.inc");
  15 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
  16 +require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  17 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  18 +require_once("$default->fileSystemRoot/presentation/Html.inc");
  19 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
  20 +require_once("addOrgUI.inc");
11 21
12 if (checkSession()) { 22 if (checkSession()) {
13 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");  
14 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");  
15 - require_once("addOrgUI.inc");  
16 - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");  
17 - require_once("$default->fileSystemRoot/lib/security/permission.inc");  
18 - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  
19 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");  
20 - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");  
21 - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");  
22 - require_once("$default->fileSystemRoot/presentation/Html.inc");  
23 -  
24 $oPatternCustom = & new PatternCustom(); 23 $oPatternCustom = & new PatternCustom();
25 $oPatternCustom->setHtml(getPage()); 24 $oPatternCustom->setHtml(getPage());
  25 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
26 $main->setCentralPayload($oPatternCustom); 26 $main->setCentralPayload($oPatternCustom);
27 $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addOrgSuccess&fedit=1")); 27 $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addOrgSuccess&fedit=1"));
28 $main->setHasRequiredFields(true); 28 $main->setHasRequiredFields(true);
29 $main->render(); 29 $main->render();
30 } 30 }
31 -?> 31 -?>
  32 +?>
32 \ No newline at end of file 33 \ No newline at end of file
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
  View file @a385fa0
@@ -15,7 +15,6 @@ function getPage() { @@ -15,7 +15,6 @@ 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("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); 20 $oPatternCreate = & new PatternCreate("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
@@ -31,7 +30,8 @@ function getPage() { @@ -31,7 +30,8 @@ function getPage() {
31 $sToRender .= "</tr>\n"; 30 $sToRender .= "</tr>\n";
32 $sToRender .= "<tr>\n"; 31 $sToRender .= "<tr>\n";
33 $sToRender .= "</tr>\n"; 32 $sToRender .= "</tr>\n";
34 - $sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n"; 33 + $sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
  34 + $sToRender .= getCancelButton("listOrg") . "</td>\n";
35 $sToRender .= "</table>\n"; 35 $sToRender .= "</table>\n";
36 36
37 return $sToRender; 37 return $sToRender;
presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
  View file @a385fa0
@@ -8,20 +8,21 @@ @@ -8,20 +8,21 @@
8 * 8 *
9 */ 9 */
10 require_once("../../../../../config/dmsDefaults.php"); 10 require_once("../../../../../config/dmsDefaults.php");
  11 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  12 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
  13 +require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
  14 +require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
  15 +require_once("$default->fileSystemRoot/lib/security/permission.inc");
  16 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
  17 +require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  18 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  19 +require_once("$default->fileSystemRoot/presentation/Html.inc");
  20 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
  21 +require_once("addUnitUI.inc");
11 22
12 if (checkSession()) { 23 if (checkSession()) {
13 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");  
14 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");  
15 - require_once("addUnitUI.inc");  
16 - require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");  
17 - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");  
18 - require_once("$default->fileSystemRoot/lib/security/permission.inc");  
19 - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  
20 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");  
21 - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");  
22 - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");  
23 - require_once("$default->fileSystemRoot/presentation/Html.inc");  
24 24
  25 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
25 $oPatternCustom = & new PatternCustom(); 26 $oPatternCustom = & new PatternCustom();
26 27
27 if (isset($fForStore)) { 28 if (isset($fForStore)) {
presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
  View file @a385fa0
@@ -23,7 +23,7 @@ function getAddPage() { @@ -23,7 +23,7 @@ function getAddPage() {
23 $sToRender .= "<tr>\n"; 23 $sToRender .= "<tr>\n";
24 $sToRender .= "</tr>\n"; 24 $sToRender .= "</tr>\n";
25 $sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>"; 25 $sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
26 - $sToRender .= generateControllerLink("listUnits", "", "<image border=\"0\" src=\"$default->graphicsUrl/widgets/cancel.gif\"/>") . "</td>\n"; 26 + $sToRender .= getCancelButton("listUnits") . "</td>\n";
27 $sToRender .= "</table>\n"; 27 $sToRender .= "</table>\n";
28 28
29 // javascript validation 29 // javascript validation
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
  View file @a385fa0
@@ -8,21 +8,21 @@ @@ -8,21 +8,21 @@
8 * 8 *
9 */ 9 */
10 require_once("../../../../../config/dmsDefaults.php"); 10 require_once("../../../../../config/dmsDefaults.php");
  11 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  12 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
  13 +require_once("$default->fileSystemRoot/lib/users/User.inc");
  14 +require_once("$default->fileSystemRoot/lib/groups/Group.inc");
  15 +require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");
  16 +require_once("$default->fileSystemRoot/lib/security/permission.inc");
  17 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
  18 +require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  19 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  20 +require_once("$default->fileSystemRoot/presentation/Html.inc");
  21 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
  22 +require_once("addUserUI.inc");
11 23
12 if (checkSession()) { 24 if (checkSession()) {
13 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");  
14 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");  
15 - require_once("addUserUI.inc");  
16 - require_once("$default->fileSystemRoot/lib/users/User.inc");  
17 - require_once("$default->fileSystemRoot/lib/groups/Group.inc");  
18 - require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");  
19 - require_once("$default->fileSystemRoot/lib/security/permission.inc");  
20 - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  
21 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");  
22 - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");  
23 - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");  
24 - require_once("$default->fileSystemRoot/presentation/Html.inc");  
25 - 25 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
26 $oPatternCustom = & new PatternCustom(); 26 $oPatternCustom = & new PatternCustom();
27 //create db object 27 //create db object
28 $oAuth = new $default->authenticationClass; 28 $oAuth = new $default->authenticationClass;
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
  View file @a385fa0
@@ -71,7 +71,7 @@ function getDetailsDBPage($sUserName, $aAttributes) { @@ -71,7 +71,7 @@ function getDetailsDBPage($sUserName, $aAttributes) {
71 $sToRender .= "</tr>\n"; 71 $sToRender .= "</tr>\n";
72 $sToRender .= "<tr><td><b>Initial Group</b></td><td>" . getGroupListBox() . "</td></tr>\n"; 72 $sToRender .= "<tr><td><b>Initial Group</b></td><td>" . getGroupListBox() . "</td></tr>\n";
73 $sToRender .= "<tr>\n"; 73 $sToRender .= "<tr>\n";
74 - $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>"; 74 + $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton("listUsers") . "</td>";
75 $sToRender .= "</tr>\n"; 75 $sToRender .= "</tr>\n";
76 $sToRender .= "</table>\n"; 76 $sToRender .= "</table>\n";
77 $sToRender .= getJavascriptValidation(); 77 $sToRender .= getJavascriptValidation();
@@ -110,7 +110,7 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) { @@ -110,7 +110,7 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) {
110 $sToRender .= "</tr>\n"; 110 $sToRender .= "</tr>\n";
111 $sToRender .= "<tr><td><b>Group</b></td><td>" . getGroupListBox() . "</td></tr>\n"; 111 $sToRender .= "<tr><td><b>Group</b></td><td>" . getGroupListBox() . "</td></tr>\n";
112 $sToRender .= "<tr>\n"; 112 $sToRender .= "<tr>\n";
113 - $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>"; 113 + $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton("listUsers") . "</td>";
114 $sToRender .= "</tr>\n"; 114 $sToRender .= "</tr>\n";
115 $sToRender .= "</table>\n"; 115 $sToRender .= "</table>\n";
116 $sToRender .= getJavascriptValidation(true); 116 $sToRender .= getJavascriptValidation(true);
@@ -161,11 +161,6 @@ function getAddButton() { @@ -161,11 +161,6 @@ function getAddButton() {
161 return "<input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n"; 161 return "<input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n";
162 } 162 }
163 163
164 -function getCancelButton() {  
165 - global $default;  
166 - return generateControllerLink("listUsers", "", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" />");  
167 -}  
168 -  
169 function getGroupListBox() { 164 function getGroupListBox() {
170 global $default; 165 global $default;
171 if (Permission::userIsSystemAdministrator()) { 166 if (Permission::userIsSystemAdministrator()) {