Merged pull-request #446 and fixed conflicts

2015-12-09 19:24:54 -05:00 · 2015-12-09 19:24:54 -05:00 · edf95dfda2
commit edf95dfda2
parent 74b193f8bf 0c5560cdc6
15 changed files with 57 additions and 19 deletions
--- a/assets/css/app.css
+++ b/assets/css/app.css
@ -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 {
--- a/locales/ar_AR/translations.php
+++ b/locales/ar_AR/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/cs_CZ/translations.php
+++ b/locales/cs_CZ/translations.php
@ -241,4 +241,5 @@ return array(
    'add a new group' => 'přidat novou skupinu',
    'Groups' => 'Skupiny',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@ -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',
 );
--- a/locales/it_IT/translations.php
+++ b/locales/it_IT/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/ru_RU/translations.php
+++ b/locales/ru_RU/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/sr_RS/translations.php
+++ b/locales/sr_RS/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/sr_RS@latin/translations.php
+++ b/locales/sr_RS@latin/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/locales/zh_CN/translations.php
+++ b/locales/zh_CN/translations.php
@ -241,4 +241,5 @@ return array(
    // 'add a new group' => '',
    // 'Groups' => '',
    // 'Back to the group' => '',
+    // 'view' => '',
 );
--- a/models/item.php
+++ b/models/item.php
@ -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'
        )
--- a/templates/item.php
+++ b/templates/item.php
@ -10,21 +10,20 @@
        <span class="bookmark-icon"></span>
        <span class="read-icon"></span>
        <?= Helper\favicon($favicons, $item['feed_id']) ?>
-        <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 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>
+        <?php endif ?>
    </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 ?>
    <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>
-        <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 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>
--- a/templates/show_item.php
+++ b/templates/show_item.php
@ -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>