X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fapplicationlist.php;h=3abb1f8aa7c8fa81abbda9ae97d23ed00c71ca8e;hb=1c40e7c139af98e4fe9c73093da4183ad8d9e234;hp=b1dcc39a96412a61ce74c4410a5d55e003b27295;hpb=bf53456710aa3266c79965ca6b62d72d0798eec5;p=quix0rs-gnu-social.git

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index b1dcc39a96..3abb1f8aa7 100644
--- 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()
@@ -94,36 +94,34 @@ class ApplicationList extends Widget
         $this->out->elementStart('li', array('class' => 'application',
                                              'id' => 'oauthclient-' . $this->application->id));
 
-        if (!empty($this->application->icon)) {
-            $this->out->element('img', array('src' => $this->application->icon));
-        }
-
+        $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'));
 
-            $this->out->raw($this->application->name);
-            $this->out->elementEnd('a');
         } else {
             $this->out->elementStart('a', array('href' =>  $this->application->source_url,
                                                 'class' => 'url'));
-            $this->out->raw($this->application->name);
-            $this->out->elementEnd('a');
         }
 
-        $this->out->raw(' by ');
+        if (!empty($this->application->icon)) {
+            $this->out->element('img', array('src' => $this->application->icon,
+                                             'class' => 'photo avatar'));
+        }
 
-        $this->out->elementStart('a', array('href' => $this->application->homepage,
-                                            'class' => 'url'));
-        $this->out->raw($this->application->organization);
+        $this->out->element('span', 'fn', $this->application->name);
         $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
 
-        $this->out->elementStart('p', 'note');
-        $this->out->raw($this->application->description);
-        $this->out->elementEnd('p');
+        $this->out->raw(' by ');
+
+        $this->out->element('a', array('href' => $this->application->homepage,
+                                       'class' => 'url'),
+                                 $this->application->organization);
+
+        $this->out->element('p', 'note', $this->application->description);
         $this->out->elementEnd('li');
 
         if ($this->connections) {
@@ -138,13 +136,25 @@ class ApplicationList extends Widget
             $access = ($this->application->access_type & Oauth_application::$writeAccess)
               ? 'read-write' : 'read-only';
 
-            $txt = 'Approved ' . common_exact_date($appUser->modified) .
-              " $access for access.";
+            $txt = 'Approved ' . common_date_string($appUser->modified) .
+              " - $access 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());
+            $this->out->submit('revoke', _('Revoke'));
+            $this->out->elementEnd('fieldset');
+            $this->out->elementEnd('form');
+            $this->out->elementEnd('li');
         }
     }
 
@@ -155,8 +165,4 @@ class ApplicationList extends Widget
         return;
     }
 
-    function highlight($text)
-    {
-        return htmlspecialchars($text);
-    }
 }