diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-26 14:44:55 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-26 14:44:55 +0100 |
| commit | 4ce6335364a5c86cac97bcc43af0dc6bfa38d114 (patch) | |
| tree | b05c52358360563cbc4945c42461d73bd0de3f3b | |
| parent | 44658f7b7f03979c3809b046d911ff24484a05c9 (diff) | |
| download | volse-hubzilla-4ce6335364a5c86cac97bcc43af0dc6bfa38d114.tar.gz volse-hubzilla-4ce6335364a5c86cac97bcc43af0dc6bfa38d114.tar.bz2 volse-hubzilla-4ce6335364a5c86cac97bcc43af0dc6bfa38d114.zip | |
Revert "disable feature setting for collections and make feature settings for personal and new tab working."
This reverts commit ed00301bb641d716e43876572be640f8252b9b05.
| -rw-r--r-- | include/conversation.php | 14 | ||||
| -rw-r--r-- | include/features.php | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/conversation.php b/include/conversation.php index b6ee08e1f..cec5993b6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1388,23 +1388,21 @@ function network_tabs() { 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ), - ); - if(feature_enabled(local_user(),'personal_tab')) - $tabs[] = array( + array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), - ); - - if(feature_enabled(local_user(),'new_tab')) - $tabs[] = array( + ), + array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), - ); + ), + + ); if(feature_enabled(local_user(),'star_posts')) $tabs[] = array( diff --git a/include/features.php b/include/features.php index 973fe9fe7..cc8d457bc 100644 --- a/include/features.php +++ b/include/features.php @@ -48,8 +48,7 @@ function get_features() { 'net_module' => array( t('Network and Stream Filtering'), array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), - // Disabled until a solution for default feature settings is found. - // array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), + array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), |