From 9d31b24e8cb91d1ae5f90bc1818954ef4a893cf1 Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Sat, 4 Jul 2020 11:10:32 +0000
Subject: [PATCH] Fix nested a tags

---
 public/css/mango.css               |  2 +-
 src/views/components/card.html.ecr | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/css/mango.css b/public/css/mango.css
index 1cac92b..40d5637 100644
--- a/public/css/mango.css
+++ b/public/css/mango.css
@@ -27,7 +27,7 @@
 }
 
 .acard:hover {
-    text-decoration: none;
+    cursor: pointer;
 }
 
 .uk-list li {
diff --git a/src/views/components/card.html.ecr b/src/views/components/card.html.ecr
index 7875dc7..c00277c 100644
--- a/src/views/components/card.html.ecr
+++ b/src/views/components/card.html.ecr
@@ -14,7 +14,7 @@
     id="<%= item.id %>"
   <% end %>>
 
-  <a class="acard
+  <div class="acard
     <% if item.is_a? Entry %>
       <%= "is_entry" %>
     <% end %>
@@ -28,7 +28,7 @@
       data-book-id="<%= item.book.id %>"
       data-id="<%= item.id %>"
     <% else %>
-      href="<%= base_url %>book/<%= item.id %>" 
+      onclick="location='<%= base_url %>book/<%= item.id %>'" 
     <% end %>>
 
     <div class="uk-card uk-card-default">
@@ -45,22 +45,22 @@
           <% if page == "home" && item.is_a? Entry %>
             <%= "uk-margin-remove-bottom" %>
           <% end %>
-          " data-title="<%= item.display_name.gsub("\"", "&quot;") %>"><%= item.display_name %>
+          " data-title="<%= HTML.escape(item.display_name) %>"><%= item.display_name %>
         </h3>
         <% if page == "home" && item.is_a? Entry %>
-          <a class="uk-card-title break-word uk-margin-remove-top uk-text-meta uk-display-inline-block no-modal" data-title="<%= item.book.display_name.gsub("\"", "&quot;") %>" href="<%= base_url %>book/<%= item.book.id %>"><%= item.book.display_name %></a>
+          <a class="uk-card-title break-word uk-margin-remove-top uk-text-meta uk-display-inline-block no-modal" data-title="<%= HTML.escape(item.book.display_name) %>" href="<%= base_url %>book/<%= item.book.id %>"><%= HTML.escape(item.book.display_name) %></a>
         <% end %>
         <% if item.is_a? Entry %>
           <p class="uk-text-meta"><%= item.pages %> pages</p>
         <% end %>
         <% if item.is_a? Title %>
           <% if grouped_count == 1 %>
-            <p><%= item.size %> entries</p>
+            <p class="uk-text-meta"><%= item.size %> entries</p>
           <% else %>
-            <p><%= grouped_count %> new entries</p>
+            <p class="uk-text-meta"><%= grouped_count %> new entries</p>
           <% end %>
         <% end %>
       </div>
     </div>
-  </a>
+  </div>
 </div>