Peter M. Groen / knowledgetree

Commit c1418de67a3ed52c16d57220a16ba7693fe4a3d7

Authored by Michael Joseph
1 parent db1ff9fe

adding heading; removed submit button borders and prepend group names with unit names for sysadmins 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1552 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 22 additions and 29 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc
  View file @c1418de
@@ -16,9 +16,9 @@ function getPage($iUserID, $iGroupID) { @@ -16,9 +16,9 @@ function getPage($iUserID, $iGroupID) {
16 16
17 if (isset($iUserID)) { 17 if (isset($iUserID)) {
18 $oUser = User::get($iUserID); 18 $oUser = User::get($iUserID);
19 - $heading = "<tr>Are you Sure you wish to assign the User to the Group? </tr>\n"; 19 + $heading = "<tr><td>Are you Sure you wish to assign the User to the Group?</td></tr>\n";
20 }else{ 20 }else{
21 - $heading = "<tr>Please Assign a User to a Group: </tr>\n"; 21 + $heading = "<tr><td>Please Assign a User to a Group:</td></tr>\n";
22 } 22 }
23 23
24 24
@@ -26,13 +26,10 @@ function getPage($iUserID, $iGroupID) { @@ -26,13 +26,10 @@ function getPage($iUserID, $iGroupID) {
26 $oGroup = Group::get($iGroupID); 26 $oGroup = Group::get($iGroupID);
27 27
28 } 28 }
29 -  
30 - $sToRender .= "<br></br>\n";  
31 - $sToRender .= "<b>Assign User to Group:</b>\n"; 29 +
  30 + $sToRender .= "<table width=\"100%\">" . renderHeading("Add User to Group") . "</table>";
32 $sToRender .= "<table>\n"; 31 $sToRender .= "<table>\n";
33 - $sToRender .= "<br></br>\n";  
34 $sToRender .= $heading; 32 $sToRender .= $heading;
35 - $sToRender .= "<br>\n";  
36 $sToRender .= "<tr>\n"; 33 $sToRender .= "<tr>\n";
37 $sToRender .= "</tr>\n"; 34 $sToRender .= "</tr>\n";
38 $sToRender .= "<td>User Name: </td><td>" . getUserDisplay($oUser) . "</td>\n"; 35 $sToRender .= "<td>User Name: </td><td>" . getUserDisplay($oUser) . "</td>\n";
@@ -57,12 +54,10 @@ function getPage($iUserID, $iGroupID) { @@ -57,12 +54,10 @@ function getPage($iUserID, $iGroupID) {
57 // page that comes up when there is nothing selected 54 // page that comes up when there is nothing selected
58 function getPageNotSelected() { 55 function getPageNotSelected() {
59 global $default; 56 global $default;
60 -  
61 - $sToRender .= "<br></br>\n";  
62 - $sToRender .= "<b>Sorry, Selection Failed</b>\n"; 57 +
  58 + $sToRender .= "<table width=\"100%\">" . renderHeading("Add User to Group") . "</table>";
63 $sToRender .= "<table>\n"; 59 $sToRender .= "<table>\n";
64 - $sToRender .= "<br></br>\n";  
65 - $sToRender .= "<tr></tr>\n"; 60 + $sToRender .= "<tr><td><b>Sorry, Selection Failed</b></td></tr>\n";
66 $sToRender .= "<tr><td>Please select BOTH a User AND a Group</td></tr>\n"; 61 $sToRender .= "<tr><td>Please select BOTH a User AND a Group</td></tr>\n";
67 $sToRender .= "<tr></tr>\n"; 62 $sToRender .= "<tr></tr>\n";
68 $sToRender .= "<tr></tr>\n"; 63 $sToRender .= "<tr></tr>\n";
@@ -75,15 +70,13 @@ function getPageNotSelected() { @@ -75,15 +70,13 @@ function getPageNotSelected() {
75 return $sToRender; 70 return $sToRender;
76 } 71 }
77 72
78 -//if edition successful  
79 -function getPageSuccess() { 73 +//if addition successful
  74 +function getPageSuccess() {
80 global $default; 75 global $default;
81 -  
82 - $sToRender .= "<br></br>\n";  
83 - $sToRender .= "<b>Success!</b>\n"; 76 +
  77 + $sToRender .= "<table width=\"100%\">" . renderHeading("Add User to Group") . "</table>";
84 $sToRender .= "<table>\n"; 78 $sToRender .= "<table>\n";
85 - $sToRender .= "<br></br>\n";  
86 - $sToRender .= "<tr></tr>\n"; 79 + $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
87 $sToRender .= "<tr><td>The User was successfully assigned to the specified Group</td></tr>\n"; 80 $sToRender .= "<tr><td>The User was successfully assigned to the specified Group</td></tr>\n";
88 $sToRender .= "<tr></tr>\n"; 81 $sToRender .= "<tr></tr>\n";
89 $sToRender .= "<tr></tr>\n"; 82 $sToRender .= "<tr></tr>\n";
@@ -97,14 +90,12 @@ function getPageSuccess() { @@ -97,14 +90,12 @@ function getPageSuccess() {
97 } 90 }
98 91
99 //if edition successful 92 //if edition successful
100 -function getPageFail() { 93 +function getPageFail() {
101 global $default; 94 global $default;
102 -  
103 - $sToRender .= "<br></br>\n";  
104 - $sToRender .= "<b>Failed!</b>\n";  
105 - $sToRender .= "<table>\n";  
106 - $sToRender .= "<br></br>\n";  
107 - $sToRender .= "<tr></tr>\n"; 95 +
  96 + $sToRender .= "<table border=1 width=\"600\">" . renderHeading("Add User to Group") . "</table>";
  97 + $sToRender .= "<table border=1>\n";
  98 + $sToRender .= "<tr><td><b>Failed!</b></td></tr>\n";
108 $sToRender .= "<tr><td>The User already belongs to the specified Group</td></tr>\n"; 99 $sToRender .= "<tr><td>The User already belongs to the specified Group</td></tr>\n";
109 $sToRender .= "<tr></tr>\n"; 100 $sToRender .= "<tr></tr>\n";
110 $sToRender .= "<tr></tr>\n"; 101 $sToRender .= "<tr></tr>\n";
@@ -148,7 +139,9 @@ function getGroupDisplay($oGroup) { @@ -148,7 +139,9 @@ function getGroupDisplay($oGroup) {
148 if (Permission::userIsSystemAdministrator()) { 139 if (Permission::userIsSystemAdministrator()) {
149 // if this is the system administrator, prepend group names with unit name 140 // if this is the system administrator, prepend group names with unit name
150 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); 141 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
151 - //$oPatternListBox->setFromClause("INNER JOIN $default->"); 142 + $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " .
  143 + "INNER JOIN units_lookup UL on GUL.unit_id=UL.id");
  144 + $oPatternListBox->setCompositeDisplayName("DISTINCT CONCAT(CONCAT(UL.name, '-'),ST.name)");
152 } else if (Permission::userIsUnitAdministrator()) { 145 } else if (Permission::userIsUnitAdministrator()) {
153 // else if this is a unit administrator, only display the groups in your unit 146 // else if this is a unit administrator, only display the groups in your unit
154 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); 147 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
@@ -167,9 +160,9 @@ function getGroupDisplay($oGroup) { @@ -167,9 +160,9 @@ function getGroupDisplay($oGroup) {
167 function getAssignButton($oUser) { 160 function getAssignButton($oUser) {
168 global $default; 161 global $default;
169 if (!isset($oUser)) { 162 if (!isset($oUser)) {
170 - return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/select.gif\" value=\"submit\" /></td>\n"; 163 + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/select.gif\" value=\"submit\" border=\"0\"/></td>\n";
171 } else { 164 } else {
172 - return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/assign.gif\" value=\"submit\" /></td>\n"; 165 + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/assign.gif\" value=\"submit\" border=\"0\"/></td>\n";
173 } 166 }
174 } 167 }
175 // show button after User selected 168 // show button after User selected