remove some labels in templates and update flask-paginate

1 files changed, 33 insertions, 28 deletions

diff --git a/src/jwebmail/templates/_bot_nav.html b/src/jwebmail/templates/_bot_nav.html
index e54fd4c..e2be5f5 100644
--- a/src/jwebmail/templates/_bot_nav.html
+++ b/src/jwebmail/templates/_bot_nav.html
@@ -5,44 +5,49 @@
   </div>
 
   <div class="column">
-    <form href="{{ url_for('move', folder=folder) }}" id='move-mail'>
-      <div class="field is-horizontal">
-        <div class="field-label is-normal">
-          <label for="select-folder" class="label">{% trans %}Move to{% endtrans %}</label>
-        </div>
-        <div class=field-body>
-          <div class="field is-grouped">
-            <div class=control>
-              <div class=select>
-                <select name=select-folder>
-                  {% for f in mail_folders if f is ne folder %}
-                    <option type=select name="folder" value="{{ f }}">{{ f or gettext('Home') }}</option>
-                  {% endfor %}
-                </select>
-              </div>
-            </div>
-            {# csrf_field #}
-            <div class=control>
-              <input type=submit class=button value="{{ gettext('Move') }}">
+
+    {% if mail_folders|length > 1 %}
+      <form href="{{ url_for('move', folder=folder) }}" id='move-mail' class=is-pulled-left>
+        {{ form.csrf_token }}
+        <div class="field has-addons">
+          <div class=control>
+            <div class=select>
+              <select name=select-folder>
+                {% for f in mail_folders if f is ne folder %}
+                  <option type=select name="folder" value="{{ f }}">
+                    {{ f or gettext('Home') }}
+                  </option>
+                {% endfor %}
+              </select>
             </div>
           </div>
+          <div class=control>
+            <input type=submit class=button value="{{ gettext('Move') }}">
+          </div>
         </div>
-      </div>
-    </form>
-  </div>
+      </form>
+    {% endif %}
+
+    <form href="{{ url_for('move', folder=folder) }}" id="remove-mail"
+      method=POST class="is-pulled-left ml-2">
 
-  <div class=column>
-    <form href="{{ url_for('move', folder=folder) }}" id="remove-mail" method=POST>
-      {# csrf_field #}
+      {{ from.csrf_token }}
       <div class=control>
         <input id=remove type=submit class=button value="{{ gettext('Remove') }}">
       </div>
     </form>
+
   </div>
 
-  <div class="column has-text-right">
-    <label for=allbox>{% trans %}check all{% endtrans %}</label>
-    <input name=allbox type=checkbox id=check-all>
+  <div class="column is-2 mr-2 has-text-right">
+    <div class="field">
+      <div class="control">
+        <label class=checkbox for=allbox>
+          {% trans %}check all{% endtrans %}
+          <input name=allbox type=checkbox id=check-all>
+        </label>
+      </div>
+    </div>
   </div>
 
 </div>