From 1958ddd8e1e74ef00849c78782656c0ba2995f07 Mon Sep 17 00:00:00 2001
From: mensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Thu, 27 Nov 2008 07:27:36 +0000
Subject: Minor fix: improve import from Netscape files (taking tags into
 account)

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@176 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 templates/bookmarks.tpl.php         | 1 +
 templates/sidebar.block.related.php | 3 +++
 templates/top.inc.php               | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 7ab54ab..05d3e1b 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -10,6 +10,7 @@ $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
 $currentObjectUser = $userservice->getCurrentObjectUser();
 
 $pageName = isset($pageName)?$pageName:"";
+$user = isset($user)?$user:"";
 
 $this->includeTemplate($GLOBALS['top_include']);
 
diff --git a/templates/sidebar.block.related.php b/templates/sidebar.block.related.php
index 88d42d6..81336f9 100644
--- a/templates/sidebar.block.related.php
+++ b/templates/sidebar.block.related.php
@@ -2,6 +2,9 @@
 $b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
+if(!isset($user)) $user="";
+
+
 $logged_on_userid = $userservice->getCurrentUserId();
 if ($logged_on_userid === false) {
     $logged_on_userid = NULL;
diff --git a/templates/top.inc.php b/templates/top.inc.php
index 2039db2..633e3f8 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -23,12 +23,12 @@ if(isset($rsschannels)) {
 	src="<?php echo ROOT ?>jsScuttle.php"></script>
 
 
-<link rel="stylesheet" type="text/css"
+<!-- link rel="stylesheet" type="text/css"
 	href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css">
 
 <script type="text/javascript"
 	src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js"
-	djConfig="parseOnLoad:true, isDebug:false, usePlainJson:true"></script>
+	djConfig="parseOnLoad:true, isDebug:false, usePlainJson:true"></script> -->
  
 <script type="text/javascript">
 dojo.require("dojo.parser");
-- 
cgit v1.2.3