From a567f51e6b37b489e1f4a76329a1de2975d21944 Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Mon, 26 May 2025 16:23:38 +0200
Subject: [PATCH] Store diary icons separately

---
 app/assets/images/diary/comment.svg               |  3 +++
 app/assets/images/diary/date.svg                  |  4 ++++
 app/assets/images/diary/entry.svg                 |  4 ++++
 app/assets/images/diary/new.svg                   |  3 +++
 app/views/diary_entries/_navigation.html.erb      |  4 +---
 app/views/diary_entries/_profile_diaries.html.erb | 10 ++++------
 test/controllers/users_controller_test.rb         | 12 ++++++------
 7 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 app/assets/images/diary/comment.svg
 create mode 100644 app/assets/images/diary/date.svg
 create mode 100644 app/assets/images/diary/entry.svg
 create mode 100644 app/assets/images/diary/new.svg

diff --git a/app/assets/images/diary/comment.svg b/app/assets/images/diary/comment.svg
new file mode 100644
index 000000000..53c65fc49
--- /dev/null
+++ b/app/assets/images/diary/comment.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24">
+  <path d="M7.9 20A9 9 0 1 0 4 16.1L2 22Z"/>
+</svg>
diff --git a/app/assets/images/diary/date.svg b/app/assets/images/diary/date.svg
new file mode 100644
index 000000000..dc9d5d0f6
--- /dev/null
+++ b/app/assets/images/diary/date.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24">
+  <rect width="18" height="18" x="3" y="4" rx="2"/>
+  <path d="M8 2v4m8-4v4M3 10h18"/>
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/diary/entry.svg b/app/assets/images/diary/entry.svg
new file mode 100644
index 000000000..4aff8dbd2
--- /dev/null
+++ b/app/assets/images/diary/entry.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" aria-label="Diary Entry">
+  <rect width="16" height="20" x="4" y="2" rx="2"/>
+  <path d="M2 6h4m-4 4h4m-4 4h4m-4 4h4M9.5 8h5m-5 4H16m-6.5 4H14"/>
+</svg>
diff --git a/app/assets/images/diary/new.svg b/app/assets/images/diary/new.svg
new file mode 100644
index 000000000..ad13175d7
--- /dev/null
+++ b/app/assets/images/diary/new.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12a2 2 0 0 0-2-2zM4 7h3v-3h2v3h3v2h-3v3h-2v-3h-3z" fill="currentColor" />
+</svg>
diff --git a/app/views/diary_entries/_navigation.html.erb b/app/views/diary_entries/_navigation.html.erb
index 01f37f27c..b7cbc329b 100644
--- a/app/views/diary_entries/_navigation.html.erb
+++ b/app/views/diary_entries/_navigation.html.erb
@@ -15,9 +15,7 @@
     <% if @user && @user == current_user || !@user && current_user %>
       <li>
         <%= link_to new_diary_entry_path, :class => "icon-link", :title => t(".new_title") do %>
-          <svg width="16" height="16">
-            <path d="M2 0 a2 2 0 0 0 -2 2 v12 a2 2 0 0 0 2 2 h12 a2 2 0 0 0 2 -2 v-12 a2 2 0 0 0 -2 -2 z M4 7 h3 v-3 h2 v3 h3 v2 h-3 v3 h-2 v-3 h-3 z" fill="currentColor" />
-          </svg>
+          <%= inline_svg_tag "diary/new.svg" %>
           <%= t(".new") %>
         <% end %>
       </li>
diff --git a/app/views/diary_entries/_profile_diaries.html.erb b/app/views/diary_entries/_profile_diaries.html.erb
index 43359e43d..562a906b3 100644
--- a/app/views/diary_entries/_profile_diaries.html.erb
+++ b/app/views/diary_entries/_profile_diaries.html.erb
@@ -6,20 +6,18 @@
         <div class="card h-100">
           <div class="card-body d-flex flex-column">
             <p class="card-title">
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-label="<%= t(".title_label") %>"><path d="M2 6h4" /><path d="M2 10h4" /><path d="M2 14h4" /><path d="M2 18h4" /><rect width="16" height="20" x="4" y="2" rx="2" /><path d="M9.5 8h5" /><path d="M9.5 12H16" /><path d="M9.5 16H14" /></svg>
+              <%= inline_svg_tag "diary/entry.svg", :title => t(".title_label") %>
               <%= link_to entry.title, diary_entry_path(@user, entry) %>
             </p>
             <p class="card-text flex-grow-1"><%= truncate(strip_tags(entry.body.to_html), :length => 150) %></p>
 
             <div class="card-text d-flex justify-content-between align-items-center mt-auto">
               <small class="text-body-secondary d-flex align-items-center">
-                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="me-1" aria-label="<%= t(".comments_label") %>"><path d="M7.9 20A9 9 0 1 0 4 16.1L2 22Z" /></svg>
-                <%= link_to diary_entry_path(@user, entry, :anchor => "comments"), :class => "text-body-secondary" do %>
-                  <span><%= t(".comments", :count => entry.comments.size) %></span>
-                <% end %>
+                <%= inline_svg_tag "diary/comment.svg", :class => "me-1", :title => t(".comments_label") %>
+                <%= link_to t(".comments", :count => entry.comments.size), diary_entry_path(@user, entry, :anchor => "comments"), :class => "text-body-secondary" %>
               </small>
               <small class="text-body-secondary d-flex align-items-center">
-                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="me-1" aria-label="<%= t(".date_label") %>"><path d="M8 2v4" /><path d="M16 2v4" /><rect width="18" height="18" x="3" y="4" rx="2" /><path d="M3 10h18" /></svg>
+                <%= inline_svg_tag "diary/date.svg", :class => "me-1", :title => t(".date_label") %>
                 <span><%= l(entry.created_at.to_date, :format => :long) %></span>
               </small>
             </div>
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d0ad6c848..e663cf438 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -344,11 +344,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # Should only show the 4 most recent entries
     assert_select ".profile-diary-card", 4
-    assert_select ".card-title", "Fifth Entry"
-    assert_select ".card-title", "Fourth Entry"
-    assert_select ".card-title", "Third Entry"
-    assert_select ".card-title", "Second Entry"
-    assert_select ".card-title", { :text => "First Entry", :count => 0 }
+    assert_select ".card-title a", "Fifth Entry"
+    assert_select ".card-title a", "Fourth Entry"
+    assert_select ".card-title a", "Third Entry"
+    assert_select ".card-title a", "Second Entry"
+    assert_select ".card-title a", { :text => "First Entry", :count => 0 }
   end
 
   def test_show_profile_diaries_with_comments
@@ -362,7 +362,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     assert_select ".profile-diary-card" do
-      assert_select ".card-title", "Entry with Comments"
+      assert_select ".card-title a", "Entry with Comments"
       assert_select "small.text-body-secondary", /2 comments/
     end
   end
-- 
2.39.5