Peter M. Groen / knowledgetree

Commit 1cdea1a04d3663f50cd02b696b05f39e5ff669ef

Authored by Michael Joseph
1 parent 04a13c07

updated look and feel and formatted 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1591 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 118 additions and 124 deletions
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
  View file @1cdea1a
@@ -10,45 +10,44 @@ @@ -10,45 +10,44 @@
10 require_once("../../../../../config/dmsDefaults.php"); 10 require_once("../../../../../config/dmsDefaults.php");
11 11
12 if (checkSession()) { 12 if (checkSession()) {
13 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");  
14 - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");  
15 - require_once("removeOrgUI.inc");  
16 - require_once("$default->fileSystemRoot/lib/security/permission.inc");  
17 - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.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();  
25 -  
26 - // get main page  
27 - if (isset($fOrgID)) {  
28 -  
29 - $oPatternCustom->setHtml(getDeletePage($fOrgID));  
30 - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");  
31 -  
32 - // get delete page  
33 - } else {  
34 - $oPatternCustom->setHtml(getDeletePage(null));  
35 - $main->setFormAction($_SERVER["PHP_SELF"]);  
36 - }  
37 -  
38 - // if delete entry  
39 - if (isset($fForDelete)) {  
40 - $oOrg = Organisation::get($fOrgID);  
41 - $oOrg->setName($fOrgName);  
42 -  
43 - if ($oOrg->delete()) {  
44 - $oPatternCustom->setHtml(getDeleteSuccessPage());  
45 -  
46 - } else {  
47 - $oPatternCustom->setHtml(getDeleteFailPage());  
48 - }  
49 - }  
50 -  
51 - $main->setCentralPayload($oPatternCustom);  
52 - $main->render(); 13 + require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  14 + require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
  15 + require_once("removeOrgUI.inc");
  16 + require_once("../adminUI.inc");
  17 + require_once("$default->fileSystemRoot/lib/security/permission.inc");
  18 + require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.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 +
  25 + $oPatternCustom = & new PatternCustom();
  26 +
  27 + // get main page
  28 + if (isset($fOrgID)) {
  29 + $oPatternCustom->setHtml(getDeletePage($fOrgID));
  30 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");
  31 + // get delete page
  32 + }
  33 + else {
  34 + $oPatternCustom->setHtml(getDeletePage(null));
  35 + $main->setFormAction($_SERVER["PHP_SELF"]);
  36 + }
  37 +
  38 + // if delete entry
  39 + if (isset($fForDelete)) {
  40 + $oOrg = Organisation::get($fOrgID);
  41 + $oOrg->setName($fOrgName);
  42 +
  43 + if ($oOrg->delete()) {
  44 + $oPatternCustom->setHtml(getDeleteSuccessPage());
  45 + } else {
  46 + $oPatternCustom->setHtml(getDeleteFailPage());
  47 + }
  48 + }
  49 +
  50 + $main->setCentralPayload($oPatternCustom);
  51 + $main->render();
53 } 52 }
54 ?> 53 ?>
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
  View file @1cdea1a
