Peter M. Groen / knowledgetree

Commit a2adc4b44dc5331886f97d4be13198de118c9871

Authored by Michael Joseph
1 parent 7cfcbe3c

added headings 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1578 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 24 additions and 32 deletions
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php
  View file @a2adc4b
... ... @@ -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("assignGroupToUnitUI.inc");
  16 + require_once("../adminUI.inc");
16 17 require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
17 18 require_once("$default->fileSystemRoot/lib/groups/Group.inc");
18 19 require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
... ...
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
  View file @a2adc4b
... ... @@ -16,12 +16,12 @@ function getPage($iGroupID, $iUnitID) {
16 16  
17 17 if (isset($iGroupID)) {
18 18 $oGroup = Group::get($iGroupID);
19   - $heading = "<tr>Are you Sure you wish to assign the Group to the Unit? </tr>\n";
  19 + $heading = "<tr><td>Are you Sure you wish to assign the Group to the Unit?</td></tr>\n";
20 20 } else {
21 21 if (Permission::userIsUnitAdministrator()) {
22   - $heading = "<tr>Please Assign a Group to your Unit: </tr>\n";
  22 + $heading = "<tr><td>Please Assign a Group to your Unit:</td></tr>\n";
23 23 } else {
24   - $heading = "<tr>Please Assign a Group to a Unit: </tr>\n";
  24 + $heading = "<tr><td>Please Assign a Group to a Unit:</td></tr>\n";
25 25 }
26 26 }
27 27  
... ... @@ -29,10 +29,8 @@ function getPage($iGroupID, $iUnitID) {
29 29 $oUnit = Unit::get($iUnitID);
30 30 }
31 31  
32   - $sToRender .= "<br></br>\n";
33   - $sToRender .= "<b>Assign Group to Unit:</b>\n";
  32 + $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
34 33 $sToRender .= "<table>\n";
35   - $sToRender .= "<br></br>\n";
36 34 $sToRender .= $heading;
37 35 $sToRender .= "<br>\n";
38 36 $sToRender .= "<tr>\n";
... ... @@ -52,12 +50,12 @@ function getPage($iGroupID, $iUnitID) {
52 50 $sToRender .= "</td></table>\n";
53 51  
54 52 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
55   - $sToRender .= "function validateForm(theForm) {\n";
56   - $sToRender .= "\tif (!(validRequired(document.MainForm.fGroupID, 'Group'))) {\n";
  53 + $sToRender .= "function validateForm(theForm) {;\n";
  54 + $sToRender .= "\tif (!(validRequired(theForm.fGroupID, 'Group'))) {\n";
57 55 $sToRender .= "\t\treturn false;\n";
58 56 $sToRender .= "\t}\n";
59 57 $sToRender .= "return true;\n}\n";
60   - $sToRender .= "//-->\n</script>\n\n";
  58 + $sToRender .= "-->\n</script>\n\n";
61 59  
62 60 return $sToRender;
63 61 }
... ... @@ -76,10 +74,9 @@ function getPageFail($iGroupID) {
76 74 // get the id of that unit
77 75 $oUnit= Unit::get($iUnitID);
78 76  
79   - $sToRender .= "<br></br>\n";
80   - $sToRender .= "<b>Sorry, Assignment Failed</b>\n";
  77 + $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
81 78 $sToRender .= "<table>\n";
82   - $sToRender .= "<br></br>\n";
  79 + $sToRender .= "<tr><td><b>Sorry, Assignment Failed</b></td></tr>\n";
83 80 $sToRender .= "<tr></tr>\n";
84 81 $sToRender .= "<tr>Group Already Belongs to A Unit\n";
85 82 $sToRender .= "</tr>\n";
... ... @@ -105,10 +102,9 @@ function getPageFail($iGroupID) {
105 102 function getPageNotSelected() {
106 103 global $default;
107 104  
108   - $sToRender .= "<br></br>\n";
109   - $sToRender .= "<b>Sorry, Selection Failed</b>\n";
  105 + $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
110 106 $sToRender .= "<table>\n";
111   - $sToRender .= "<br></br>\n";
  107 + $sToRender .= "<tr><td><b>Sorry, Selection Failed</b></td></tr>\n";
112 108 $sToRender .= "<tr></tr>\n";
113 109 $sToRender .= "<tr><td>Please select BOTH a Group AND a Unit</td></tr>\n";
114 110 $sToRender .= "<tr></tr>\n";
... ... @@ -126,10 +122,9 @@ function getPageNotSelected() {
126 122 function getPageSuccess() {
127 123 global $default;
128 124  
129   - $sToRender .= "<br></br>\n";
130   - $sToRender .= "<b>Success!</b>\n";
  125 + $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
131 126 $sToRender .= "<table>\n";
132   - $sToRender .= "<br></br>\n";
  127 + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
133 128 $sToRender .= "<tr></tr>\n";
134 129 $sToRender .= "<tr><td>The Group was successfully assigned to the specified Unit</td></tr>\n";
135 130 $sToRender .= "<tr></tr>\n";
... ...
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
  View file @a2adc4b
... ... @@ -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("removeGroupFromUnitUI.inc");
  16 + require_once("../adminUI.inc");
16 17 require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
17 18 require_once("$default->fileSystemRoot/lib/groups/Group.inc");
18 19 require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
... ...
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
  View file @a2adc4b
... ... @@ -19,7 +19,7 @@ function getPage($iGroupID, $iUnitID) {
19 19 $oGroup = Group::get($iGroupID);
20 20 $heading = "<tr><td>Are you sure you wish to remove the Group from the Unit?</td> </tr>\n";
21 21 }else{
22   - $heading = "<tr>Please select a Group: </tr>\n";
  22 + $heading = "<tr><td>Please select a Group:</td></tr>\n";
23 23 }
24 24  
25 25 // when unitid is gotten show the name
... ... @@ -32,10 +32,8 @@ function getPage($iGroupID, $iUnitID) {
32 32 $unitdisplay = "";
33 33 }
34 34  
35   - $sToRender .= "<br></br>\n";
36   - $sToRender .= "<b>Select a Group to Remove from its Unit:</b>\n";
  35 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
37 36 $sToRender .= "<table>\n";
38   - $sToRender .= "<br></br>\n";
39 37 $sToRender .= $heading;
40 38 $sToRender .= "<br>\n";
41 39 $sToRender .= "<tr>\n";
... ... @@ -72,10 +70,9 @@ function getPageFail($iGroupID) {
72 70  
73 71 $oUnit= Unit::get($iUnitID);
74 72  
75   - $sToRender .= "<br></br>\n";
76   - $sToRender .= "<b>Sorry, Removal Failed</b>\n";
  73 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
77 74 $sToRender .= "<table>\n";
78   - $sToRender .= "<br></br>\n";
  75 + $sToRender .= "<tr><td><b>Sorry, Removal Failed</b></td></tr>\n";
79 76 $sToRender .= "<tr></tr>\n";
80 77 $sToRender .= "</tr>\n";
81 78 $sToRender .= "<tr>\n";
... ... @@ -93,10 +90,9 @@ function getPageFail($iGroupID) {
93 90 function getPageNotSelected() {
94 91 global $default;
95 92  
96   - $sToRender .= "<br></br>\n";
97   - $sToRender .= "<b>Sorry, Selection Failed</b>\n";
  93 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
98 94 $sToRender .= "<table>\n";
99   - $sToRender .= "<br></br>\n";
  95 + $sToRender .= "<tr><td><b>Sorry, Selection Failed</b></td></tr>\n";
100 96 $sToRender .= "<tr></tr>\n";
101 97 $sToRender .= "<tr><td>Please select a Group</td></tr>\n";
102 98 $sToRender .= "<tr></tr>\n";
... ... @@ -113,10 +109,9 @@ function getPageNotSelected() {
113 109 function getPageSuccess() {
114 110 global $default;
115 111  
116   - $sToRender .= "<br></br>\n";
117   - $sToRender .= "<b>Success!</b>\n";
  112 + $sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
118 113 $sToRender .= "<table>\n";
119   - $sToRender .= "<br></br>\n";
  114 + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
120 115 $sToRender .= "<tr></tr>\n";
121 116 $sToRender .= "<tr><td>The Group was successfully removed from the Unit</td></tr>\n";
122 117 $sToRender .= "<tr></tr>\n";
... ... @@ -182,7 +177,7 @@ function getDeleteButton($oGroup) {
182 177 function getCancelButton($oGroup) {
183 178 global $default;
184 179 if (!isset($oGroup)) {
185   - //return "<td align = right><a href=\"$default->rootUrl/control.php?action=groupManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
  180 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=groupManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n";
186 181 } else {
187 182 return "<td align = right><a href=\"$default->rootUrl/control.php?action=removeGroupFromUnit\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
188 183 }
... ...