Merge branch 'testing' into 0.9.x

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

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 8961da43557343af8fe3cdd80c0ff4fcf271fee4..904f8981d1c1d8f22ae0ebfb825505f3fb77be2f 100644 (file)
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -64,7 +64,7 @@ class ApplicationList extends Widget
         $this->application = $application;
         $this->owner       = $owner;
         $this->action      = $action;
-       $this->connections = $connections;
+        $this->connections = $connections;
     }
 
     function show()
@@ -88,18 +88,17 @@ class ApplicationList extends Widget
 
     function showApplication()
     {
-
         $user = common_current_user();
 
         $this->out->elementStart('li', array('class' => 'application',
                                              'id' => 'oauthclient-' . $this->application->id));
 
+        $this->out->elementStart('span', 'vcard author');
         if (!$this->connections) {
             $this->out->elementStart('a',
-                            array('href' => common_local_url('showapplication',
-                                                array('nickname' => $user->nickname,
-                                                      'id' => $this->application->id)),
-                                  'class' => 'url'));
+                                     array('href' => common_local_url('showapplication',
+                                                                      array('id' => $this->application->id)),
+                                                                      'class' => 'url'));
 
         } else {
             $this->out->elementStart('a', array('href' =>  $this->application->source_url,
@@ -107,22 +106,21 @@ class ApplicationList extends Widget
         }
 
         if (!empty($this->application->icon)) {
-            $this->out->element('img', array('src' => $this->application->icon));
+            $this->out->element('img', array('src' => $this->application->icon,
+                                             'class' => 'photo avatar'));
         }
 
-        $this->out->raw($this->application->name);
+        $this->out->element('span', 'fn', $this->application->name);
         $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
 
         $this->out->raw(' by ');
 
-        $this->out->elementStart('a', array('href' => $this->application->homepage,
-                                            'class' => 'url'));
-        $this->out->raw($this->application->organization);
-        $this->out->elementEnd('a');
+        $this->out->element('a', array('href' => $this->application->homepage,
+                                       'class' => 'url'),
+                                 $this->application->organization);
 
-        $this->out->elementStart('p', 'note');
-        $this->out->raw($this->application->description);
-        $this->out->elementEnd('p');
+        $this->out->element('p', 'note', $this->application->description);
         $this->out->elementEnd('li');
 
         if ($this->connections) {
@@ -134,16 +132,34 @@ class ApplicationList extends Widget
 
             $this->out->elementStart('li');
 
-            $access = ($this->application->access_type & Oauth_application::$writeAccess)
-              ? 'read-write' : 'read-only';
+            // TRANS: Application access type
+            $readWriteText = _('read-write');
+            // TRANS: Application access type
+            $readOnlyText = _('read-only');
 
-            $txt = 'Approved ' . common_exact_date($appUser->modified) .
-              " $access for access.";
+            $access = ($this->application->access_type & Oauth_application::$writeAccess)
+              ? $readWriteText : $readOnlyText;
+            $modifiedDate = common_date_string($appUser->modified);
+            // TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+            $txt = sprintf(_('Approved %1$s - "%2$s" access.'),$modifiedDate,$access);
 
             $this->out->raw($txt);
             $this->out->elementEnd('li');
 
-            // XXX: Add revoke access button
+            $this->out->elementStart('li', 'entity_revoke');
+            $this->out->elementStart('form', array('id' => 'form_revoke_app',
+                                                   'class' => 'form_revoke_app',
+                                                   'method' => 'POST',
+                                                   'action' =>
+                                                   common_local_url('oauthconnectionssettings')));
+            $this->out->elementStart('fieldset');
+            $this->out->hidden('id', $this->application->id);
+            $this->out->hidden('token', common_session_token());
+            // TRANS: Button label
+            $this->out->submit('revoke', _m('BUTTON','Revoke'));
+            $this->out->elementEnd('fieldset');
+            $this->out->elementEnd('form');
+            $this->out->elementEnd('li');
         }
     }
 
@@ -154,8 +170,4 @@ class ApplicationList extends Widget
         return;
     }
 
-    function highlight($text)
-    {
-        return htmlspecialchars($text);
-    }
 }