From e4a0bbf9d9c303a985ecaa83e4bda1b5431f937c Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 22 Sep 2020 16:48:56 -0400
Subject: [PATCH] =?UTF-8?q?remove=20show=20more=20tags=20in=20favor=20of?=
 =?UTF-8?q?=20add=20tags=20now=20that=20both=20buttons=20do=20t=E2=80=A6?=
 =?UTF-8?q?=20(#8400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove show more tags in favor of add tags now that both buttons do the same thing

follow-up to #8386

* tooltip

* Update _tagging.html.erb

* Update post_test.rb

* Update post_test.rb

* Update _tagging.html.erb

* try classname instead of id

* switch to a#tags-open

* re-show tags input on profile pages
---
 app/views/tag/_tagging.html.erb | 15 ++++++++-------
 app/views/tag/_tags.html.erb    | 15 ---------------
 test/system/post_test.rb        |  4 +++-
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/app/views/tag/_tagging.html.erb b/app/views/tag/_tagging.html.erb
index 2696043023..0763f69272 100644
--- a/app/views/tag/_tagging.html.erb
+++ b/app/views/tag/_tagging.html.erb
@@ -21,7 +21,7 @@
 
 <script>
 $(function () {
-  $('#tags [data-toggle="tooltip"]').tooltip()
+  $('#tags [data-toggle="tooltip"]').tooltip();
 
   var pops = $("[data-toggle=popover]");
   $(".label").on("click", function(e){
@@ -46,14 +46,15 @@ $(function () {
 <% parent ||= nil %>
 
 <% if current_user && (parent != :profile || (current_user.id == user.id || logged_in_as(['admin']))) %>
+  <a data-toggle="tooltip" title="Add tags/View all" aria-label="Add tags/View all" id="tags-open" class="btn btn-circle btn-circle-sm tags-open" style="float:left;">
+    <i class="fa fa-plus" style="color:#808080;"></i>
+  </a>
 
-<a aria-label="Add tags" id="tags-open" class="btn btn-circle btn-circle-sm" style="float:left;"><i class="fa fa-plus" style="color:#808080;"></i></a>
-<% if @node && @node.tags.count == 0 %>
-  <span style="float:left;color:#666;margin-top:14px;margin-left:5px;">Add tags</a>
-<% end %>
-
-<%= render partial: 'tag/form', locals: { node: @node ||= nil, user: user ||= nil, url: url ||= nil } %>
+  <% if @node && @node.tags.count == 0 %>
+    <span style="float:left;color:#666;margin-top:14px;margin-left:5px;">Add tags</span>
+  <% end %>
 
+  <%= render partial: 'tag/form', locals: { node: @node ||= nil, user: user ||= nil, url: url ||= nil } %>
 <% end %>
 
 <script>
diff --git a/app/views/tag/_tags.html.erb b/app/views/tag/_tags.html.erb
index a3e7a9d8c9..4a6d451276 100644
--- a/app/views/tag/_tags.html.erb
+++ b/app/views/tag/_tags.html.erb
@@ -1,8 +1,5 @@
 <% user = user || @user # allow overriding w/ local variable %>
 <div class="tags-list">
-<% if tags.length > 0 && power_tag %>
-  <a aria-label="Show more tags" class="btn btn-circle btn-circle-sm show-more-tags" href="javascript:void(0);" style="float:left;"><i class="fa fa-ellipsis-h" style="color:#808080;"></i></a>
-<% end %>
 <% tags.each_with_index do |tag, i| %>
   <% if tag.class == NodeTag %>
 
@@ -27,18 +24,6 @@
 
     <% end %>
 
-    <script>
-      (function() {
-        $('.show-more-tags').click(function showMoreTags() {
-          $('.more-tags').show();
-          $('.show-more-tags').hide();
-          $("#tagform").show();
-          $("#tags-open").hide();
-          $(".tag-input").focus();
-        });
-      })();
-    </script>
-
   <% elsif tag.class == UserTag && (tag.name[0..4] != "oauth" || (logged_in_as(['admin', 'moderator']) || (current_user && current_user.uid == tag.uid))) %>
 
     <li style="width: 100%;">
diff --git a/test/system/post_test.rb b/test/system/post_test.rb
index bc0e4605a6..f51ad8056a 100644
--- a/test/system/post_test.rb
+++ b/test/system/post_test.rb
@@ -201,7 +201,9 @@ def assert_page_does_not_reload(message = "page should not reload")
 
     # Wait for the location to be added
     wait_for_ajax
-    find('.tags-list a.show-more-tags').click()
+
+    # there should also be a page reload now, because we want to reload to see the sidebar mini-map
+    find('a#tags-open').click()
 
     # Make sure proper latitude and longitude tags are added
     assert_selector('.tags-list .badge a[href="/tag/lat:22"]', text: "lat:22")