Menu
▾
▴
[Sciret-svn] SF.net SVN: sciret:[737] trunk
|
From: <al...@us...> - 2008-10-20 14:51:05
|
Revision: 737
http://sciret.svn.sourceforge.net/sciret/?rev=737&view=rev
Author: alpeb
Date: 2008-10-20 14:50:58 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
fixed articles navigation (stay on the articles tab)
Modified Paths:
--------------
trunk/templates/MainView.tpl
trunk/views/MainView.php
trunk/views/View.php
Modified: trunk/templates/MainView.tpl
===================================================================
--- trunk/templates/MainView.tpl 2008-10-20 13:54:06 UTC (rev 736)
+++ trunk/templates/MainView.tpl 2008-10-20 14:50:58 UTC (rev 737)
@@ -11,12 +11,15 @@
<script type="text/javascript">
YAHOO.util.Event.onDOMReady(function() {
- var mainViewTabs = new YAHOO.widget.TabView("mainViewTabs");
+ var mainViewTabs = new YAHOO.widget.TabView(
+ "mainViewTabs",
+ {activeIndex: {activeTabIndex}}
+ );
});
</script>
<div id="mainViewTabs" >
<ul class="yui-nav">
- <li class="selected">
+ <li>
<a href="#categories"><em>[l]Categories[/l]</em></a>
</li>
<li>
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-10-20 13:54:06 UTC (rev 736)
+++ trunk/views/MainView.php 2008-10-20 14:50:58 UTC (rev 737)
@@ -26,6 +26,12 @@
$catId = 0;
}
+ if (!isset($_GET['tab']) || $_GET['tab'] == 'categories') {
+ $_GET['tab'] = 0;
+ } else {
+ $_GET['tab'] = 1;
+ }
+
if (!isset($_GET['set'])) {
switch ($this->user->getPreference('startBrowsing')) {
case 'all':
@@ -88,16 +94,47 @@
list($order, $direction) = explode('_', $_GET['sort']);
$this->tpl->set_var(array(
- 'viewAllLink' => Library::getLink(array('view' => 'MainView', 'set' => 'all')),
- 'viewArticlesLink' => Library::getLink(array('view' => 'MainView', 'set' => 'articles')),
- 'viewBookmarksLink' => Library::getLink(array('view' => 'MainView', 'set' => 'bookmarks')),
- 'viewDraftsUnpublishedLink' => Library::getLink(array('view' => 'MainView', 'viewall' => '1')),
- 'hideDraftsUnpublishedLink' => Library::getLink(array('view' => 'MainView', 'viewall' => '0')),
- 'viewExpiredLink' => Library::getLink(array('view' => 'MainView', 'viewexpired' => '1')),
- 'hideExpiredLink' => Library::getLink(array('view' => 'MainView', 'viewexpired' => '0')),
- 'sortByDateLink' => Library::getLink(array('view' => 'MainView', 'sort' => 'created_'.($order == 'created' && $direction == 'desc'? 'asc' : 'desc'))),
- 'sortByViewsLink' => Library::getLink(array('view' => 'MainView', 'sort' => 'views_'.($order == 'views' && $direction == 'desc'? 'asc' : 'desc'))),
- 'rssLink' => Library::getLink(array('view' => 'Rss', 'catId' => $catId, 'items' => 10)),
+ 'activeTabIndex' => $_GET['tab'],
+ 'viewAllLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'set' => 'all',
+ 'tab' => 'articles')),
+ 'viewArticlesLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'set' => 'articles',
+ 'tab' => 'articles')),
+ 'viewBookmarksLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'set' => 'bookmarks',
+ 'tab' => 'articles')),
+ 'viewDraftsUnpublishedLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'viewall' => '1',
+ 'tab' => 'articles')),
+ 'hideDraftsUnpublishedLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'viewall' => '0',
+ 'tab' => 'articles')),
+ 'viewExpiredLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'viewexpired' => '1',
+ 'tab' => 'articles')),
+ 'hideExpiredLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'viewexpired' => '0',
+ 'tab' => 'articles')),
+ 'sortByDateLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'sort' => 'created_'.($order == 'created' && $direction == 'desc'? 'asc' : 'desc'),
+ 'tab' => 'articles')),
+ 'sortByViewsLink' => Library::getLink(array(
+ 'view' => 'MainView',
+ 'sort' => 'views_'.($order == 'views' && $direction == 'desc'? 'asc' : 'desc'),
+ 'tab' => 'articles')),
+ 'rssLink' => Library::getLink(array(
+ 'view' => 'Rss',
+ 'catId' => $catId,
+ 'items' => 10)),
));
if ($catId != 0) {
Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php 2008-10-20 13:54:06 UTC (rev 736)
+++ trunk/views/View.php 2008-10-20 14:50:58 UTC (rev 737)
@@ -340,7 +340,8 @@
'offset' => $offset - $resultsPerPage,
'selectArticles' => $isSelectArticles? 1 : 0,
'onlyUnpublished' => $onlyUnpublished? 1 : 0,
- 'catId' => $catId)));
+ 'catId' => $catId,
+ 'tab' => 'articles')));
$this->tpl->parse('previousPage', 'previousPage_block');
} else {
$this->tpl->set_var('previousPage', '');
@@ -350,7 +351,8 @@
'offset' => $offset + $resultsPerPage,
'selectArticles' => $isSelectArticles? 1 : 0,
'onlyUnpublished' => $onlyUnpublished? 1 : 0,
- 'catId' => $catId)));
+ 'catId' => $catId,
+ 'tab' => 'articles')));
$this->tpl->parse('nextPage', 'nextPage_block');
} else {
$this->tpl->set_var('nextPage', '');
@@ -366,7 +368,8 @@
'offset' => $pageOffset,
'selectArticles' => $isSelectArticles? 1 : 0,
'onlyUnpublished' => $onlyUnpublished? 1 : 0,
- 'catId' => $catId))
+ 'catId' => $catId,
+ 'tab' => 'articles'))
.$query."\" class=\"nonSelectedPage\">$page</a>";
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
