diff options
author | zotlabs <mike@macgirvin.com> | 2017-07-02 18:57:21 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-07-02 18:57:21 -0700 |
commit | 41111bcdadcd16ebc4f078fc812eb5a290f185e5 (patch) | |
tree | 0bddfc473649a96048465f78e9033c2f43669110 /Zotlabs | |
parent | 08c0729f5ff8ac97c27db08ae2dde1a052c71e25 (diff) | |
parent | 133292e241f9408ff793aa95aceec00c808fbd68 (diff) | |
download | volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.tar.gz volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.tar.bz2 volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Widget/Activity.php | 2 | ||||
-rw-r--r-- | Zotlabs/Widget/Forums.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php index 7264a3360..04e9fc4b1 100644 --- a/Zotlabs/Widget/Activity.php +++ b/Zotlabs/Widget/Activity.php @@ -50,7 +50,7 @@ class Activity { $o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills flex-column">'; foreach($arr as $rv) { - $o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-default float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>'; + $o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-secondary float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>'; } $o .= '</ul></div>'; } diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index 67e498b24..002c0ee21 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -87,7 +87,7 @@ class Forums { foreach($r1 as $rr) { if($unseen && (! intval($rr['unseen']))) continue; - $o .= '<li class="nav-item"><a class="nav-link" href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge badge-default float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>'; + $o .= '<li class="nav-item"><a class="nav-link" href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge badge-secondary float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>'; } $o .= '</ul></div>'; } |