Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / actions / version.php

diff --git a/actions/version.php b/actions/version.php
index 3d74560c71f7171655b1d8126b10e3102f82a37f..9e4e836d2469d03f0778d732ebf6e88876990de9 100644 (file)
--- a/actions/version.php
+++ b/actions/version.php
@@ -41,6 +41,8 @@ if (!defined('STATUSNET')) {
  * @category Info
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
@@ -110,6 +112,36 @@ class VersionAction extends Action
         $this->showPage();
     }
 
+
+    /*
+    * Override to add hentry, and content-inner classes
+    *
+    * @return void
+    */
+    function showContentBlock()
+     {
+         $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+         $this->showPageTitle();
+         $this->showPageNoticeBlock();
+         $this->elementStart('div', array('id' => 'content_inner',
+                                          'class' => 'entry-content'));
+         // show the actual content (forms, lists, whatever)
+         $this->showContent();
+         $this->elementEnd('div');
+         $this->elementEnd('div');
+     }
+
+
+    /*
+    * Overrride to add entry-title class
+    *
+    * @return void
+    */
+    function showPageTitle() {
+        $this->element('h1', array('class' => 'entry-title'), $this->title());
+    }
+
+
     /**
      * Show version information
      *
@@ -120,7 +152,7 @@ class VersionAction extends Action
     {
         $this->elementStart('p');
 
-        $this->raw(sprintf(_('This site is powered by %s version %s, '.
+        $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
                              'Copyright 2008-2010 StatusNet, Inc. '.
                              'and contributors.'),
                            XMLStringer::estring('a', array('href' => 'http://status.net/'),
@@ -158,39 +190,46 @@ class VersionAction extends Action
         if (count($this->pluginVersions)) {
             $this->element('h2', null, _('Plugins'));
 
-            $this->elementStart('ul');
+            $this->elementStart('table', array('id' => 'plugins_enabled'));
+
+            $this->elementStart('thead');
+            $this->elementStart('tr');
+            $this->element('th', array('id' => 'plugin_name'), _('Name'));
+            $this->element('th', array('id' => 'plugin_version'), _('Version'));
+            $this->element('th', array('id' => 'plugin_authors'), _('Author(s)'));
+            $this->element('th', array('id' => 'plugin_description'), _('Description'));
+            $this->elementEnd('tr');
+            $this->elementEnd('thead');
 
+            $this->elementStart('tbody');
             foreach ($this->pluginVersions as $plugin) {
-                $this->elementStart('li');
-                $this->elementStart('dl');
-                $this->element('dt', null, _('Name'));
+                $this->elementStart('tr');
                 if (array_key_exists('homepage', $plugin)) {
-                    $this->elementStart('dd');
+                    $this->elementStart('th');
                     $this->element('a', array('href' => $plugin['homepage']),
                                    $plugin['name']);
-                    $this->elementEnd('dd');
+                    $this->elementEnd('th');
                 } else {
-                    $this->element('dd', null, $plugin['name']);
+                    $this->element('th', null, $plugin['name']);
                 }
-                $this->element('dt', null, _('Version'));
-                $this->element('dd', null, $plugin['version']);
+
+                $this->element('td', null, $plugin['version']);
+
                 if (array_key_exists('author', $plugin)) {
-                    $this->element('dt', null, _('Author(s)'));
-                    $this->element('dd', null, $plugin['author']);
+                    $this->element('td', null, $plugin['author']);
                 }
+
                 if (array_key_exists('rawdescription', $plugin)) {
-                    $this->element('dt', null, _('Description'));
-                    $this->elementStart('dd');
+                    $this->elementStart('td');
                     $this->raw($plugin['rawdescription']);
-                    $this->elementEnd('dd');
+                    $this->elementEnd('td');
                 } else if (array_key_exists('description', $plugin)) {
-                    $this->element('dt', null, _('Description'));
-                    $this->element('dd', null, $plugin['description']);
+                    $this->element('td', null, $plugin['description']);
                 }
-                $this->elementEnd('dl');
-                $this->elementEnd('li');
+                $this->elementEnd('tr');
             }
-            $this->elementEnd('ul');
+            $this->elementEnd('tbody');
+            $this->elementEnd('table');
         }
 
     }
@@ -228,5 +267,7 @@ class VersionAction extends Action
                               'Federico Marani',
                               'Craig Andrews',
                               'mEDI',
-                              'Brett Taylor');
+                              'Brett Taylor',
+                              'Brigitte Schuster',
+                              'Brion Vibber');
 }