Merge branch 'uiredesign' of ../evan into uiredesign

[quix0rs-gnu-social.git] / lib / feedlist.php

diff --git a/lib/feedlist.php b/lib/feedlist.php
index 0ff88cb25ab3b2865199363aa65fc6a240ab5b4e..47d909e969c1ac51986f7448e7c3996630ff4c7d 100644 (file)
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -47,19 +47,21 @@ if (!defined('LACONICA')) {
  * @see      Action::showExportList()
  */
 
-class FeedList
+class FeedList extends Widget
 {
-    var $out = null;
-
-    function __construct($out=null)
+    var $action = null;
+    
+    function __construct($action=null)
     {
-        $this->out = $out;
+       parent::__construct($action);
+       $this->action = $action;
     }
 
     function show($feeds)
     {
-        $this->out->elementStart('div', array('class' => 'feeds'));
-        $this->out->element('p', null, 'Feeds:');
+        $this->out->elementStart('div', array('id' => 'export_data',
+                                              'class' => 'section'));
+        $this->out->element('h2', null, _('Export data'));
         $this->out->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $key => $value) {
@@ -72,7 +74,7 @@ class FeedList
 
     function feedItem($feed)
     {
-        $nickname = $this->trimmed('nickname');
+        $nickname = $this->action->trimmed('nickname');
 
         switch($feed['item']) {
          case 'notices': default: