full content: swap "open original" with "view" link, link item url to heading

This commit is contained in:
Mathias Kresin 2015-12-09 20:23:12 +01:00
parent e54c5eaa0c
commit d5b06afbc9
12 changed files with 34 additions and 7 deletions

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
'Unable to detect the feed format.' => 'Nelze detekovat formát odběru.', 'Unable to detect the feed format.' => 'Nelze detekovat formát odběru.',
'add a new group' => 'přidat novou skupinu', 'add a new group' => 'přidat novou skupinu',
'Groups' => 'Skupiny', 'Groups' => 'Skupiny',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
'Unable to detect the feed format.' => 'Impossible de détecter le format du flux.', 'Unable to detect the feed format.' => 'Impossible de détecter le format du flux.',
'add a new group' => 'ajouter un nouveau libellé', 'add a new group' => 'ajouter un nouveau libellé',
'Groups' => 'Libellés', 'Groups' => 'Libellés',
'view' => 'view',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -240,4 +240,5 @@ return array(
// 'Unable to detect the feed format.' => '', // 'Unable to detect the feed format.' => '',
// 'add a new group' => '', // 'add a new group' => '',
// 'Groups' => '', // 'Groups' => '',
// 'view' => '',
); );

View File

@ -10,10 +10,17 @@
<span class="bookmark-icon"></span> <span class="bookmark-icon"></span>
<span class="read-icon"></span> <span class="read-icon"></span>
<?= Helper\favicon($favicons, $item['feed_id']) ?> <?= Helper\favicon($favicons, $item['feed_id']) ?>
<a <?php if ($display_mode === 'full'): ?>
href="?action=show&amp;menu=<?= $menu ?><?= isset($group_id) ? '&amp;group_id='.$group_id : '' ?>&amp;id=<?= $item['id'] ?>" <a class="original" rel="noreferrer" target="_blank"
class="show" href="<?= $item['url'] ?>"
><?= Helper\escape($item['title']) ?></a> <?= ($original_marks_read) ? 'data-action="mark-read"' : '' ?>
><?= Helper\escape($item['title']) ?></a>
<?php else: ?>
<a
href="?action=show&amp;menu=<?= $menu ?><?= isset($group_id) ? '&amp;group_id='.$group_id : '' ?>&amp;id=<?= $item['id'] ?>"
class="show"
><?= Helper\escape($item['title']) ?></a>
<?php endif ?>
</h2> </h2>
<?php if ($display_mode === 'full'): ?> <?php if ($display_mode === 'full'): ?>
<div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>> <div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
@ -35,9 +42,18 @@
<li class="hide-mobile"> <li class="hide-mobile">
<span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span> <span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span>
</li> </li>
<li class="hide-mobile"> <?php if ($display_mode === 'full'): ?>
<a href="<?= $item['url'] ?>" class="original" rel="noreferrer" target="_blank" <?= ($original_marks_read) ? 'data-action="mark-read"' : '' ?>><?= t('original link') ?></a> <li>
</li> <a
href="?action=show&amp;menu=<?= $menu ?><?= isset($group_id) ? '&amp;group_id='.$group_id : '' ?>&amp;id=<?= $item['id'] ?>"
class="show"
><?= t('view') ?></a>
</li>
<?php else: ?>
<li class="hide-mobile">
<a href="<?= $item['url'] ?>" class="original" rel="noreferrer" target="_blank" <?= ($original_marks_read) ? 'data-action="mark-read"' : '' ?>><?= t('original link') ?></a>
</li>
<?php endif ?>
<?php if ($item['enclosure']): ?> <?php if ($item['enclosure']): ?>
<li> <li>
<?php if (strpos($item['enclosure_type'], 'video/') === 0): ?> <?php if (strpos($item['enclosure_type'], 'video/') === 0): ?>