Interface fix: remove admin colors on watchlist page.

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@279 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/bookmarks.php b/bookmarks.php
index 43c2275b5ff4d0ee65f4610925520cbffc6a39d4..6f2463e52bfdfac4bf0bf1cb8cf76839f5d11e8f 100644 (file)
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -185,7 +185,7 @@ if ($templatename == 'editbookmark.tpl') {
                        );
                        $tplVars['tags'] = POST_TAGS;
                } else {                        
-                       $tplVars['row'] = $bookmarkservice->getBookmark($_GET['copyOf'], true);
+                       $tplVars['row'] = $bookmarkservice->getBookmark(GET_COPYOF, true);
                        if(!$currentUser->isAdmin()) {
                                $tplVars['row']['bPrivateNote'] = ''; //only admin can copy private note
                        }               

diff --git a/constants.inc.php b/constants.inc.php
index 80781413eef48be8a66b83dff23fbc92c4d2ad77..681a14139df8d1829e2aae79bd801ea5f75b43fe 100644 (file)
--- a/constants.inc.php
+++ b/constants.inc.php
@@ -39,6 +39,7 @@ define('CRITICAL_ERROR', 204);
 // Page name
 define('PAGE_INDEX', "index");
 define('PAGE_BOOKMARKS', "bookmarks");
+define('PAGE_WATCHLIST', "watchlist");
 
 
 // Miscellanous

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 1bc6f6196bee783e0d3bd642973ee39e0bca716c..777e7ca414e3dbcca307659c4fd150fd4834e901 100644 (file)
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -21,7 +21,7 @@ include('search.inc.php');
 <?php endif?>
 
 
-<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?>
+<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?>
 <div style="width:70%;text-align:center;">
 <img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/>
 </div>

diff --git a/watchlist.php b/watchlist.php
index a64315f8dc0df482d54c2a97a0cc8af3f3d2f11c..cd3a0003dac826964f56b5a6ec1a75e5e65b3dc6 100644 (file)
--- a/watchlist.php
+++ b/watchlist.php
@@ -108,6 +108,7 @@ if ($user) {
     $tplVars['pagetitle'] = $title;
     $tplVars['subtitle'] = $title;
     $tplVars['range'] = 'watchlist';
+    $tplVars['pageName'] = PAGE_WATCHLIST;
 
     $tplVars['rsschannels'] = array(
         array(filter($sitename .': '. $title), createURL('rss', 'watchlist/'. filter($user, 'url')))