From a68aba7955b13be702bf8eefaf79dd2923cf6c2a Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Wed, 28 May 2003 11:19:52 +0000 Subject: [PATCH] renderHeading refactoring --- presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php | 6 +++--- presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php | 6 +++--- presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc | 29 ++++++++++------------------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php index 6b24048..348da71 100644 --- a/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php @@ -3,6 +3,9 @@ require_once("../../../../config/dmsDefaults.php"); require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc"); require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc"); +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); +require_once("subscriptionUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ @@ -24,9 +27,6 @@ require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc // only if we have a valid session if (checkSession()) { - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc"); - require_once("subscriptionUI.inc"); $oPatternCustom = & new PatternCustom(); if (isset($fFolderSubscriptionIDs) || isset($fDocumentSubscriptionIDs)) { diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php index 5af84c1..dcf1226 100644 --- a/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php +++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php @@ -3,6 +3,9 @@ require_once("../../../../config/dmsDefaults.php"); require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc"); require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc"); +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); +require_once("subscriptionUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ @@ -29,9 +32,6 @@ require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc // only if we have a valid session if (checkSession()) { - - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("subscriptionUI.inc"); $oPatternCustom = & new PatternCustom(); diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc index d84412a..9098824 100644 --- a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc @@ -11,15 +11,6 @@ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa * @package presentation.lookAndFeel.knowledgeTree.subscriptions */ - -/*function renderHeading() { - global $default; - $sColor = $default->siteMap->getSectionColour("Subscriptions", "th"); - $sToRender .= "Subscriptions\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - return $sToRender; -}*/ /** * Displays all current subscriptions with remove checkbox @@ -32,8 +23,8 @@ function renderManagePage() { $aDocumentSubscriptions = SubscriptionManager::retrieveUserSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("DocumentSubscription")); $bNoSubscriptions = ( (count($aFolderSubscriptions) == 0) && (count($aDocumentSubscriptions) == 0) ) ? true : false; - $sToRender = "\n"; - $sToRender .= renderHeading("Subscriptions"); + $sToRender = renderHeading("Subscriptions", "Subscriptions"); + $sToRender .= "
\n"; if ($bNoSubscriptions) { $sToRender .= "\n"; } else { @@ -91,8 +82,8 @@ $sToRender .= "\n"; function renderMultipleRemoveConfirmationPage($aFolderSubscriptions, $aDocumentSubscriptions) { global $default; - $sToRender = "
You are not subscribed to any documents or folders.
\n"; - $sToRender .= renderHeading(); + $sToRender = renderHeading("Subscriptions", "Subscriptions"); + $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -149,8 +140,8 @@ function renderRemoveConfirmationPage($oSubscription) { $sContentUrl = "fDocumentID=" . $oSubscription->getExternalID(); } - $sToRender = "
You have chosen to delete the following subscription(s):
\n"; - $sToRender .= renderHeading(); + $sToRender = renderHeading("Subscriptions", "Subscriptions"); + $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -182,8 +173,8 @@ function renderAddConfirmationPage($oSubscription) { $sContentUrl = "fDocumentID=" . $oSubscription->getExternalID(); } - $sToRender = "
You have chosen to delete the your $sContentType subscription to '$sContentName'.
\n"; - $sToRender .= renderHeading(); + $sToRender = renderHeading("Subscriptions", "Subscriptions"); + $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -200,8 +191,8 @@ function renderAddConfirmationPage($oSubscription) { function renderErrorPage($sErrorMessage) { global $default; - $sToRender = "
You have chosen to subscribe to the $sContentType entitled '$sContentName'.
\n"; - $sToRender .= renderHeading(); + $sToRender = renderHeading("Subscriptions", "Subscriptions"); + $sToRender .= "
\n"; $sToRender .= "

$sErrorMessage

\n" . "graphicsUrl/widgets/back.gif\" border=\"0\"/>\n" . "

\n"; -- libgit2 0.21.4