aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Interface fix: move welcome message to index page

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@127 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2008-05-14 08:55:38 +00:00
parent 4375f8eff7
commit 75202febf4
7 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bookmarks.php
View file

@ -224,6 +224,7 @@ if ($templatename == 'editbookmark.tpl') {
} }
$tplVars['summarizeLinkedTags'] = true; $tplVars['summarizeLinkedTags'] = true;
$tplVars['pageName'] = PAGE_BOOKMARKS;
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);

2
config.inc.php.example
View file

@ -8,7 +8,7 @@
#### System #### #### System ####
$sitename = 'SemanticScuttle'; #The name of this site. $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 $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 ...} $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 $cookieprefix = 'SEMANTICSCUTTLE'; # cookieprefix : The prefix to use for the cookies on the site

5
constants.inc.php
View file

@ -6,6 +6,11 @@ define('GENERAL_ERROR', 202);
define('CRITICAL_MESSAGE', 203); define('CRITICAL_MESSAGE', 203);
define('CRITICAL_ERROR', 204); define('CRITICAL_ERROR', 204);
// Page name
define('PAGE_INDEX', "index");
define('PAGE_BOOKMARKS', "bookmarks");
// Miscellanous // 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 // 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

1
index.php
View file

@ -79,6 +79,7 @@ $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('index', '%3$s'); $tplVars['nav_url'] = createURL('index', '%3$s');
$tplVars['summarizeLinkedTags'] = true; $tplVars['summarizeLinkedTags'] = true;
$tplVars['pageName'] = PAGE_INDEX;
$templateservice->loadTemplate('bookmarks.tpl', $tplVars); $templateservice->loadTemplate('bookmarks.tpl', $tplVars);

11
scuttle.css
View file

@ -104,10 +104,19 @@ html > body div#header.popup h1 {
background: url('logo_24.png') no-repeat 10px; background: url('logo_24.png') no-repeat 10px;
padding: 0.5em 0.5em 0.5em 50px; padding: 0.5em 0.5em 0.5em 50px;
} }
html > body div#header #welcome { /*html > body div#header #welcome {
position:absolute; position:absolute;
left:75px; left:75px;
}*/
#welcome {
border: 10px solid #FFCC00;
width: 66%;
padding: 10px;
text-align:center;
font-size: medium;
} }
h1 a { h1 a {
color: #000; color: #000;
} }

6
templates/bookmarks.tpl.php
View file

@ -7,12 +7,18 @@ $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
$logged_on_userid = $userservice->getCurrentUserId(); $logged_on_userid = $userservice->getCurrentUserId();
$currentUser = $userservice->getCurrentUser(); $currentUser = $userservice->getCurrentUser();
$currentUsername = $currentUser[$userservice->getFieldName('username')]; $currentUsername = $currentUser[$userservice->getFieldName('username')];
$pageName = isset($pageName)?$pageName:"";
$this->includeTemplate($GLOBALS['top_include']); $this->includeTemplate($GLOBALS['top_include']);
include('search.inc.php'); include('search.inc.php');
?> ?>
<?php if($pageName == PAGE_INDEX):?>
<p id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></p>
<?php endif?>
<?php <?php
if((isset($currenttag) && $GLOBALS['enableCommonTagDescription']) if((isset($currenttag) && $GLOBALS['enableCommonTagDescription'])
|| (isset($hash) && $GLOBALS['enableCommonBookmarkDescription'])):?> || (isset($hash) && $GLOBALS['enableCommonBookmarkDescription'])):?>

2
templates/top.inc.php
View file

@ -35,7 +35,7 @@ if(isset($_GET['popup'])) {
} }
?> ?>
<? 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; ?> <?php endif; ?>
</div> </div>