Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x

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

diff --git a/lib/profileblock.php b/lib/profileblock.php
index 7fcc11ef1a844cd6896259b53586f4968c6a97cb..19e5a386ba5b71a3cac60222811804069dc1c603 100644 (file)
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -50,16 +50,13 @@ abstract class ProfileBlock extends Widget
     abstract function avatar();
     abstract function name();
     abstract function url();
-    abstract function canEdit();
-    abstract function editUrl();
-    abstract function editText();
     abstract function location();
     abstract function homepage();
     abstract function description();
 
     function show()
     {
-        $this->out->elementStart('div', 'profile_block');
+        $this->out->elementStart('div', 'profile_block section');
 
         $size = $this->avatarSize();
 
@@ -69,27 +66,24 @@ abstract class ProfileBlock extends Widget
                                          'width' => $size,
                                          'height' => $size));
 
-        if ($this->canEdit()) {
-            $this->out->element('a', array('href' => $this->editUrl()),
-                                $this->editText());
-        }
-
         $name = $this->name();
 
         if (!empty($name)) {
+            $this->out->elementStart('p', 'profile_block_name');
             $url = $this->url();
             if (!empty($url)) {
                 $this->out->element('a', array('href' => $url),
                                     $name);
             } else {
-                $this->out->element('span', 'profile_block_name', $name);
+                $this->out->text($name);
             }
+            $this->out->elementEnd('p');
         }
 
         $location = $this->location();
 
         if (!empty($location)) {
-            $this->out->element('span', 'profile_block_location', $location);
+            $this->out->element('p', 'profile_block_location', $location);
         }
 
         $homepage = $this->homepage();