Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 23da64cca897989149907e6f75eb77bbfe956f6f..ea0aa7f1abe498914afcb632aeeb2b957ee89cfa 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -1,7 +1,6 @@
 <?php
-
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Widget to show a list of profiles
  *
@@ -21,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Public
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,11 +37,11 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  * Widget to show a list of subscriptions
  *
  * @category Public
- * @package  Laconica
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscriptionList extends ProfileList
@@ -98,34 +97,32 @@ class SubscriptionListItem extends ProfileListItem
     {
         $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-        $this->out->elementStart('dl', 'entity_tags');
-        $this->out->elementStart('dt');
         if ($this->isOwn()) {
             $this->out->element('a', array('href' => common_local_url('tagother',
                                                                       array('id' => $this->profile->id))),
+                                // TRANS: Description for link to "tag other users" in widget to show a list of profiles.
                                 _('Tags'));
         } else {
+            // TRANS: Text widget to show a list of profiles with their tags.
             $this->out->text(_('Tags'));
         }
-        $this->out->elementEnd('dt');
-        $this->out->elementStart('dd');
         if ($tags) {
-            $this->out->elementStart('ul', 'tags xoxo');
+            $this->out->elementStart('ul', 'tags xoxo entity_tags');
             foreach ($tags as $tag) {
                 $this->out->elementStart('li');
-                $this->out->element('span', 'mark_hash', '#');
-                $this->out->element('a', array('rel' => 'tag',
-                                               'href' => common_local_url($this->action->trimmed('action'),
-                                                                          array('nickname' => $this->owner->nickname,
-                                                                                'tag' => $tag))),
-                                    $tag);
+                // Avoid space by using raw output.
+                $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
+                  common_local_url($this->action->trimmed('action'),
+                                   array('nickname' => $this->owner->nickname,
+                                   'tag' => $tag)) .
+                  '">' . $tag . '</a>';
+                $this->out->raw($pt);
                 $this->out->elementEnd('li');
             }
             $this->out->elementEnd('ul');
         } else {
-            $this->out->text(_('(none)'));
+            // TRANS: Text if there are no tags in widget to show a list of profiles by tag.
+            $this->out->text(_('(None)'));
         }
-        $this->out->elementEnd('dd');
-        $this->out->elementEnd('dl');
     }
 }