From 7dce1728c1d3b44dcccea07c77b6b82f75ea9ba1 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 14 Mar 2003 11:38:50 +0000 Subject: [PATCH] added headings --- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php | 1 + presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc | 31 +++++++++++++------------------ presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php | 1 + presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc | 23 +++++++++-------------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php index b4a871e..f9ca420 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php @@ -13,6 +13,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); require_once("assignGroupToUnitUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc index d792e7f..f9ea13d 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc @@ -16,12 +16,12 @@ function getPage($iGroupID, $iUnitID) { if (isset($iGroupID)) { $oGroup = Group::get($iGroupID); - $heading = "Are you Sure you wish to assign the Group to the Unit? \n"; + $heading = "Are you Sure you wish to assign the Group to the Unit?\n"; } else { if (Permission::userIsUnitAdministrator()) { - $heading = "Please Assign a Group to your Unit: \n"; + $heading = "Please Assign a Group to your Unit:\n"; } else { - $heading = "Please Assign a Group to a Unit: \n"; + $heading = "Please Assign a Group to a Unit:\n"; } } @@ -29,10 +29,8 @@ function getPage($iGroupID, $iUnitID) { $oUnit = Unit::get($iUnitID); } - $sToRender .= "

\n"; - $sToRender .= "Assign Group to Unit:\n"; + $sToRender .= "" . renderHeading("Assign Group to Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; $sToRender .= $heading; $sToRender .= "
\n"; $sToRender .= "\n"; @@ -52,12 +50,12 @@ function getPage($iGroupID, $iUnitID) { $sToRender .= "
\n"; $sToRender .= "\n\n\n\n"; + $sToRender .= "-->\n\n\n"; return $sToRender; } @@ -76,10 +74,9 @@ function getPageFail($iGroupID) { // get the id of that unit $oUnit= Unit::get($iUnitID); - $sToRender .= "

\n"; - $sToRender .= "Sorry, Assignment Failed\n"; + $sToRender .= "" . renderHeading("Assign Group to Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "Group Already Belongs to A Unit\n"; $sToRender .= "\n"; @@ -105,10 +102,9 @@ function getPageFail($iGroupID) { function getPageNotSelected() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Sorry, Selection Failed\n"; + $sToRender .= "
Sorry, Assignment Failed
" . renderHeading("Assign Group to Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -126,10 +122,9 @@ function getPageNotSelected() { function getPageSuccess() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "
Sorry, Selection Failed
Please select BOTH a Group AND a Unit
" . renderHeading("Assign Group to Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php index 7973779..161a84c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php @@ -13,6 +13,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); require_once("removeGroupFromUnitUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc index 4d26779..9c55727 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc @@ -19,7 +19,7 @@ function getPage($iGroupID, $iUnitID) { $oGroup = Group::get($iGroupID); $heading = "\n"; }else{ - $heading = "Please select a Group: \n"; + $heading = "\n"; } // when unitid is gotten show the name @@ -32,10 +32,8 @@ function getPage($iGroupID, $iUnitID) { $unitdisplay = ""; } - $sToRender .= "

\n"; - $sToRender .= "Select a Group to Remove from its Unit:\n"; + $sToRender .= "
Success!
The Group was successfully assigned to the specified Unit
Are you sure you wish to remove the Group from the Unit?
Please select a Group:
" . renderHeading("Remove Group From Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; $sToRender .= $heading; $sToRender .= "
\n"; $sToRender .= "\n"; @@ -72,10 +70,9 @@ function getPageFail($iGroupID) { $oUnit= Unit::get($iUnitID); - $sToRender .= "

\n"; - $sToRender .= "Sorry, Removal Failed\n"; + $sToRender .= "
" . renderHeading("Remove Group From Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -93,10 +90,9 @@ function getPageFail($iGroupID) { function getPageNotSelected() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Sorry, Selection Failed\n"; + $sToRender .= "
Sorry, Removal Failed
" . renderHeading("Remove Group From Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -113,10 +109,9 @@ function getPageNotSelected() { function getPageSuccess() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "
Sorry, Selection Failed
Please select a Group
" . renderHeading("Remove Group From Unit") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -182,7 +177,7 @@ function getDeleteButton($oGroup) { function getCancelButton($oGroup) { global $default; if (!isset($oGroup)) { - //return "\n"; + return "\n"; } else { return "\n"; } -- libgit2 0.21.4
Success!
The Group was successfully removed from the Unit
rootUrl/control.php?action=groupManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" />rootUrl/control.php?action=groupManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/>rootUrl/control.php?action=removeGroupFromUnit\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />