jan
/
miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add to preferences Item title links to

This commit is contained in:
denfil 2016-02-27 22:21:18 +03:00
parent bd0e6af722
commit ee805bebfc
12 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/bookmark.php
View File

@ -46,6 +46,7 @@ Router\get_action('bookmarks', function() {
'order' => '',
'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'),
'item_title_link' => Model\Config\get('item_title_link'),
'items' => $items,
'nb_items' => $nb_items,
'offset' => $offset,

2
controllers/config.php
View File

@ -123,6 +123,7 @@ Router\get_action('config', function() {
'theme_options' => Model\Config\get_themes(),
'sorting_options' => Model\Config\get_sorting_directions(),
'display_mode' => Model\Config\get_display_mode(),
'item_title_link' => Model\Config\get_item_title_link(),
'redirect_nothing_to_read_options' => Model\Config\get_nothing_to_read_redirections(),
'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'config',
@ -161,6 +162,7 @@ Router\post_action('config', function() {
'sorting_options' => Model\Config\get_sorting_directions(),
'redirect_nothing_to_read_options' => Model\Config\get_nothing_to_read_redirections(),
'display_mode' => Model\Config\get_display_mode(),
'item_title_link' => Model\Config\get_item_title_link(),
'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'config',
'title' => t('Preferences')

1
controllers/history.php
View File

@ -21,6 +21,7 @@ Router\get_action('history', function() {
'order' => '',
'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'),
'item_title_link' => Model\Config\get('item_title_link'),
'nb_items' => $nb_items,
'nb_unread_items' => Model\Item\count_by_status('unread'),
'offset' => $offset,

1
controllers/item.php
View File

@ -39,6 +39,7 @@ Router\get_action('unread', function() {
'order' => $order,
'direction' => $direction,
'display_mode' => Model\Config\get('items_display_mode'),
'item_title_link' => Model\Config\get('item_title_link'),
'group_id' => $group_id,
'items' => $items,
'nb_items' => $nb_items,

2
locales/fr_FR/translations.php
View File

@ -242,4 +242,6 @@ return array(
'Groups' => 'Libellés',
'Back to the group' => 'Revenir sur le groupe',
'view' => 'voir',
// 'Item title links to' => '',
// 'Original' => ''
);

2
locales/ru_RU/translations.php
View File

@ -242,4 +242,6 @@ return array(
'Groups' => 'Группы',
'Back to the group' => 'Назад в группу',
'view' => 'смотреть',
'Item title links to' => 'Заголовок статьи ведет на',
'Original' => 'Оригинал'
);

9
models/config.php
View File

@ -149,6 +149,15 @@ function get_display_mode()
);
}
// Item title links to original or full contents
function get_item_title_link()
{
return array(
'original' => t('Original'),
'full' => t('Full contents')
);
}
// Autoflush choices for read items
function get_autoflush_read_options()
{

3
templates/bookmarks.php
View File

@ -18,6 +18,7 @@
'offset' => $offset,
'hide' => false,
'display_mode' => $display_mode,
'item_title_link' => $item_title_link,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>
@ -26,4 +27,4 @@
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
</section>
<?php endif ?>
<?php endif ?>

3
templates/config.php
View File

@ -66,6 +66,9 @@
<?= Helper\form_label(t('Display items on lists'), 'items_display_mode') ?>
<?= Helper\form_select('items_display_mode', $display_mode, $values, $errors) ?><br/>
<?= Helper\form_label(t('Item title links to'), 'item_title_link') ?>
<?= Helper\form_select('item_title_link', $item_title_link, $values, $errors) ?><br/>
<?= Helper\form_label(t('When there is nothing to read, redirect me to this page'), 'redirect_nothing_to_read') ?>
<?= Helper\form_select('redirect_nothing_to_read', $redirect_nothing_to_read_options, $values, $errors) ?><br/>

1
templates/history.php
View File

@ -21,6 +21,7 @@
'offset' => $offset,
'hide' => true,
'display_mode' => $display_mode,
'item_title_link' => $item_title_link,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>

4
templates/item.php
View File

@ -10,7 +10,7 @@
<span class="bookmark-icon"></span>
<span class="read-icon"></span>
<?= Helper\favicon($favicons, $item['feed_id']) ?>
<?php if ($display_mode === 'full'): ?>
<?php if ($display_mode === 'full' || $item_title_link == 'original'): ?>
<a class="original" rel="noreferrer" target="_blank"
href="<?= $item['url'] ?>"
<?= ($original_marks_read) ? 'data-action="mark-read"' : '' ?>
@ -42,7 +42,7 @@
<li class="hide-mobile">
<span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span>
</li>
<?php if ($display_mode === 'full'): ?>
<?php if ($display_mode === 'full' || $item_title_link == 'original'): ?>
<li>
<a
href="?action=show&amp;menu=<?= $menu ?><?= isset($group_id) ? '&amp;group_id='.$group_id : '' ?>&amp;id=<?= $item['id'] ?>"

1
templates/unread_items.php
View File

@ -35,6 +35,7 @@
'offset' => $offset,
'hide' => true,
'display_mode' => $display_mode,
'item_title_link' => $item_title_link,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
'group_id' => $group_id,