From 17a1796b53088150fc8a482ad1f34fc68a688ce4 Mon Sep 17 00:00:00 2001
From: q <q@moonq.org>
Date: Mon, 4 Jul 2016 19:56:47 +0300
Subject: [PATCH] move action items to dropdown

---
 static/script.js         |  4 ++--
 static/style.css         |  2 +-
 templates/layout.html    | 21 ++++++++++++++++-----
 templates/show_shop.html | 16 ++++++++--------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/static/script.js b/static/script.js
index b8115bc..bcd8059 100644
--- a/static/script.js
+++ b/static/script.js
@@ -28,8 +28,8 @@ function hidetoggle(name) {
         }}
     }
 }
-function dropDown() {
-    document.getElementById("Dropdown").classList.toggle("show");
+function dropDown(name) {
+    document.getElementById(name).classList.toggle("show");
 }
 
 // Close the dropdown menu if the user clicks outside of it
diff --git a/static/style.css b/static/style.css
index 8dc7cdb..a50375a 100644
--- a/static/style.css
+++ b/static/style.css
@@ -22,7 +22,7 @@ td              { height: 1.75em; }
                   border: 1px solid #aacbe2; }
 .error          { background: #f0d6d6; padding: 0.5em; }
 .hidden         { display: none; }
-.pointer        { cursor: pointer; }
+.pointer        { cursor: pointer; text-decoration: underline; }
 
 /* dropdown */
 
diff --git a/templates/layout.html b/templates/layout.html
index e6a42f1..bd15a0c 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -16,13 +16,24 @@
   <div class=metanav>
     <a href="{{ url_for('list_shops') }}" id="shopsList">Shops</a>
     <div class="dropdown">
-      <p onclick="dropDown()" class="dropbtn">&sube;&supe;</p>
-      <div id="Dropdown" class="dropdown-content">
-            <a href="#" onclick="reload();">Reload &#x21bb;</a>
-            <a href="{{ url_for('profile') }}">Profile &#9786;</a>
-            <a href="{{ url_for('logout') }}">Logout &#10162;</a>
+      <p onclick="dropDown('userAct')" class="dropbtn">&sube;&supe;</p>
+      <div id="userAct" class="dropdown-content">
+            <a href="#" onclick="reload();">&#x21bb; Reload</a>
+            <a href="{{ url_for('profile') }}">&#9786; Profile</a>
+            <a href="{{ url_for('logout') }}">&#10162; Logout</a>
       </div>
     </div>
+    {% if shop %}
+    <div class="dropdown">
+      <p onclick="dropDown('shopAct')" class="dropbtn">&#x2699;&#x2692;</p>
+      <div id="shopAct" class="dropdown-content">
+        <a id="h2_edit" onclick="hidetoggle('disp_edit');growTextarea('edit_md');" class=pointer>&#x270e;&nbsp;Edit&nbsp;items</a>
+        <a id="h2_share" onclick="hidetoggle('disp_share')" class=pointer>&#9786;&nbsp;Share&nbsp;shop</a>
+        <a id="h2_restore" onclick="hidetoggle('disp_restore')" class=pointer>&#9851;&nbsp;Restore&nbsp;backup</a>
+        <a id="h2_delete" onclick="hidetoggle('disp_delete')" class=pointer>&otimes;&nbsp;Delete&nbsp;shop</a>
+      </div>
+    </div>
+    {% endif %}
   </div>
   {% for message in get_flashed_messages() %}
     <div class=flash>{{ message }}</div>
diff --git a/templates/show_shop.html b/templates/show_shop.html
index 0021620..0a1150e 100644
--- a/templates/show_shop.html
+++ b/templates/show_shop.html
@@ -11,26 +11,27 @@
      </form>
   </div>
 
-  <h2 id="h2_add" onclick="hidetoggle('disp_add')" class=pointer>Add items:</h2>
+  <h2 id="h2_add" onclick="hidetoggle('disp_add')" class=pointer>Add items</h2>
   <form id="disp_add" name="area_add" action="{{ url_for('add_items') }}" method=post class=add-entry>
       <dl>
         <dt><textarea cols=40 rows=1 id=add_md name=add_md onkeyup="growTextarea('add_md')"></textarea><br><input type=hidden name=shopid value={{ shopid }}><input class=submit type=submit value=Add>
       </dl>
   </form>
-  <h2 id="h2_remove_toggled" onclick="hidetoggle('disp_remove_toggled')" class=pointer>Remove ticked:</h2>
-  <form id=disp_remove_toggled class=hidden action="{{ url_for('remove_toggled') }}" method=post class=add-entry>
+  <h2 id="h2_remove_toggled" onclick="hidetoggle('disp_remove_toggled')" class=pointer>Remove ticked</h2>
+  <form id=disp_remove_toggled action="{{ url_for('remove_toggled') }}" method=post class=add-entry>
       <dl><input type=hidden name=shopid value={{ shopid }}><input class=submit type=submit value=Remove>
       </dl></form>
-  <h2 id="h2_edit" onclick="hidetoggle('disp_edit');growTextarea('edit_md');" class=pointer>Edit items:</h2>
+  <hr>
+  
   <form id="disp_edit" class=hidden name="area_edit" action="{{ url_for('edit_md') }}" method=post class=add-entry>
-      <dl>
+      <dl>Edit content file:
         <dt><textarea cols=40 rows=5 id=edit_md name=edit_md onkeyup="growTextarea('edit_md')">{{ content }}</textarea><br>
         <input type=hidden name=shopid value={{ shopid }}><input class=submit type=submit value=Save onclick="return confirm('Do you really want to replace content?');" >
       </dl>
   </form>
-  <h2 id="h2_share" onclick="hidetoggle('disp_share')" class=pointer>Share shop:</h2>
   <div class=hidden id=disp_share>
   <form action="{{ url_for('remove_share') }}" method=post class=toggle-item>
+    <dl>Share the shop with other users:</dl>
       <input type=hidden name=shopid value="{{ shopid }}" >
     <ul>
         {% for user in shares %}
@@ -44,13 +45,12 @@
       </dl>
   </form>
   </div>
-  <h2 id="h2_restore" onclick="hidetoggle('disp_restore')" class=pointer>Restore backup:</h2>
   <form id="disp_restore" class=hidden action="{{ url_for('restore_md') }}" method=post class=add-entry>
     <dl>Shop state is backed up with "Edit items" and "Remove ticked" actions.</dl>
     <dl><input type=hidden name=shopid value={{ shopid }}><input class=submit type=submit value=Restore onclick="return confirm('Do you really want to restore previous version?');">
   </dl></form>
-  <h2 id="h2_delete" onclick="hidetoggle('disp_delete')" class=pointer>Delete shop:</h2>
   <form id="disp_delete" class=hidden action="{{ url_for('remove_shop') }}" method=post class=add-entry>
+      <dl>Delete shop permanently. Can not be restored.</dl>
     <dl><input type=hidden name=shopid value={{ shopid }}><input class=submit type=submit value=Remove onclick="return confirm('Do you really want to remove shop {{ shop }}?');">
   </dl></form>