phpwiki-checkins

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/wikilens
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2643/lib/wikilens

Modified Files:
	PageListColumns.php 
Log Message:
minor: ratings centered, defaults 0

Index: PageListColumns.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/wikilens/PageListColumns.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- PageListColumns.php	30 Sep 2005 18:41:39 -0000	1.10
+++ PageListColumns.php	24 Jan 2008 19:34:54 -0000	1.11
@@ -83,5 +83,5 @@ class _PageList_Column_coagreement exten
         }   
         //FIXME: $WikiTheme->getImageURL()
-        return HTML::img(array('src' => "../images/" . $p . ".gif"));
+        return HTML::img(array('src' => $WikiTheme->getImageURL($p)));
     }
 }
@@ -97,5 +97,5 @@ class _PageList_Column_minmisery extends
     function _getValue ($page_handle, &$revision_handle) 
     {
-        global $request;
+        global $request, $WikiTheme;
 
         $pagename = $page_handle->getName();
@@ -106,6 +106,5 @@ class _PageList_Column_minmisery extends
         $p = MinMisery($dbi, $pagename, $this->_selectedBuddies, $active_userId);
        	$imgFix = floor($p * 2) / 2;
-        //FIXME: $WikiTheme->getImageURL()
-        return HTML::img(array('src' => "../images/" . $imgFix . ".png"));
+        return HTML::img(array('src' => $WikiTheme->getImageURL("Rateit" . $imgFix)));
     }
 }
@@ -122,5 +121,5 @@ class _PageList_Column_averagerating ext
     function _getValue ($page_handle, &$revision_handle) 
     {
-        global $request;
+        global $request, $WikiTheme;
 
         $pagename = $page_handle->getName();
@@ -133,6 +132,5 @@ class _PageList_Column_averagerating ext
         $imgFix = floor($p * 2) / 2;
         $html = HTML();
-        //FIXME: $WikiTheme->getImageURL()
-        $html->pushContent(HTML::img(array('src' => "../images/" . $imgFix . ".png")));
+        $html->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("Rateit" . $imgFix))));
         $html->pushContent($p);
         return $html;
@@ -143,4 +141,5 @@ class _PageList_Column_averagerating ext
  * Show the value of a rating as a digit (or "-" if no value), given the
  * user who is the rater.
+ * This requires the RatingsUser as 5th paramater.
  */
 class _PageList_Column_ratingvalue extends _PageList_Column {
@@ -151,11 +150,14 @@ class _PageList_Column_ratingvalue exten
     	$this->_pagelist =& $params[3];
         $this->_user =& $params[4];//$this->_pagelist->getOption('user');
-        assert(!empty($this->_user));
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension   = $this->_pagelist->getOption('dimension');
+        if (!$this->_dimension) $this->_dimension = 0;
     }
 
     function format ($pagelist, $page_handle, &$revision_handle) 
     {
+        if (empty($this->_user))
+            $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
+        assert(!empty($this->_user));
         $rating = $this->_getValue($page_handle, $revision_handle);
         $mean = $this->_user->mean_rating($this->_dimension);
@@ -176,5 +178,5 @@ class _PageList_Column_ratingvalue exten
         $pagename = $page_handle->getName();
 
-        $tu = & $this->_user;
+        $tu =& $this->_user;
         $rating = $tu->get_rating($pagename, $this->_dimension);
 
@@ -206,4 +208,5 @@ class _PageList_Column_ratingvalue exten
 /**
  * Ratings widget for the logged-in user and the given page
+ * This uses the column name "rating".
  */
 class _PageList_Column_ratingwidget extends _PageList_Column_custom 
@@ -213,4 +216,5 @@ class _PageList_Column_ratingwidget exte
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
+        if (!$this->_dimension) $this->_dimension = 0;
     }
 
@@ -218,5 +222,5 @@ class _PageList_Column_ratingwidget exte
         $plugin = new WikiPlugin_RateIt();
         $widget = $plugin->RatingWidgetHtml($page_handle->getName(), "", 
-                                            "pagerat", $this->_dimension, "small");
+                                            "Star", $this->_dimension, "small");
         $td = HTML::td($widget);
         $td->setAttr('nowrap', 'nowrap');
@@ -256,4 +260,5 @@ class _PageList_Column_prediction extend
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');;
+        if (!$this->_dimension) $this->_dimension = 0;
         $this->_users = $this->_pagelist->getOption('users');
     }
@@ -310,4 +315,5 @@ class _PageList_Column_top3recs extends 
             $this->_pagelist =& $params[3];
             $this->_dimension = $this->_pagelist->getOption('dimension');
+            if (!$this->_dimension) $this->_dimension = 0;
             $this->_users = $this->_pagelist->getOption('users');
         }
@@ -363,18 +369,33 @@ $WikiTheme->addPageListColumn
    (
     'numbacklinks' 
-    => array('_PageList_Column_numbacklinks','custom:numbacklinks', _("# things"), false),
+      => array('_PageList_Column_numbacklinks','custom:numbacklinks', 
+	       _("# things"), 'center'),
     'rating' 	   
-    => array('_PageList_Column_ratingwidget','custom:rating', _("Rate"), false),
+      => array('_PageList_Column_ratingwidget','custom:rating', 
+	       _("Rate"), false),
+    'ratingvalue'
+      => array('_PageList_Column_ratingvalue','custom:ratingvalue', 
+	       _("Rating"), 'center'),
     'coagreement'  
-    => array('_PageList_Column_coagreement','custom:coagreement', _("Go?"), 'center'),
+      => array('_PageList_Column_coagreement','custom:coagreement', 
+	       _("Go?"), 'center'),
     'minmisery'    
-    => array('_PageList_Column_minmisery','custom:minmisery', _("MinMisery"), 'center'),
+      => array('_PageList_Column_minmisery','custom:minmisery', 
+	       _("MinMisery"), 'center'),
     'averagerating' 
-    => array('_PageList_Column_averagerating','custom:averagerating', _("Avg. Rating"), 'left'),
+      => array('_PageList_Column_averagerating','custom:averagerating', 
+	       _("Avg. Rating"), 'left'),
     'top3recs'
-    => array('_PageList_Column_top3recs','custom:top3recs', _("Top Recommendations"), 'left'),
+      => array('_PageList_Column_top3recs','custom:top3recs', 
+	       _("Top Recommendations"), 'left'),
+    /*'prediction'
+      => array('_PageList_Column_prediction','custom:prediction', 
+                _("Prediction"), false),*/
     ));
 
 // $Log$
+// Revision 1.11  2008/01/24 19:34:54  rurban
+// minor: ratings centered, defaults 0
+//
 // Revision 1.10  2005/09/30 18:41:39  uckelman
 // Fixed more passes-by-reference.