sforkowany z mirror/friendica
Renamed labels
rodzic
01142cb4d0
commit
f97de52694
|
@ -86,20 +86,20 @@ function network_init(App $a)
|
|||
|
||||
if ($remember_tab) {
|
||||
// redirect if current selected tab is '/network' and
|
||||
// last selected tab is _not_ '/network?order=comment'.
|
||||
// last selected tab is _not_ '/network?order=activity'.
|
||||
// and this isn't a date query
|
||||
|
||||
$tab_baseurls = [
|
||||
'', //all
|
||||
'', //arrivalord
|
||||
'', //postord
|
||||
'', //conv
|
||||
'/new', //new
|
||||
'', //starred
|
||||
'', //bookmarked
|
||||
];
|
||||
$tab_args = [
|
||||
'order=comment', //all
|
||||
'order=arrival', //arrivalord
|
||||
'order=activity', //all
|
||||
'order=post', //postord
|
||||
'conv=1', //conv
|
||||
'', //new
|
||||
'star=1', //starred
|
||||
|
@ -152,15 +152,15 @@ function network_init(App $a)
|
|||
*
|
||||
* urls -> returns
|
||||
* '/network' => $no_active = 'active'
|
||||
* '/network?order=comment' => $comment_active = 'active'
|
||||
* '/network?order=arrival' => $arrivalord_active = 'active'
|
||||
* '/network?order=activity' => $activity_active = 'active'
|
||||
* '/network?order=post' => $postord_active = 'active'
|
||||
* '/network?conv=1', => $conv_active = 'active'
|
||||
* '/network/new', => $new_active = 'active'
|
||||
* '/network?star=1', => $starred_active = 'active'
|
||||
* '/network?bmark=1', => $bookmarked_active = 'active'
|
||||
*
|
||||
* @param App $a
|
||||
* @return array ($no_active, $comment_active, $arrivalord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
|
||||
* @return array ($no_active, $activity_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
|
||||
*/
|
||||
function network_query_get_sel_tab(App $a)
|
||||
{
|
||||
|
@ -170,7 +170,7 @@ function network_query_get_sel_tab(App $a)
|
|||
$bookmarked_active = '';
|
||||
$all_active = '';
|
||||
$conv_active = '';
|
||||
$arrivalord_active = '';
|
||||
$postord_active = '';
|
||||
|
||||
if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) {
|
||||
$new_active = 'active';
|
||||
|
@ -194,12 +194,12 @@ function network_query_get_sel_tab(App $a)
|
|||
|
||||
if ($no_active == 'active' && !empty($_GET['order'])) {
|
||||
switch($_GET['order']) {
|
||||
case 'arrival' : $arrivalord_active = 'active'; $no_active=''; break;
|
||||
case 'comment' : $all_active = 'active'; $no_active=''; break;
|
||||
case 'post' : $postord_active = 'active'; $no_active=''; break;
|
||||
case 'activity' : $all_active = 'active'; $no_active=''; break;
|
||||
}
|
||||
}
|
||||
|
||||
return [$no_active, $all_active, $arrivalord_active, $conv_active, $new_active, $starred_active, $bookmarked_active];
|
||||
return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active];
|
||||
}
|
||||
|
||||
function network_query_get_sel_group(App $a)
|
||||
|
@ -475,7 +475,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
$datequery2 = Strings::escapeHtml($a->argv[$x]);
|
||||
} else {
|
||||
$datequery = Strings::escapeHtml($a->argv[$x]);
|
||||
$_GET['order'] = 'arrival';
|
||||
$_GET['order'] = 'post';
|
||||
}
|
||||
} elseif (intval($a->argv[$x])) {
|
||||
$gid = intval($a->argv[$x]);
|
||||
|
@ -490,7 +490,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
$star = intval($_GET['star'] ?? 0);
|
||||
$bmark = intval($_GET['bmark'] ?? 0);
|
||||
$conv = intval($_GET['conv'] ?? 0);
|
||||
$order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'comment');
|
||||
$order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity');
|
||||
$nets = $_GET['nets'] ?? '';
|
||||
|
||||
$allowedCids = [];
|
||||
|
@ -671,7 +671,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
}
|
||||
|
||||
// Normal conversation view
|
||||
if ($order === 'arrival') {
|
||||
if ($order === 'post') {
|
||||
$ordering = '`received`';
|
||||
$order_mode = 'received';
|
||||
} else {
|
||||
|
@ -738,7 +738,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
if (Config::get("system", "like_no_comment")) {
|
||||
$sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
|
||||
}
|
||||
if ($order === 'arrival') {
|
||||
if ($order === 'post') {
|
||||
// Only show toplevel posts when updating posts in this order mode
|
||||
$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
|
||||
}
|
||||
|
@ -913,9 +913,9 @@ function network_tabs(App $a)
|
|||
// item filter tabs
|
||||
/// @TODO fix this logic, reduce duplication
|
||||
/// $a->page['content'] .= '<div class="tabs-wrapper">';
|
||||
list($no_active, $all_active, $arrival_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
|
||||
list($no_active, $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
|
||||
|
||||
// if no tabs are selected, defaults to comments
|
||||
// if no tabs are selected, defaults to activitys
|
||||
if ($no_active == 'active') {
|
||||
$all_active = 'active';
|
||||
}
|
||||
|
@ -925,19 +925,19 @@ function network_tabs(App $a)
|
|||
// tabs
|
||||
$tabs = [
|
||||
[
|
||||
'label' => L10n::t('Commented Order'),
|
||||
'url' => str_replace('/new', '', $cmd) . '?order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'label' => L10n::t('Latest Activities'),
|
||||
'url' => str_replace('/new', '', $cmd) . '?order=activity' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'sel' => $all_active,
|
||||
'title' => L10n::t('Sort by Comment Date'),
|
||||
'id' => 'commented-order-tab',
|
||||
'title' => L10n::t('Sort by activity Date'),
|
||||
'id' => 'activity-order-tab',
|
||||
'accesskey' => 'e',
|
||||
],
|
||||
[
|
||||
'label' => L10n::t('Arrival Order'),
|
||||
'url' => str_replace('/new', '', $cmd) . '?order=arrival' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'sel' => $arrival_active,
|
||||
'title' => L10n::t('Sort by arrival date'),
|
||||
'id' => 'arrival-order-tab',
|
||||
'label' => L10n::t('Latest Posts'),
|
||||
'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'sel' => $post_active,
|
||||
'title' => L10n::t('Sort by post date'),
|
||||
'id' => 'post-order-tab',
|
||||
'accesskey' => 't',
|
||||
],
|
||||
];
|
||||
|
@ -985,7 +985,7 @@ function network_tabs(App $a)
|
|||
// save selected tab, but only if not in file mode
|
||||
if (empty($_GET['file'])) {
|
||||
PConfig::set(local_user(), 'network.view', 'tab.selected', [
|
||||
$all_active, $arrival_active, $conv_active, $new_active, $starred_active, $bookmarked_active
|
||||
$all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue