[Sciret-svn] SF.net SVN: sciret:[736] trunk

[<al...@us...>]

Revision: 736
          http://sciret.svn.sourceforge.net/sciret/?rev=736&view=rev
Author:   alpeb
Date:     2008-10-20 13:54:06 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
killed links to Manage Items and Browser Unpublished sections, 'cause that's now handled through filters in the main view

Modified Paths:
--------------
    trunk/templates/header.tpl
    trunk/views/View.php

Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl	2008-10-20 13:32:58 UTC (rev 735)
+++ trunk/templates/header.tpl	2008-10-20 13:54:06 UTC (rev 736)
@@ -57,15 +57,9 @@
                 <!-- BEGIN editCategoriesLink_block -->
                 <a href="{editCategoriesHref}">[l]Manage Categories[/l]</a>
                 <!-- END editCategoriesLink_block -->
-                <!-- BEGIN manageArticlesLink_block -->
-                <a href="{manageArticlesHref}">[l]Manage Items[/l]</a>
-                <!-- END manageArticlesLink_block -->
                 <!-- BEGIN manageUsersLink_block -->
                 <a href="{manageUsersHref}">[l]Manage Users[/l]</a>
                 <!-- END manageUsersLink_block -->
-                <!-- BEGIN browseUnpublished_block -->
-                <a href="{browseUnpublishedHref}">[l]Browse unpublished and draft articles/bookmarks[/l]</a>
-                <!-- END browseUnpublished_block -->
         </div><!-- end menu -->
         
         <div id="content_left">

Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php	2008-10-20 13:32:58 UTC (rev 735)
+++ trunk/views/View.php	2008-10-20 13:54:06 UTC (rev 736)
@@ -137,14 +137,6 @@
         $this->tpl->set_var('editCategoriesHref', Library::getLink(array('view' => 'EditCategories')));
         $this->tpl->parse('editCategoriesLink', 'editCategoriesLink_block');
 
-        $this->tpl->set_block('header', 'manageArticlesLink_block', 'manageArticlesLink');
-        if (!$this->user->isAnonymous()) {
-            $this->tpl->set_var('manageArticlesHref', Library::getLink(array('view' => 'ManageArticles')));
-            $this->tpl->parse('manageArticlesLink', 'manageArticlesLink_block');
-        } else {
-            $this->tpl->set_var('manageArticlesLink', '');
-        }
-
         $this->tpl->set_block('header', 'manageUsersLink_block', 'manageUsersLink');
         if ($this->user->isAdmin()) {
             $this->tpl->set_var('manageUsersHref', Library::getLink(array('view' => 'ManageUsers')));
@@ -168,14 +160,6 @@
             $this->tpl->set_var('message', '');
         }
 
-        $this->tpl->set_block('header', 'browseUnpublished_block', 'browseUnpublished');
-        if (!$this->user->isAnonymous() && (!isset($_GET['view']) || $_GET['view'] == 'MainView') && $articleGateway->numUnpublishedArticles() > 0) {
-            $this->tpl->set_var('browseUnpublishedHref', Library::getLink(array('view' => 'ManageArticles', 'onlyUnpublished' => '1')));
-            $this->tpl->parse('browseUnpublished', 'browseUnpublished_block');
-        } else {
-            $this->tpl->set_var('browseUnpublished', '');
-        }
-
         $this->tpl->pparse('out', 'header');
     }
 
@@ -355,7 +339,7 @@
             $this->tpl->set_var('previousLink', Library::getLink(array( 'view'              => $view,
                                                                         'offset'            => $offset - $resultsPerPage,
                                                                         'selectArticles'    => $isSelectArticles? 1 : 0,
-                                                                        'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
+                                                                        'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
                                                                         'catId'				=> $catId)));
             $this->tpl->parse('previousPage', 'previousPage_block');
         } else {
@@ -365,7 +349,7 @@
             $this->tpl->set_var('nextLink', Library::getLink(array( 'view'              => $view,
                                                                     'offset'            => $offset + $resultsPerPage,
                                                                     'selectArticles'    => $isSelectArticles? 1 : 0,
-                                                                    'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
+                                                                    'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
                                                                     'catId'				=> $catId)));
             $this->tpl->parse('nextPage', 'nextPage_block');
         } else {
@@ -381,7 +365,7 @@
                 $pageItems[] = "<a href=\"".Library::getLink(array( 'view'              => $view,
                                                                     'offset'            => $pageOffset,
                                                                     'selectArticles'    => $isSelectArticles? 1 : 0,
-                                                                    'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
+                                                                    'onlyUnpublished'   => $onlyUnpublished? 1 : 0,
                                                                     'catId'				=> $catId))
                                 .$query."\" class=\"nonSelectedPage\">$page</a>";
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.