Re-order the top bar layout

Move actions in a way that make more sense after some usage of this
application.

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>

5 files changed, 11 insertions, 12 deletions

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8a46e3f..39661ec 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -43,25 +43,26 @@
 
         <div id="hidden-nav" class="hidden">
           <div class="flex-wrap">
-            <span><%= I18n.t('general.create').capitalize %>: </span>
-            <%= link_to I18n.t('searches.object'), new_search_path %>
-            <%= link_to I18n.t('things.object'), new_thing_path %>
+            <span><%= I18n.t('things.object').capitalize %>: </span>
+            <%= link_to I18n.t('tags.new-action'), new_thing_path, id: 'new-thing' %>
           </div>
 
           <div class="flex-wrap">
             <span><%= I18n.t('searches.title') %>: </span>
+            <%= link_to I18n.t('tags.new-action'), new_search_path, id: 'new-search' %>
             <% if @search&.id %>
               <%= link_to I18n.t('general.edit'), edit_search_path(@search) %>
               <%= link_to I18n.t('general.delete'), search_path(@search), data: { turbo_confirm: I18n.t('general.sure'), turbo_method: :delete } %>
             <% end %>
 
             <%= link_to I18n.t('searches.export.action'), new_search_exports_path(current_user.last_search_id ? current_user.last_search_id : '0') %>
+            <%= link_to I18n.t('searches.shared.title').downcase, shared_searches_path %>
           </div>
 
           <div class="flex-wrap">
-            <span><%= I18n.t('general.list').capitalize %>: </span>
-            <%= link_to I18n.t('tags.title').downcase, tags_path %>
-            <%= link_to I18n.t('searches.shared.title').downcase, shared_searches_path %>
+            <span><%= I18n.t('tags.title-singular').capitalize %>: </span>
+            <%= link_to I18n.t('tags.new-action').downcase, new_tag_path %>
+            <%= link_to I18n.t('general.list').downcase, tags_path %>
           </div>
         </div>
       </header>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5e02e46..4ebcd79 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -110,6 +110,7 @@ ca:
 
   tags:
     title: Etiquetes
+    title-singular: Etiqueta
     new: Etiqueta nova
     new-action: nova
     update: Reanomena l'etiqueta
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8f38690..c4fb38e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -110,6 +110,7 @@ en:
 
   tags:
     title: Tags
+    title-singular: Etiqueta
     new: New tag
     update: Rename tag
     new-action: new
diff --git a/test/system/searches_test.rb b/test/system/searches_test.rb
index 4920102..f1f2de4 100644
--- a/test/system/searches_test.rb
+++ b/test/system/searches_test.rb
@@ -22,9 +22,7 @@ class SearchesTest < ApplicationSystemTestCase
   test 'the hidden menu should allow us to go into the searches#new url' do
     find('#toggle-hidden-global-menu').click
 
-    assert_text I18n.t('searches.title')
-
-    click_on I18n.t('searches.object')
+    find('#new-search').click
 
     assert find('#search_body')
     assert_equal page.current_path, new_search_path
diff --git a/test/system/things_test.rb b/test/system/things_test.rb
index bb9d4ef..a67c0b1 100644
--- a/test/system/things_test.rb
+++ b/test/system/things_test.rb
@@ -8,9 +8,7 @@ class ThingsTest < ApplicationSystemTestCase
   test 'the hidden menu has a things#new link' do
     find('#toggle-hidden-global-menu').click
 
-    assert_text I18n.t('things.object').downcase
-
-    click_on I18n.t('things.object').downcase
+    find('#new-thing').click
 
     assert_text I18n.t('activerecord.attributes.thing.title')