From 97bb9da8a661d65cc7eb17d899df0c0e36643bbe Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Wed, 9 Sep 2020 15:51:57 -0700
Subject: [PATCH] Use (+) (x) links on /tags page, link main tag object to
 info.

---
 frontends/etiquette_flask/templates/tags.html | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html
index ac38d24..ec03e8b 100644
--- a/frontends/etiquette_flask/templates/tags.html
+++ b/frontends/etiquette_flask/templates/tags.html
@@ -147,16 +147,17 @@ h2, h3
             <ul id="parent_list">
             {% for ancestor in specific_tag.get_parents() %}
             <li>
-                {{tag_object.tag_object(ancestor, innertext='(?)', link='info')}}
-                {{tag_object.tag_object(ancestor, innertext=ancestor.name, link=none, with_alt_description=True)}}
+                {{tag_object.tag_object(ancestor, link="search_musts", innertext="(+)")}}
+
+                {{tag_object.tag_object(ancestor, link="search_forbids", innertext="(x)")}}
+
+                {{tag_object.tag_object(ancestor, link="info", innertext=ancestor.name, with_alt_description=True)}}
             </li>
             {% endfor %}
             </ul>
         </div>
-        {% endif %}
-
-        {% else %}
-        {% endif %}
+        {% endif %} <!-- if parents -->
+        {% endif %} <!-- if specific tag -->
 
         {% if tags or not specific_tag %}
         <div id="hierarchy_tags">
@@ -167,10 +168,13 @@ h2, h3
             {% endif %}
             <ul id="tag_list">
             {% for (qualified_name, tag) in tags %}
-                {% if "." in qualified_name %}
                 <li>
-                    {{tag_object.tag_object(tag, link='info', innertext='(?)')}}
-                    {{tag_object.tag_object(tag, link='search', innertext=qualified_name, with_alt_description=True)-}}
+                    {{tag_object.tag_object(tag, link="search_musts", innertext="(+)")}}
+
+                    {{tag_object.tag_object(tag, link="search_forbids", innertext="(x)")}}
+
+                    {{tag_object.tag_object(tag, link="info", innertext=qualified_name, with_alt_description=True)}}
+                    {%- if "." in qualified_name -%}
                     <button
                     class="remove_tag_button red_button button_with_confirm"
                     data-onclick="return api.tags.remove_child('{{qualified_name.split('.')[-2]}}', '{{tag.name}}', tag_action_callback);"
@@ -181,11 +185,7 @@ h2, h3
                     >
                     Unlink
                     </button>
-                </li>
-                {% else %}
-                <li>
-                    {{tag_object.tag_object(tag, link='info', innertext='(?)')}}
-                    {{tag_object.tag_object(tag, link='search', innertext=qualified_name, with_alt_description=True)-}}
+                    {%- else -%}
                     <button
                     class="remove_tag_button red_button button_with_confirm"
                     data-onclick="return api.tags.delete('{{qualified_name}}', tag_action_callback);"
@@ -196,14 +196,17 @@ h2, h3
                     >
                     Delete
                     </button>
+                    {% endif %}
                 </li>
-                {% endif %}
 
                 {% if include_synonyms %}
                 {% for synonym in tag.get_synonyms() %}
                 <li>
-                    {{tag_object.tag_object(tag, link=none, innertext='syn')}}
-                    {{tag_object.tag_object(tag, link='search', innertext=qualified_name + '+' + synonym)-}}
+                    {{tag_object.tag_object(tag, link="search_musts", innertext="(+)")}}
+
+                    {{tag_object.tag_object(tag, link="search_forbids", innertext="(x)")}}
+
+                    {{tag_object.tag_object(tag, link='info', innertext=qualified_name + '+' + synonym)-}}
                     <button
                     class="remove_tag_button red_button button_with_confirm"
                     data-onclick="return api.tags.remove_synonym('{{tag.name}}', '{{synonym}}', tag_action_callback);"
@@ -219,8 +222,8 @@ h2, h3
                 {% endif %}
             {% endfor %}
             </ul>
-        </div>
-        {% endif %}
+        </div> <!-- hierarchy_tags -->
+        {% endif %} <!-- if tags or not specific tag -->
     </div>
 </div>
 </body>