summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/bookmarks.tpl.php6
-rw-r--r--templates/top.inc.php2
2 files changed, 7 insertions, 1 deletions
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index f7cc45b..c9a80f1 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -7,12 +7,18 @@ $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
$logged_on_userid = $userservice->getCurrentUserId();
$currentUser = $userservice->getCurrentUser();
$currentUsername = $currentUser[$userservice->getFieldName('username')];
+$pageName = isset($pageName)?$pageName:"";
$this->includeTemplate($GLOBALS['top_include']);
include('search.inc.php');
?>
+<?php if($pageName == PAGE_INDEX):?>
+<p id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></p>
+<?php endif?>
+
+
<?php
if((isset($currenttag) && $GLOBALS['enableCommonTagDescription'])
|| (isset($hash) && $GLOBALS['enableCommonBookmarkDescription'])):?>
diff --git a/templates/top.inc.php b/templates/top.inc.php
index 707af8b..4d08b3f 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -35,7 +35,7 @@ if(isset($_GET['popup'])) {
}
?>
<? if(!isset($_GET['popup'])):?>
-<span id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></span>
+<!--span id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></span-->
<?php endif; ?>
</div>