From d5b06afbc96c4790a8b6b5ebbfdbbe7d931298d8 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Wed, 9 Dec 2015 20:23:12 +0100
Subject: [PATCH 1/4] full content: swap "open original" with "view" link, link
 item url to heading

---
 locales/ar_AR/translations.php       |  1 +
 locales/cs_CZ/translations.php       |  1 +
 locales/de_DE/translations.php       |  1 +
 locales/es_ES/translations.php       |  1 +
 locales/fr_FR/translations.php       |  1 +
 locales/it_IT/translations.php       |  1 +
 locales/pt_BR/translations.php       |  1 +
 locales/ru_RU/translations.php       |  1 +
 locales/sr_RS/translations.php       |  1 +
 locales/sr_RS@latin/translations.php |  1 +
 locales/zh_CN/translations.php       |  1 +
 templates/item.php                   | 30 +++++++++++++++++++++-------
 12 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/locales/ar_AR/translations.php b/locales/ar_AR/translations.php
index 1af0e8f..e3d2a37 100644
--- a/locales/ar_AR/translations.php
+++ b/locales/ar_AR/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/cs_CZ/translations.php b/locales/cs_CZ/translations.php
index 90258a8..5f72957 100644
--- a/locales/cs_CZ/translations.php
+++ b/locales/cs_CZ/translations.php
@@ -240,4 +240,5 @@ return array(
     'Unable to detect the feed format.' => 'Nelze detekovat formát odběru.',
     'add a new group' => 'přidat novou skupinu',
     'Groups' => 'Skupiny',
+    // 'view' => '',
 );
diff --git a/locales/de_DE/translations.php b/locales/de_DE/translations.php
index 61f06f8..0d0b190 100644
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php
index 3b18430..f927899 100644
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index ba53c95..1da9ec8 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -240,4 +240,5 @@ return array(
     'Unable to detect the feed format.' => 'Impossible de détecter le format du flux.',
     'add a new group' => 'ajouter un nouveau libellé',
     'Groups' => 'Libellés',
+    'view' => 'view',
 );
diff --git a/locales/it_IT/translations.php b/locales/it_IT/translations.php
index 8601044..efbfe84 100644
--- a/locales/it_IT/translations.php
+++ b/locales/it_IT/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php
index 01036ae..aeeb632 100644
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/ru_RU/translations.php b/locales/ru_RU/translations.php
index 2e477de..8b58dd6 100644
--- a/locales/ru_RU/translations.php
+++ b/locales/ru_RU/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/sr_RS/translations.php b/locales/sr_RS/translations.php
index a369d26..17e8c61 100644
--- a/locales/sr_RS/translations.php
+++ b/locales/sr_RS/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/sr_RS@latin/translations.php b/locales/sr_RS@latin/translations.php
index 8cd03e0..996ad35 100644
--- a/locales/sr_RS@latin/translations.php
+++ b/locales/sr_RS@latin/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/locales/zh_CN/translations.php b/locales/zh_CN/translations.php
index fc939ad..1e7b7b2 100644
--- a/locales/zh_CN/translations.php
+++ b/locales/zh_CN/translations.php
@@ -240,4 +240,5 @@ return array(
     // 'Unable to detect the feed format.' => '',
     // 'add a new group' => '',
     // 'Groups' => '',
+    // 'view' => '',
 );
diff --git a/templates/item.php b/templates/item.php
index b68e878..4afbce4 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -10,10 +10,17 @@
         <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"' ?>>
@@ -35,9 +42,18 @@
         <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): ?>

From de50709f4617106d7628833073359f17ead5c554 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Wed, 9 Dec 2015 20:24:07 +0100
Subject: [PATCH 2/4] do not show feed title/url when browsing the articles of
 a chosen feed

It doesn't contain any useful info.
---
 templates/item.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/item.php b/templates/item.php
index 4afbce4..5dbb41c 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -32,6 +32,7 @@
         </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']) ?>
@@ -39,6 +40,7 @@
                 <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 ?>
         <li class="hide-mobile">
             <span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span>
         </li>

From 0cd4438574f5711edf9f504e20009b123881dac5 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Wed, 9 Dec 2015 20:25:13 +0100
Subject: [PATCH 3/4] show the article author if possible

---
 models/item.php         | 3 +++
 templates/item.php      | 5 +++++
 templates/show_item.php | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/models/item.php b/models/item.php
index 1baabc7..5ab8736 100644
--- 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'
         )
diff --git a/templates/item.php b/templates/item.php
index 5dbb41c..483dc94 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -41,6 +41,11 @@
             <?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>
diff --git a/templates/show_item.php b/templates/show_item.php
index 02afbff..d6790e1 100644
--- 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>

From 0c5560cdc6b1bb055f1864bc393d4dc7976fbc74 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Wed, 9 Dec 2015 20:26:21 +0100
Subject: [PATCH 4/4] move the item action links to the top

there must be no space between between the <p class="preview"> and the $item['content']. The CSS pseudo-class :empty does not consider a paragraph with whitespaces as empty.  The Selectors Level 4 Draft[1] as of 13 September 2015, mentions the CSS pseudo-class :blank which will do so. But it's a draft and not yet implemented by the majority of the browsers.

[1] https://drafts.csswg.org/selectors-4/#the-blank-pseudo
---
 assets/css/app.css |  4 +---
 templates/item.php | 16 +++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 1e8741f..cdfbf74 100644
--- 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 {
diff --git a/templates/item.php b/templates/item.php
index 483dc94..3d39a6c 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -22,15 +22,6 @@
             ><?= 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>
@@ -77,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>