@@ -9,107 +9,102 @@ @@ -9,107 +9,102 @@
9 * 9 *
10 */ 10 */
11 // gets the delete stuff 11 // gets the delete stuff
12 -function getDeletePage($iOrgID) {  
13 - global $default;  
14 - $oOrg = null;  
15 - if (isset($iOrgID)) {  
16 - $oOrg = Organisation::get($iOrgID);  
17 - $sToRender .= "<br></br>\n";  
18 - $sToRender .= "<b>Are you sure you wish to Remove this Organisation?:</b>\n";  
19 - }  
20 - else{  
21 - $sToRender .= "<br></br>\n";  
22 - $sToRender .= "<b>Remove Organisation From System:</b>\n";  
23 - }  
24 -  
25 - $sToRender .= "<table>\n";  
26 - $sToRender .= "<br></br>\n";  
27 - $sToRender .= "<tr></tr>\n";  
28 - $sToRender .= "<tr>\n";  
29 - $sToRender .= "<td>Organisation Name: " . getOrgDisplay($oOrg) . "</td>\n";  
30 - $sToRender .= "</tr>\n";  
31 - $sToRender .= "<tr>\n";  
32 - $sToRender .= "</tr>\n";  
33 - $sToRender .= "<tr>\n";  
34 - $sToRender .= "</tr>\n";  
35 - $sToRender .= "<tr>\n";  
36 - $sToRender .= "</tr>\n";  
37 - $sToRender .= "<tr>\n";  
38 - $sToRender .= "</tr>\n";  
39 - $sToRender .= getDeleteButton($oOrg);  
40 - $sToRender .= "</table>\n";  
41 -  
42 -  
43 - return $sToRender; 12 +function getDeletePage($iOrgID) {
  13 + global $default;
  14 + $oOrg = null;
  15 + if (isset($iOrgID)) {
  16 + $oOrg = Organisation::get($iOrgID);
  17 + $sHeading .= "<b>Are you sure you wish to Remove this Organisation?</b>\n";
  18 + } else {
  19 + $oOrg = null;
  20 + $sHeading .= "Please select a Organisation:";
  21 + }
  22 +
  23 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Organisation") . "</table>";
  24 + $sToRender .= "<table>\n";
  25 + $sToRender .= "<tr><td>$sHeading</td></tr>\n";
  26 + $sToRender .= "<tr>\n";
  27 + $sToRender .= "<td>Organisation Name: " . getOrgDisplay($oOrg) . "</td>\n";
  28 + $sToRender .= "</tr>\n";
  29 + $sToRender .= "<tr>\n";
  30 + $sToRender .= "</tr>\n";
  31 + $sToRender .= "<tr>\n";
  32 + $sToRender .= "</tr>\n";
  33 + $sToRender .= "<tr>\n";
  34 + $sToRender .= "</tr>\n";
  35 + $sToRender .= "<tr>\n";
  36 + $sToRender .= "</tr>\n";
  37 + $sToRender .= getDeleteButton($oOrg);
  38 + $sToRender .= "</table>\n";
  39 +
  40 + return $sToRender;
44 } 41 }
45 42
46 // get successfully deletion page 43 // get successfully deletion page
47 -function getDeleteSuccessPage() {  
48 -  
49 -global $default; 44 +function getDeleteSuccessPage() {
  45 +
  46 + global $default;
50 47
51 -$sToRender = "<br></br>\n" ;  
52 -$sToRender .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";  
53 -$sToRender .= "<tr>\n";  
54 -$sToRender .= "<td><b>Organisation SuccessFully Removed!</b></td>\n";  
55 -$sToRender .= "</tr>\n";  
56 -$sToRender .= "<tr></tr>\n";  
57 -$sToRender .= "<tr></tr>\n";  
58 -$sToRender .= "<tr></tr>\n";  
59 -$sToRender .= "<tr></tr>\n";  
60 -$sToRender .= "<tr>\n";  
61 -$sToRender .= "<td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";  
62 -$sToRender .= "</tr>\n";  
63 -$sToRender .= "</table>\n";  
64 -  
65 -return $sToRender; 48 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Organisation") . "</table>";
  49 + $sToRender .= "<table>\n";
  50 + $sToRender .= "<tr>\n";
  51 + $sToRender .= "<td><b>Organisation SuccessFully Removed!</b></td>\n";
  52 + $sToRender .= "</tr>\n";
  53 + $sToRender .= "<tr></tr>\n";
  54 + $sToRender .= "<tr></tr>\n";
  55 + $sToRender .= "<tr></tr>\n";
  56 + $sToRender .= "<tr></tr>\n";
  57 + $sToRender .= "<tr>\n";
  58 + $sToRender .= "<td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
  59 + $sToRender .= "</tr>\n";
  60 + $sToRender .= "</table>\n";
  61 +
  62 + return $sToRender;
66 } 63 }
67 64
68 // get deletion failed page 65 // get deletion failed page
69 -function getDeleteFailPage() { 66 +function getDeleteFailPage() {
  67 +
  68 + global $default;
70 69
71 -global $default; 70 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Organisation") . "</table>";
  71 + $sToRender .= "<table>\n";
  72 + $sToRender .= "<tr>\n";
  73 + $sToRender .= "<td><b>Deletion Failed!</b></td>\n";
  74 + $sToRender .= "</tr>\n";
  75 + $sToRender .= "<tr></tr>\n";
  76 + $sToRender .= "<tr></tr>\n";
  77 + $sToRender .= "<tr><td>Please Ensure that ALL Units has been Removed the Organisation it belongs to</td></tr>\n";
  78 + $sToRender .= "<tr></tr>\n";
  79 + $sToRender .= "</tr>\n";
  80 + $sToRender .= "<tr><td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td></tr>\n";
  81 + $sToRender .= "</table>\n";
72 82
73 -$sToRender = "<br></br>\n" ;  
74 -$sToRender .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";  
75 -$sToRender .= "<tr>\n";  
76 -$sToRender .= "<td><b>Deletion Failed!</b></td>\n";  
77 -$sToRender .= "</tr>\n";  
78 -$sToRender .= "<tr></tr>\n";  
79 -$sToRender .= "<tr></tr>\n";  
80 -$sToRender .= "<tr><td>Please Ensure that ALL Units has been Removed the Organisation it belongs to</td></tr>\n";  
81 -$sToRender .= "<tr></tr>\n";  
82 -$sToRender .= "</tr>\n";  
83 -$sToRender .= "<tr><td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td></tr>\n";  
84 -$sToRender .= "</table>\n";  
85 -  
86 -return $sToRender; 83 + return $sToRender;
87 } 84 }
88 85
89 // show listbox...or the text name 86 // show listbox...or the text name
90 function getOrgDisplay($oOrg) { 87 function getOrgDisplay($oOrg) {
91 - global $default;  
92 - if (!isset($oOrg)) {  
93 - $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");  
94 - $oPatternListBox->setIncludeDefaultValue(true);  
95 - $oPatternListBox->setPostBackOnChange(true);  
96 - return $oPatternListBox->render();  
97 - } else {  
98 - return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .  
99 - "<b>" . $oOrg->getName() . "</b>";  
100 - }  
101 - 88 + global $default;
  89 + if (!isset($oOrg)) {
  90 + $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
  91 + $oPatternListBox->setIncludeDefaultValue(true);
  92 + $oPatternListBox->setPostBackOnChange(true);
  93 + return $oPatternListBox->render();
  94 + } else {
  95 + return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .
  96 + "<b>" . $oOrg->getName() . "</b>";
  97 + }
  98 +
102 } 99 }
103 100
104 101
105 // show delete button 102 // show delete button
106 function getDeleteButton($oOrg) { 103 function getDeleteButton($oOrg) {
107 - global $default;  
108 - if (!isset($oOrg)) {  
109 - return "Please select a Org: ";  
110 - } else {  
111 - return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/></td>\n".  
112 - "<td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";  
113 - } 104 + global $default;
  105 + if (isset($oOrg)) {
  106 + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/></td>\n".
  107 + "<td align = right><a href=\"$default->rootUrl/control.php?action=removeOrg\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
  108 + }
114 } 109 }
115 ?> 110 ?>