From 75202febf4478877a6277242cfaa53cfcfc085c4 Mon Sep 17 00:00:00 2001
From: mensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Wed, 14 May 2008 08:55:38 +0000
Subject: Interface fix: move welcome message to index page

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@127 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 templates/bookmarks.tpl.php | 6 ++++++
 templates/top.inc.php       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'templates')

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>
 
-- 
cgit v1.2.3