diff options
Diffstat (limited to 'app/layout/nav_menu.phtml')
| -rw-r--r-- | app/layout/nav_menu.phtml | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index c45c5e70a..944008f04 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -150,6 +150,7 @@ type="submit"><?= $string_mark ?></button> </li> <?php + $mark_read_enabled = FreshRSS_Context::$sort === 'id'; $today = @strtotime('today'); $mark_before_today = $mark_read_url; $mark_before_today['params']['idMax'] = $today . '000000'; @@ -159,13 +160,13 @@ (!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_OR_NOT_READ)); ?> <li class="item separator"> - <button class="as-link <?= $confirm ?>" + <button class="as-link <?= $mark_read_enabled ? $confirm : '" disabled="disabled' ?>" form="mark-read-menu" formaction="<?= Minz_Url::display($mark_before_today) ?>" type="submit"><?= _t('index.menu.before_one_day') ?></button> </li> <li class="item"> - <button class="as-link <?= $confirm ?>" + <button class="as-link <?= $mark_read_enabled ? $confirm : '" disabled="disabled' ?>" form="mark-read-menu" formaction="<?= Minz_Url::display($mark_before_one_week) ?>" type="submit"><?= _t('index.menu.before_one_week') ?></button> @@ -212,22 +213,41 @@ <?php } ?> <?php - if (FreshRSS_Context::$order === 'DESC') { - $order = 'ASC'; + if (FreshRSS_Context::$order === 'ASC') { $icon = 'sort-up'; $title = _t('index.menu.older_first'); } else { - $order = 'DESC'; $icon = 'sort-down'; $title = _t('index.menu.newer_first'); } $url_order = Minz_Request::currentRequest(); - $url_order['params']['order'] = $order; ?> <div class="group"> - <a id="toggle-order" class="btn" href="<?= Minz_Url::display($url_order) ?>" title="<?= $title ?>"> - <?= _i($icon) ?> - </a> + <div class="dropdown"> + <div id="dropdown-sort" class="dropdown-target"></div> + <a id="toggle-order" class="dropdown-toggle btn" href="#dropdown-sort" title="<?= _t('index.menu.sort') ?>"><?= _i($icon) ?></a> + <ul class="dropdown-menu" role="radiogroup"> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'DESC' && FreshRSS_Context::$sort === 'id' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'id', 'order' => 'DESC']]) ?>"><?= _t('index.menu.sort.id_desc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'DESC' && FreshRSS_Context::$sort === 'date' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'date', 'order' => 'DESC']]) ?>"><?= _t('index.menu.sort.date_desc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'DESC' && FreshRSS_Context::$sort === 'link' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'link', 'order' => 'DESC']]) ?>"><?= _t('index.menu.sort.link_desc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'DESC' && FreshRSS_Context::$sort === 'title' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'title', 'order' => 'DESC']]) ?>"><?= _t('index.menu.sort.title_desc') ?></a></li> + <li class="item separator" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'ASC' && FreshRSS_Context::$sort === 'id' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'id', 'order' => 'ASC']]) ?>"><?= _t('index.menu.sort.id_asc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'ASC' && FreshRSS_Context::$sort === 'date' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'date', 'order' => 'ASC']]) ?>"><?= _t('index.menu.sort.date_asc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'ASC' && FreshRSS_Context::$sort === 'link' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'link', 'order' => 'ASC']]) ?>"><?= _t('index.menu.sort.link_asc') ?></a></li> + <li class="item" role="radio" aria-checked="<?= FreshRSS_Context::$order === 'ASC' && FreshRSS_Context::$sort === 'title' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'title', 'order' => 'ASC']]) ?>"><?= _t('index.menu.sort.title_asc') ?></a></li> + <li class="item separator" role="radio" aria-checked="<?= FreshRSS_Context::$sort === 'rand' ? 'true' : 'false' ?>"> + <a href="<?= Minz_Url::display($url_order, amend: ['params' => ['sort' => 'rand', 'order' => null]]) ?>"><?= _t('index.menu.sort.rand') ?></a></li> + </ul> + <a class="dropdown-close" href="#close">❌</a> + </div> </div> <?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous_refresh) { ?> |