diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-02 00:01:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-02 00:01:19 -0700 |
| commit | 5f612521da11cd4b9245909bf0a99a7431272e93 (patch) | |
| tree | 690b4d2eda5a99256549c9ae210065e0d3033fbb /include | |
| parent | a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58 (diff) | |
| parent | 53efd4e470f10e123209ed63b90213b20a87e011 (diff) | |
| download | volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.tar.gz volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.tar.bz2 volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/include/conversation.php b/include/conversation.php index 4a1cdc7da..61ca208b2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1162,7 +1162,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author_xchan'] && $item['author']['xchan_photo_s']) - ? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="menu-img-1" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' + ? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="menu-img-1" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' : '<a class="dropdown-item" href="#" class="disabled">' . $name . '</a>' ); diff --git a/include/nav.php b/include/nav.php index 994819ed4..d83337481 100644 --- a/include/nav.php +++ b/include/nav.php @@ -91,9 +91,11 @@ function nav($template = 'default') { if(local_channel()) { if(! $_SESSION['delegate']) { - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); + $nav['manage'] = array('manage', t('Manage Channels'), "", t('Manage your channels'),'manage_nav_btn'); } + $nav['group'] = array('group', t('Manage Privacy Groups'),"", t('Add and edit privacy groups'),'group_nav_btn'); + $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); @@ -182,20 +184,6 @@ function nav($template = 'default') { $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content'), $search_form_action]; - - /** - * - * The following nav links are only show to logged in users - * - */ - - if(local_channel()) { - if(! $_SESSION['delegate']) { - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); - } - $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); - } - /** * Admin page */ |