aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-05-14 08:55:38 +0000
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-05-14 08:55:38 +0000
commit75202febf4478877a6277242cfaa53cfcfc085c4 (patch)
tree65f92e988b7c803497fe94e1f7f68f6e4127b768
parent4375f8eff73a49bebc564931b08ad569cd86299c (diff)
downloadsemanticscuttle-75202febf4478877a6277242cfaa53cfcfc085c4.tar.gz
semanticscuttle-75202febf4478877a6277242cfaa53cfcfc085c4.tar.bz2
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
-rw-r--r--bookmarks.php1
-rw-r--r--config.inc.php.example2
-rw-r--r--constants.inc.php5
-rw-r--r--index.php1
-rw-r--r--scuttle.css11
-rw-r--r--templates/bookmarks.tpl.php6
-rw-r--r--templates/top.inc.php2
7 files changed, 25 insertions, 3 deletions
diff --git a/bookmarks.php b/bookmarks.php
index eca291d..61e2aac 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -224,6 +224,7 @@ if ($templatename == 'editbookmark.tpl') {
}
$tplVars['summarizeLinkedTags'] = true;
+$tplVars['pageName'] = PAGE_BOOKMARKS;
$templateservice->loadTemplate($templatename, $tplVars);
diff --git a/config.inc.php.example b/config.inc.php.example
index bf3fd2b..56b5674 100644
--- a/config.inc.php.example
+++ b/config.inc.php.example
@@ -8,7 +8,7 @@
#### System ####
$sitename = 'SemanticScuttle'; #The name of this site.
-$welcomeMessage = 'More than tags...'; # The welcome message of this site
+$welcomeMessage = 'Welcome to SemanticScuttle! More than a social bookmarking tool.'; # The welcome message of this site
$root = NULL; # Set to NULL to autodetect the root url of the website
$locale = 'en_GB'; #locale used in /locales/ {de_DE en_GB fr_FR ...}
$cookieprefix = 'SEMANTICSCUTTLE'; # cookieprefix : The prefix to use for the cookies on the site
diff --git a/constants.inc.php b/constants.inc.php
index 2576385..256ea2a 100644
--- a/constants.inc.php
+++ b/constants.inc.php
@@ -6,6 +6,11 @@ define('GENERAL_ERROR', 202);
define('CRITICAL_MESSAGE', 203);
define('CRITICAL_ERROR', 204);
+// Page name
+define('PAGE_INDEX', "index");
+define('PAGE_BOOKMARKS', "bookmarks");
+
+
// Miscellanous
// INSTALLATION_ID is based on directory path and used as prefix (in session and cookie) to prevent mutual login for different installations on the same host server
diff --git a/index.php b/index.php
index a4ce6a7..b4bbe92 100644
--- a/index.php
+++ b/index.php
@@ -79,6 +79,7 @@ $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('index', '%3$s');
$tplVars['summarizeLinkedTags'] = true;
+$tplVars['pageName'] = PAGE_INDEX;
$templateservice->loadTemplate('bookmarks.tpl', $tplVars);
diff --git a/scuttle.css b/scuttle.css
index 1e80cb1..ca71145 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -104,10 +104,19 @@ html > body div#header.popup h1 {
background: url('logo_24.png') no-repeat 10px;
padding: 0.5em 0.5em 0.5em 50px;
}
-html > body div#header #welcome {
+/*html > body div#header #welcome {
position:absolute;
left:75px;
+}*/
+#welcome {
+ border: 10px solid #FFCC00;
+ width: 66%;
+ padding: 10px;
+ text-align:center;
+ font-size: medium;
}
+
+
h1 a {
color: #000;
}
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>