harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "disable feature setting for collections and make feature settings for personal and new tab working."

Browse Source 
This reverts commit ed00301bb6.
This commit is contained in:
marijus 2014-01-26 14:44:55 +01:00
parent 44658f7b7f
commit 4ce6335364
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/conversation.php
View File

@ -1388,23 +1388,21 @@ function network_tabs() {
'sel'=>$postord_active, 'sel'=>$postord_active,
'title' => t('Sort by Post Date'), 'title' => t('Sort by Post Date'),
), ),
);
if(feature_enabled(local_user(),'personal_tab')) array(
$tabs[] = array(
'label' => t('Personal'), 'label' => t('Personal'),
'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1',
'sel' => $conv_active, 'sel' => $conv_active,
'title' => t('Posts that mention or involve you'), 'title' => t('Posts that mention or involve you'),
); ),
array(
if(feature_enabled(local_user(),'new_tab'))
$tabs[] = array(
'label' => t('New'), 'label' => t('New'),
'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
'sel' => $new_active, 'sel' => $new_active,
'title' => t('Activity Stream - by date'), 'title' => t('Activity Stream - by date'),
); ),
);
if(feature_enabled(local_user(),'star_posts')) if(feature_enabled(local_user(),'star_posts'))
$tabs[] = array( $tabs[] = array(

3
include/features.php
View File

@ -48,8 +48,7 @@ function get_features() {
'net_module' => array( 'net_module' => array(
t('Network and Stream Filtering'), t('Network and Stream Filtering'),
array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), 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('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('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')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')),