Menu
▾
▴
[Sciret-svn] SF.net SVN: sciret:[733] trunk
|
From: <al...@us...> - 2008-10-17 23:59:12
|
Revision: 733
http://sciret.svn.sourceforge.net/sciret/?rev=733&view=rev
Author: alpeb
Date: 2008-10-17 23:59:05 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
added ability to see draft and unpublished articles in the main view. First step before removing the Manage Items section
Modified Paths:
--------------
trunk/classes/Library.php
trunk/style.css
trunk/templates/MainView.tpl
trunk/views/MainView.php
Modified: trunk/classes/Library.php
===================================================================
--- trunk/classes/Library.php 2008-10-17 22:58:08 UTC (rev 732)
+++ trunk/classes/Library.php 2008-10-17 23:59:05 UTC (rev 733)
@@ -56,6 +56,14 @@
}
}
+ if (!in_array('viewall', array_keys($vars))) {
+ if (isset($_GET['viewall'])) {
+ $vars['viewall'] = $_GET['viewall'];
+ } else {
+ $vars['viewall'] = 0;
+ }
+ }
+
if (!in_array('tableSort', array_keys($vars)) && isset($_GET['tableSort'])) {
$vars['tableSort'] = $_GET['tableSort'];
}
Modified: trunk/style.css
===================================================================
--- trunk/style.css 2008-10-17 22:58:08 UTC (rev 732)
+++ trunk/style.css 2008-10-17 23:59:05 UTC (rev 733)
@@ -350,9 +350,13 @@
font-size: 0.9em;
}
+.itemStatus {
+ color: red;
+ font-weight: bold;
+ font-size: 0.9em;
+}
-
/* title content */
a.button_menu {
Modified: trunk/templates/MainView.tpl
===================================================================
--- trunk/templates/MainView.tpl 2008-10-17 22:58:08 UTC (rev 732)
+++ trunk/templates/MainView.tpl 2008-10-17 23:59:05 UTC (rev 733)
@@ -64,6 +64,9 @@
<div class="title_content" style="position:relative">
<span>
{navigationTitle}
+ <!-- BEGIN browsingDraftsUnpublished_block -->
+ [l](Showing drafts and unpublished too)[/l]
+ <!-- END browsingDraftsUnpublished_block -->
<a href="javascript:void(0)" onclick="addFavorite('location')"><img id="favoriteStarImg" src="images/star.png" alt="[l]Add location to favorites[/l]" title="[l]Add location to favorites[/l]" style="display:{favoriteLocationStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove location from favorites[/l]" title="[l]Remove location from favorites[/l]" style="display:{unFavoriteLocationStarImgDisplay}" /><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
</span>
<span style="position:absolute; right:0; top:7px">
@@ -79,6 +82,14 @@
<!-- BEGIN viewBookmarksLink_block -->
<a href="{viewBookmarksLink}" style="font-weight:bold; font-size:10px">[l]Bookmarks only[/l]</a>
<!-- END viewBookmarksLink_block -->
+ <!-- BEGIN viewDraftsUnpublishedLink_block -->
+ <br />
+ <a href="{viewDraftsUnpublishedLink}" style="font-weight:bold; font-size:10px">[l]View drafts and unpublished articles[/l]</a>
+ <!-- END viewDraftsUnpublishedLink_block -->
+ <!-- BEGIN hideDraftsUnpublishedLink_block -->
+ <br />
+ <a href="{hideDraftsUnpublishedLink}" style="font-weight:bold; font-size:10px">[l]Hide drafts and unpublished articles[/l]</a>
+ <!-- END hideDraftsUnpublishedLink_block -->
</p>
<p class="view_right">[l]Sort by:[/l]
<span class="button_gray"><a href="{sortByDateLink}">[l]Date[/l]</a>{sortByDateArrow}</span>
@@ -92,6 +103,9 @@
<i>({art_num}) </i>
<img src="images/{articleImage}" />
<a href="{art_link}">{art_title}</a> {bookmark_edit}
+ <!-- BEGIN status_block -->
+ <span class="itemStatus">({status})</span>
+ <!-- END status_block -->
<!-- BEGIN question_block -->
({questionStr})
<!-- END question_block -->
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-10-17 22:58:08 UTC (rev 732)
+++ trunk/views/MainView.php 2008-10-17 23:59:05 UTC (rev 733)
@@ -40,6 +40,14 @@
}
}
+ if (!$this->user->isAnonymous()
+ && isset($_GET['viewall']) && $_GET['viewall'] == 1)
+ {
+ $_GET['viewall'] = 1;
+ } else {
+ $_GET['viewall'] = 0;
+ }
+
$this->tpl->set_var('checked_all', (!isset($_GET['set']) || $_GET['set'] == 'all')? 'checked="true"' : '');
$this->tpl->set_var('checked_articles', (isset($_GET['set']) && $_GET['set'] == 'articles')? 'checked="true"' : '');
$this->tpl->set_var('checked_bookmarks', (isset($_GET['set']) && $_GET['set'] == 'bookmarks')? 'checked="true"' : '');
@@ -56,7 +64,11 @@
$this->tpl->set_block('main', 'viewAllLink_block', 'viewAllLink');
$this->tpl->set_block('main', 'viewArticlesLink_block', 'viewArticlesLink');
$this->tpl->set_block('main', 'viewBookmarksLink_block', 'viewBookmarksLink');
+ $this->tpl->set_block('main', 'viewDraftsUnpublishedLink_block', 'viewDraftsUnpublishedLink');
+ $this->tpl->set_block('main', 'hideDraftsUnpublishedLink_block', 'hideDraftsUnpublishedLink');
$this->tpl->set_block('main', 'requestCat_block', 'requestCat');
+ $this->tpl->set_block('main', 'browsingDraftsUnpublished_block', 'browsingDraftsUnpublished');
+ $this->tpl->set_block('articles_block', 'status_block', 'status');
$this->tpl->set_block('articles_block', 'question_block', 'question');
$this->tpl->set_block('unansweredQuestionsItem_block', 'answerLink_block', 'answerLink');
@@ -70,6 +82,8 @@
'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')),
'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)),
@@ -123,7 +137,28 @@
$this->tpl->parse('viewBookmarksLink', 'viewBookmarksLink_block');
}
+ if ($_GET['viewall']) {
+ $this->tpl->parse('browsingDraftsUnpublished', 'browsingDraftsUnpublished_block');
+ } else {
+ $this->tpl->set_var('browsingDraftsUnpublished', '');
+ }
+
+ if (!$this->user->isAnonymous()) {
+ if (isset($_GET['viewall']) && $_GET['viewall'] == 1) {
+ $this->tpl->parse('hideDraftsUnpublishedLink', 'hideDraftsUnpublishedLink_block');
+ $this->tpl->set_var('viewDraftsUnpublishedLink', '');
+ } else {
+ $this->tpl->parse('viewDraftsUnpublishedLink', 'viewDraftsUnpublishedLink_block');
+ $this->tpl->set_var('hideDraftsUnpublishedLink', '');
+ }
+ } else {
+ $this->tpl->set_var(array(
+ 'viewDraftsUnpublishedLink' => '',
+ 'hideDraftsUnpublishedLink' => '',
+ ));
+ }
+
// ** CATEGORIES **
$articleGateway = new ArticleGateway;
$categoryGateway = new CategoryGateway;
@@ -159,12 +194,14 @@
$articles = $articleGateway->getArticles( $catId,
$this->user->getPreference('navigationType') == 'catAndSubCats',
false,
+ $_GET['viewall'],
false,
- false,
isset($_GET['offset'])? (int)$_GET['offset'] : 0,
$this->user->getPreference('articlesPerPage'),
isset($_GET['set'])? $_GET['set'] : 'all',
- isset($_GET['sort'])? $_GET['sort'] : false);
+ isset($_GET['sort'])? $_GET['sort'] : false,
+ false,
+ $_GET['viewall']);
$this->tpl->set_var('numArts', $articles->getNumItems());
$firstIteration = true;
while ($article = $articles->fetch()) {
@@ -194,6 +231,21 @@
$this->tpl->set_var('question', '');
}
+ $status = array();
+ if (!$article->isPublished()) {
+ $status[] = $this->user->lang('not published');
+ }
+ if ($article->isDraft()) {
+ $status[] = $this->user->lang('draft');
+ }
+ if ($status) {
+ $status = implode(', ', $status);
+ $this->tpl->set_var('status', $status);
+ $this->tpl->parse('status', 'status_block');
+ } else {
+ $this->tpl->set_var('status', '');
+ }
+
if ($article->getCategoryId() == 0) {
$this->tpl->set_var('art_category', '');
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|