Merged pull-request #446 and fixed conflicts

This commit is contained in:
Frederic Guillot 2015-12-09 19:24:54 -05:00
commit edf95dfda2
15 changed files with 57 additions and 19 deletions

View File

@ -575,13 +575,11 @@ nav .active a {
/* item preview full-content */
.preview-full-content {
overflow: auto;
margin-bottom: 10px;
color: #666;
}
.preview-full-content p {
.preview-full-content p, p.preview:not(:empty) {
margin-top: 15px;
margin-bottom: 15px;
}
.preview-full-content img {

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
'add a new group' => 'přidat novou skupinu',
'Groups' => 'Skupiny',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
'add a new group' => 'ajouter un nouveau libellé',
'Groups' => 'Libellés',
'Back to the group' => 'Revenir sur le groupe'
'view' => 'view',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -241,4 +241,5 @@ return array(
// 'add a new group' => '',
// 'Groups' => '',
// 'Back to the group' => '',
// 'view' => '',
);

View File

@ -106,6 +106,7 @@ function get_all_by_status($status, $feed_ids = array(), $offset = null, $limit
'items.status',
'items.content',
'items.language',
'items.author',
'feeds.site_url',
'feeds.title AS feed_title',
'feeds.rtl'
@ -156,6 +157,7 @@ function get_bookmarks($offset = null, $limit = null)
'items.content',
'items.feed_id',
'items.language',
'items.author',
'feeds.site_url',
'feeds.title AS feed_title',
'feeds.rtl'
@ -196,6 +198,7 @@ function get_all_by_feed($feed_id, $offset = null, $limit = null, $order_column
'items.content',
'items.bookmark',
'items.language',
'items.author',
'feeds.site_url',
'feeds.rtl'
)

View File

@ -10,21 +10,20 @@
<span class="bookmark-icon"></span>
<span class="read-icon"></span>
<?= Helper\favicon($favicons, $item['feed_id']) ?>
<?php if ($display_mode === 'full'): ?>
<a class="original" rel="noreferrer" target="_blank"
href="<?= $item['url'] ?>"
<?= ($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>
</h2>
<?php if ($display_mode === 'full'): ?>
<div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
<?= $item['content'] ?>
</div>
<?php else: ?>
<p class="preview" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
<?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>
</p>
<?php endif ?>
</h2>
<ul class="item-menu">
<?php if ($menu !== 'feed-items'): ?>
<li>
<?php if (! isset($item['feed_title'])): ?>
<?= Helper\get_host_from_url($item['url']) ?>
@ -32,12 +31,27 @@
<a href="?action=feed-items&amp;feed_id=<?= $item['feed_id'] ?>" title="<?= t('Show only this subscription') ?>"><?= Helper\escape($item['feed_title']) ?></a>
<?php endif ?>
</li>
<?php endif ?>
<?php if (!empty($item['author'])): ?>
<li>
<?= Helper\escape($item['author']) ?>
</li>
<?php endif ?>
<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'): ?>
<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']): ?>
<li>
<?php if (strpos($item['enclosure_type'], 'video/') === 0): ?>
@ -54,4 +68,11 @@
<?= \Template\load('bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset, 'source' => '')) ?>
<?= \Template\load('status_links', array('item' => $item, 'redirect' => $menu, 'offset' => $offset)) ?>
</ul>
<?php if ($display_mode === 'full'): ?>
<div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
<?= $item['content'] ?>
</div>
<?php else: ?>
<p class="preview" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>><?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?></p>
<?php endif ?>
</article>

View File

@ -46,6 +46,11 @@
<li>
<a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>"><?= Helper\escape($feed['title']) ?></a>
</li>
<?php if (!empty($item['author'])): ?>
<li>
<?= Helper\escape($item['author']) ?>
</li>
<?php endif ?>
<li class="hide-mobile">
<span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span>
</li>