From c18ddc3ddc409b624165671aea5a8ba81aaec062 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Tue, 16 Sep 2014 17:07:53 +0200
Subject: [PATCH] HTML Cleanup

Remove line breaks and indentation around links text: At least Chrome/Firefox on
Windows add the white space(s) from the HTML Code to the link text, which
results in "jumping" labels. The behaviour can be observed with the Hello Theme
while toggling the bookmark status.
---
 assets/css/app.css           |  2 +-
 templates/bookmark_links.php |  8 ++------
 templates/config.php         |  4 ++--
 templates/item.php           |  4 +---
 templates/login.php          |  2 +-
 templates/show_item.php      | 12 +++---------
 templates/status_links.php   | 12 +++---------
 7 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 380b5cd..7526a10 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -653,7 +653,7 @@ iframe {
     opacity: 0;
 }
 
-.login-form {
+#login-form {
     margin-bottom: 20px;
 }
 
diff --git a/templates/bookmark_links.php b/templates/bookmark_links.php
index ad20af5..099f2e1 100644
--- a/templates/bookmark_links.php
+++ b/templates/bookmark_links.php
@@ -6,9 +6,7 @@
         data-action="bookmark"
         data-item-id="<?= $item['id'] ?>"
         data-reverse-label="<?= t('bookmark') ?>"
-    >
-        <?= t('remove bookmark') ?>
-    </a>
+    ><?= t('remove bookmark') ?></a>
 <?php else: ?>
     <a
         id="bookmark-<?= $item['id'] ?>"
@@ -17,8 +15,6 @@
         data-action="bookmark"
         data-item-id="<?= $item['id'] ?>"
         data-reverse-label="<?= t('remove bookmark') ?>"
-    >
-        <?= t('bookmark') ?>
-    </a>
+    ><?= t('bookmark') ?></a>
 <?php endif ?>
 </li>
\ No newline at end of file
diff --git a/templates/config.php b/templates/config.php
index 52bac8a..6e4f68b 100644
--- a/templates/config.php
+++ b/templates/config.php
@@ -107,7 +107,7 @@
             <li><a href="?action=download-db"><?= t('Download the entire database') ?></a> <?= t('(Gzip compressed Sqlite file)') ?></li>
             <?php if (ENABLE_MULTIPLE_DB): ?>
             <li>
-                <a href="?action=new-db"><?= t('Add a new database (new user)') ?></a></li>
+                <a href="?action=new-db"><?= t('Add a new database (new user)') ?></a>
             </li>
             <?php endif ?>
         </ul>
@@ -117,7 +117,7 @@
         <h3><?= t('About') ?></h3>
         <ul>
             <li><?= t('Miniflux version:') ?> <strong><?= APP_VERSION ?></strong></li>
-            <li><?= t('Official website:') ?> <a href="http://miniflux.net" rel="noreferer" target="_blank">http://miniflux.net</a></li>
+            <li><?= t('Official website:') ?> <a href="http://miniflux.net" rel="noreferrer" target="_blank">http://miniflux.net</a></li>
             <?php if (ENABLE_AUTO_UPDATE): ?>
                 <li><a href="?action=auto-update"><?= t('Update Miniflux') ?></a> (<?= t('Don\'t forget to backup your database') ?>)</li>
             <?php endif ?>
diff --git a/templates/item.php b/templates/item.php
index 6674dba..1360e08 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -15,9 +15,7 @@
             data-item-id="<?= $item['id'] ?>"
             id="show-<?= $item['id'] ?>"
             <?= $item['status'] === 'read' ? 'class="read"' : '' ?>
-        >
-            <?= Helper\escape($item['title']) ?>
-        </a>
+        ><?= Helper\escape($item['title']) ?></a>
     </h2>
     <?php if($display_mode === 'full'): ?>
         <div class="preview" <?= Helper\isRTL($item) ? 'dir="rtl"' : '' ?>>
diff --git a/templates/login.php b/templates/login.php
index f768844..869833b 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -28,7 +28,7 @@
                 <p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
             <?php endif ?>
 
-            <form method="post" action="?action=login" class="login-form">
+            <form method="post" action="?action=login" id="login-form">
 
                 <?= Helper\form_label(t('Username'), 'username') ?>
                 <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
diff --git a/templates/show_item.php b/templates/show_item.php
index 16ec28b..ca34769 100644
--- a/templates/show_item.php
+++ b/templates/show_item.php
@@ -31,9 +31,7 @@
         <?php endif ?>
 
         <h1 <?= Helper\isRTL($item + array('rtl' => $feed['rtl'])) ? 'dir="rtl"' : '' ?>>
-            <a href="<?= $item['url'] ?>" rel="noreferrer" target="_blank" id="original-<?= $item['id'] ?>">
-                <?= Helper\escape($item['title']) ?>
-            </a>
+            <a href="<?= $item['url'] ?>" rel="noreferrer" target="_blank" id="original-<?= $item['id'] ?>"><?= Helper\escape($item['title']) ?></a>
         </h1>
 
         <ul class="item-infos">
@@ -72,9 +70,7 @@
             <li>
                 <a
                     href="?action=mark-item-unread&amp;id=<?= $item['id'] ?>&amp;redirect=unread"
-                >
-                    <?= t('mark as unread') ?>
-                </a>
+                ><?= t('mark as unread') ?></a>
             </li>
             <li class="hide-mobile">
                 <span id="download-item"
@@ -82,9 +78,7 @@
                       data-failure-message="<?= t('unable to fetch content') ?>"
                       data-before-message="<?= t('in progress...') ?>"
                       data-after-message="<?= t('content downloaded') ?>">
-                    <a href="#" data-action="download-item">
-                        <?= t('download content') ?>
-                    </a>
+                    <a href="#" data-action="download-item"><?= t('download content') ?></a>
                 </span>
             </li>
         </ul>
diff --git a/templates/status_links.php b/templates/status_links.php
index 85cfb6c..d0ed27a 100644
--- a/templates/status_links.php
+++ b/templates/status_links.php
@@ -4,9 +4,7 @@
         data-action="mark-removed"
         data-item-id="<?= $item['id'] ?>"
         class="item-delete"
-    >
-        <?= t('remove') ?>
-    </a>
+    ><?= t('remove') ?></a>
 </li>
 <li>
 <?php if ($item['status'] == 'unread'): ?>
@@ -17,9 +15,7 @@
         data-action="mark-read"
         data-item-id="<?= $item['id'] ?>"
         data-reverse-label="<?= t('mark as unread') ?>"
-    >
-        <?= t('mark as read') ?>
-    </a>
+    ><?= t('mark as read') ?></a>
 <?php else: ?>
     <a
         id="status-<?= $item['id'] ?>"
@@ -27,8 +23,6 @@
         data-action="mark-unread"
         data-item-id="<?= $item['id'] ?>"
         data-reverse-label="<?= t('mark as read') ?>"
-    >
-        <?= t('mark as unread') ?>
-    </a>
+    ><?= t('mark as unread') ?></a>
 <?php endif ?>
 </li>
\ No newline at end of file