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

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

Revision: 711
          http://sciret.svn.sourceforge.net/sciret/?rev=711&view=rev
Author:   alpeb
Date:     2008-09-29 21:35:00 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
added Article Report functionality to bookmarks as well

Modified Paths:
--------------
    trunk/templates/ReportArticle.tpl
    trunk/templates/ViewBookmark.tpl
    trunk/views/ReportArticle.php
    trunk/views/ViewBookmark.php

Modified: trunk/templates/ReportArticle.tpl
===================================================================
--- trunk/templates/ReportArticle.tpl	2008-09-29 21:17:58 UTC (rev 710)
+++ trunk/templates/ReportArticle.tpl	2008-09-29 21:35:00 UTC (rev 711)
@@ -1,6 +1,12 @@
 <!-- BEGIN reportForm_block -->
 <strong>
-    [l]Report Article[/l] #{artId}: {artTitle}
+    <!-- BEGIN reportArticle_block -->
+    [l]Report Article[/l]
+    <!-- END reportArticle_block -->
+    <!-- BEGIN reportBookmark_block -->
+    [l]Report Bookmark[/l]
+    <!-- END reportBookmark_block -->
+     #{artId}: {artTitle}
 </strong>
 <form action="{reportArticleFormAction}" method="post" style="margin-top:10px">
     <input type="hidden" name="artId" value="{artId}" />

Modified: trunk/templates/ViewBookmark.tpl
===================================================================
--- trunk/templates/ViewBookmark.tpl	2008-09-29 21:17:58 UTC (rev 710)
+++ trunk/templates/ViewBookmark.tpl	2008-09-29 21:35:00 UTC (rev 711)
@@ -25,6 +25,7 @@
                         <!-- BEGIN favoriteArticle_block -->
                         &nbsp;&nbsp;<a href="javascript:void(0);" onclick="addFavorite('article', {bookmark_id});"><img id="favoriteStarImg" src="images/star.png" alt="[l]Add bookmark to favorites[/l]" title="[l]Add bookmark to favorites[/l]" style="display:{favoriteArticleStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove bookmark from favorites[/l]" title="[l]Remove bookmark from favorites[/l]" style="display:{unFavoriteArticleStarImgDisplay}"/><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
                         <!-- END favoriteArticle_block -->
+                        <a href="{reportArticleLink}"><img src="images/flag.png" alt="[l]Report article[/l]" title="[l]Report article[/l]" />
                     </span>
                 </div>
             </td>

Modified: trunk/views/ReportArticle.php
===================================================================
--- trunk/views/ReportArticle.php	2008-09-29 21:17:58 UTC (rev 710)
+++ trunk/views/ReportArticle.php	2008-09-29 21:35:00 UTC (rev 711)
@@ -31,6 +31,8 @@
 
         $this->tpl->set_file('main', 'ReportArticle.tpl');
         $this->tpl->set_block('main', 'reportForm_block', 'reportForm');
+        $this->tpl->set_block('reportForm_block', 'reportArticle_block', 'reportArticle');
+        $this->tpl->set_block('reportForm_block', 'reportBookmark_block', 'reportBookmark');
         $this->tpl->set_block('main', 'reportsNotConfigured_block', 'reportsNotConfigured');
 
         if (!$this->configuration->getConfigValue('mailArticleReports')) {
@@ -70,6 +72,13 @@
                 ));
             }
 
+            if ($article->isBookmark()) {
+                $this->tpl->set_var('reportArticle', '');
+                $this->tpl->parse('reportBookmark', 'reportBookmark_block');
+            } else {
+                $this->tpl->set_var('reportBookmark', '');
+                $this->tpl->parse('reportArticle', 'reportArticle_block');
+            }
             $this->tpl->parse('reportForm', 'reportForm_block');
         }
 

Modified: trunk/views/ViewBookmark.php
===================================================================
--- trunk/views/ViewBookmark.php	2008-09-29 21:17:58 UTC (rev 710)
+++ trunk/views/ViewBookmark.php	2008-09-29 21:35:00 UTC (rev 711)
@@ -67,6 +67,7 @@
 
         $this->tpl->set_var(array(
             'category'          => $this->_getCategoryPath($article->getCategoryId(), 'MainView', true),
+            'reportArticleLink' => Library::getLink(array('view' => 'ReportArticle', 'artId' => $article->getId())),
             'lang_status'       => $status,
             'name'              => $article->getTitle(),
             'urlHref'           => $article->getURL(true),


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