From f42522c2a15210f4584ee23a54ab207112e0dc10 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <contact@fredericguillot.com>
Date: Sun, 21 Jul 2013 12:32:00 -0400
Subject: [PATCH] Improve the feed title and feed domain display

---
 locales/fr_FR/translations.php |  2 +-
 model.php                      |  2 +-
 templates/bookmarks.php        | 11 ++++++++---
 templates/feeds.php            |  2 +-
 templates/history.php          |  3 +--
 templates/show_item.php        |  2 +-
 templates/unread_items.php     |  3 +--
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index 362ba57..f46fd6a 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -60,7 +60,7 @@ return array(
     'original link' => 'lien original',
     'mark as read' => 'marquer comme lu',
     'No history' => 'Aucun historique',
-    'mark as unread' => 'marquer comme non lu',
+    'mark as unread' => 'non lu',
     'History' => 'Historique',
     'flush all items' => 'supprimer tous les éléments',
     'Item not found' => 'Élément introuvable',
diff --git a/model.php b/model.php
index 477da44..2c17a86 100644
--- a/model.php
+++ b/model.php
@@ -412,7 +412,7 @@ function get_feed_items($feed_id, $offset = null, $limit = null)
 
 function get_item($id)
 {
-     return \PicoTools\singleton('db')
+    return \PicoTools\singleton('db')
         ->table('items')
         ->eq('id', $id)
         ->findOne();
diff --git a/templates/bookmarks.php b/templates/bookmarks.php
index 0019c6c..b04f6c6 100644
--- a/templates/bookmarks.php
+++ b/templates/bookmarks.php
@@ -22,10 +22,15 @@
                 </a>
             </h2>
             <p>
-            	<?= Helper\escape($item['feed_title']) ?> |
-                <?= Helper\get_host_from_url($item['url']) ?> |
+                <?= Helper\escape($item['feed_title']) ?> |
                 <?= dt('%e %B %Y %k:%M', $item['updated']) ?> |
-                <a href="?action=bookmark&amp;value=0&amp;id=<?= $item_id ?>&amp;redirect=bookmarks&amp;offset=<?= $offset ?>"><?= t('remove bookmark') ?></a> |
+
+                <span class="hide-mobile">
+                    <a href="?action=bookmark&amp;value=0&amp;id=<?= $item_id ?>&amp;redirect=bookmarks&amp;offset=<?= $offset ?>">
+                        <?= t('remove bookmark') ?>
+                    </a> |
+                </span>
+
                 <a
                     href="<?= $item['url'] ?>"
                     id="original-<?= $item_id ?>"
diff --git a/templates/feeds.php b/templates/feeds.php
index cc03175..6064343 100644
--- a/templates/feeds.php
+++ b/templates/feeds.php
@@ -29,7 +29,7 @@
                 <a href="<?= $feed['site_url'] ?>" rel="noreferrer" target="_blank"><?= Helper\get_host_from_url($feed['site_url']) ?></a> |
                 <span class="hide-mobile"><a href="<?= Helper\escape($feed['feed_url']) ?>" rel="noreferrer" target="_blank"><?= t('feed link') ?></a> |</span>
                 <span class="hide-mobile"><a href="?action=confirm-remove-feed&amp;feed_id=<?= $feed['id'] ?>"><?= t('remove') ?></a> |</span>
-                <a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>"><?= t('items') ?></a> |
+                <span class="hide-mobile"><a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>"><?= t('items') ?></a> |</span>
                 <a href="?action=refresh-feed&amp;feed_id=<?= $feed['id'] ?>" data-feed-id="<?= $feed['id'] ?>" data-action="refresh-feed"><?= t('refresh') ?></a>
             </p>
         </article>
diff --git a/templates/history.php b/templates/history.php
index 0358a38..ec6b469 100644
--- a/templates/history.php
+++ b/templates/history.php
@@ -24,8 +24,7 @@
                 </a>
             </h2>
             <p>
-            	<?= Helper\escape($item['feed_title']) ?> |
-                <?= Helper\get_host_from_url($item['url']) ?> |
+                <?= Helper\escape($item['feed_title']) ?> |
 
                 <span class="hide-mobile"><?= dt('%e %B %Y %k:%M', $item['updated']) ?> |</span>
 
diff --git a/templates/show_item.php b/templates/show_item.php
index 31dd1b9..23f89ee 100644
--- a/templates/show_item.php
+++ b/templates/show_item.php
@@ -12,7 +12,7 @@
         </h1>
 
         <p class="infos">
-        	<?= Helper\escape($feed['title']) ?> |
+            <?= Helper\escape($feed['title']) ?> |
             <?= Helper\get_host_from_url($item['url']) ?> |
             <span class="hide-mobile"><?= dt('%A %e %B %Y %k:%M', $item['updated']) ?> |</span>
             <?php if ($item['bookmark']): ?>
diff --git a/templates/unread_items.php b/templates/unread_items.php
index 5cf6675..ffbc5e2 100644
--- a/templates/unread_items.php
+++ b/templates/unread_items.php
@@ -33,8 +33,7 @@
                 <?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>
             </p>
             <p>
-            	<?= Helper\escape($item['feed_title']) ?> |
-                <?= Helper\get_host_from_url($item['url']) ?> |
+                <?= Helper\escape($item['feed_title']) ?> |
                 <span class="hide-mobile"><?= dt('%e %B %Y %k:%M', $item['updated']) ?> |</span>
 
                 <span class="hide-mobile">