Peter M. Groen / knowledgetree

Commit f65fd3ea1a36f34cbb8594670eb97301a19c0607

Authored by michael
1 parent 742ae2c2

updated look and feel and formatted 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1590 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 5 changed files with 36 additions and 50 deletions
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
  View file @f65fd3e
... ... @@ -13,6 +13,7 @@ if (checkSession()) {
13 13 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
14 14 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
15 15 require_once("addOrgUI.inc");
  16 + require_once("../adminUI.inc");
16 17 require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
17 18 require_once("$default->fileSystemRoot/lib/security/permission.inc");
18 19 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
... ...
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
  View file @f65fd3e
... ... @@ -9,38 +9,32 @@
9 9 */
10 10  
11 11 require_once("../../../../../config/dmsDefaults.php");
  12 +require_once("../adminUI.inc");
12 13  
13 14 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>Organisation added Successfully!</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=addOrg\"><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 15  
  16 +if(checkSession()) {
  17 +
  18 + // include the page template (with navbar)
  19 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
  20 +
  21 + $sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
  22 + $sToRender .= "<table>\n";
  23 + $sToRender .= "<tr>\n";
  24 + $sToRender .= "<td>Organisation added Successfully!</td>\n";
  25 + $sToRender .= "</tr>\n";
  26 + $sToRender .= "<tr></tr>\n";
  27 + $sToRender .= "<tr></tr>\n";
  28 + $sToRender .= "<tr></tr>\n";
  29 + $sToRender .= "<tr></tr>\n";
  30 + $sToRender .= "<tr>\n";
  31 + $sToRender .= "<td align = right><a href=\"$default->rootUrl/control.php?action=addOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
  32 + $sToRender .= "</tr>\n";
  33 + $sToRender .= "</table>\n";
  34 +
  35 + $oPatternCustom = & new PatternCustom();
  36 + $oPatternCustom->setHtml($sToRender);
  37 + $main->setCentralPayload($oPatternCustom);
  38 + $main->render();
44 39 }
45   -
46 40 ?>
47 41 \ No newline at end of file
... ...
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
  View file @f65fd3e
... ... @@ -21,10 +21,8 @@ function getPage() {
21 21 $oPatternCreate = & new PatternCreate("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
22 22 $oPatternCreate->setUniqueName("organisation");
23 23  
24   - $sToRender .= "<br></br>\n";
25   - $sToRender .= "<b>Add a New Organisation to the System:</b>\n";
  24 + $sToRender .= "<table width=\"600\">" . renderHeading("Add Organisation") . "</table>";
26 25 $sToRender .= "<table>\n";
27   - $sToRender .= "<br></br>\n";
28 26 $sToRender .= "<tr></tr>\n";
29 27 $sToRender .= "<tr>\n";
30 28 $sToRender .= "<td>" . $oPatternCreate->render() . "</td>\n";
... ...
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
  View file @f65fd3e
... ... @@ -13,6 +13,7 @@ if (checkSession()) {
13 13 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
14 14 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
15 15 require_once("editOrgUI.inc");
  16 + require_once("../adminUI.inc");
16 17 require_once("$default->fileSystemRoot/lib/security/permission.inc");
17 18 require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
18 19 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
... ...
presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
  View file @f65fd3e
... ... @@ -14,14 +14,11 @@ function getEditPage($iOrgID) {
14 14 $oOrg = null;
15 15 if (isset($iOrgID)) {
16 16 $oOrg = Organisation::get($iOrgID);
17   -
18 17 }
19 18  
20   - $sToRender .= "<br></br>\n";
21   - $sToRender .= "<b>Edit Organisation Properties:</b>\n";
  19 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit Organisation") . "</table>";
22 20 $sToRender .= "<table>\n";
23   - $sToRender .= "<br></br>\n";
24   - $sToRender .= "<tr></tr>\n";
  21 + $sToRender .= "<tr><td>Please select an organisation:</td></tr>\n";
25 22 $sToRender .= "<tr>\n";
26 23 $sToRender .= "<td>Organisation Name: </td><td>" . getOrgDisplay($oOrg) . "</td>\n";
27 24 $sToRender .= "</tr>\n";
... ... @@ -31,10 +28,9 @@ function getEditPage($iOrgID) {
31 28 $sToRender .= "<tr>\n";
32 29 $sToRender .= "</tr>\n";
33 30 $sToRender .= "<td></td>" . getUpdateButton($oOrg);
34   - $sToRender .= getCancelButton($oOrg);
  31 + $sToRender .= getCancelButton($oOrg);
35 32 $sToRender .= "</table>\n";
36 33  
37   -
38 34 return $sToRender;
39 35 }
40 36  
... ... @@ -42,10 +38,9 @@ function getEditPage($iOrgID) {
42 38 function getEditPageSuccess() {
43 39 global $default;
44 40  
45   - $sToRender .= "<br></br>\n";
46   - $sToRender .= "<b>Success!</b>\n";
  41 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit Organisation") . "</table>";
47 42 $sToRender .= "<table>\n";
48   - $sToRender .= "<br></br>\n";
  43 + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
49 44 $sToRender .= "<tr></tr>\n";
50 45 $sToRender .= "<tr><td>The Organisation was successfully modified</td></tr>\n";
51 46 $sToRender .= "<tr></tr>\n";
... ... @@ -64,10 +59,9 @@ function getEditPageSuccess() {
64 59 function getEditPageFail() {
65 60 global $default;
66 61  
67   - $sToRender .= "<br></br>\n";
68   - $sToRender .= "<b>Success!</b>\n";
  62 + $sToRender .= "<table width=\"600\">" . renderHeading("Edit Organisation") . "</table>";
69 63 $sToRender .= "<table>\n";
70   - $sToRender .= "<br></br>\n";
  64 + $sToRender .= "<tr><td><b>Failure!</b>>/td></tr>\n";
71 65 $sToRender .= "<tr></tr>\n";
72 66 $sToRender .= "<tr><td>Organisation modification Failed!</td></tr>\n";
73 67 $sToRender .= "<tr></tr>\n";
... ... @@ -101,9 +95,7 @@ function getOrgDisplay($oOrg) {
101 95 // gets the updatebutton when a Org is selected
102 96 function getUpdateButton($oOrg) {
103 97 global $default;
104   - if (!isset($oOrg)) {
105   - return "Please select a Organisation: ";
106   - } else {
  98 + if (isset($oOrg)) {
107 99 return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/></td>\n";
108 100 }
109 101 }
... ... @@ -112,7 +104,7 @@ function getUpdateButton($oOrg) {
112 104 function getCancelButton($oOrg) {
113 105 global $default;
114 106 if (!isset($oOrg)) {
115   - //return "<td align = right><a href=\"$default->rootUrl/control.php?action=groupManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
  107 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=orgManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border=\"0\"/></a></td>\n";
116 108 } else {
117 109 return "<td align = right><a href=\"$default->rootUrl/control.php?action=editOrg\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
118 110 }
... ...