summaryrefslogtreecommitdiff
path: root/src/jwebmail/templates
diff options
context:
space:
mode:
Diffstat (limited to 'src/jwebmail/templates')
-rw-r--r--src/jwebmail/templates/_bot_nav.html61
-rw-r--r--src/jwebmail/templates/_folders.html17
-rw-r--r--src/jwebmail/templates/_top_nav.html36
3 files changed, 55 insertions, 59 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>
diff --git a/src/jwebmail/templates/_folders.html b/src/jwebmail/templates/_folders.html
index fd62ab2..e9509e7 100644
--- a/src/jwebmail/templates/_folders.html
+++ b/src/jwebmail/templates/_folders.html
@@ -5,7 +5,7 @@
<div class="navbar-brand">
<span class=navbar-item>
- <b>{{ folder }}</b>
+ <b>{{ folder or gettext('Home') }}</b>
</span>
<a role="button" class="navbar-burger" data-target="navMenu" id=navbar-toggle>
<span aria-hidden="true"></span>
@@ -26,16 +26,21 @@
</nav>
</div>
- <div class="column">
+ <nav class="column">
+ <a href="{{ url_for('logout') }}" class="button">{% trans %}Logout{% endtrans %}</a>
+ <a href="{{ url_for('write') }}" class="button">{% trans %}Write{% endtrans %}</a>
+ </nav>
+
+ <div class="column is-size-7">
<div class="columns is-multiline is-mobile">
<span class="column is-half-mobile has-text-centered">
{{ pgn.info }}
</span>
- <span class="column is-half-mobile has-text-centered">
- {% if total_new_mails %}
+ {% if total_new_mails %}
+ <span class="column is-half-mobile has-text-centered">
{% trans %}{{ total_new_mails }} new{% endtrans %}
- {% endif %}
- </span>
+ </span>
+ {% endif %}
<span class="column has-text-centered">
{% if total_size %}
{% trans %}mailbox size: {% endtrans %}
diff --git a/src/jwebmail/templates/_top_nav.html b/src/jwebmail/templates/_top_nav.html
index bc4afa5..960ae86 100644
--- a/src/jwebmail/templates/_top_nav.html
+++ b/src/jwebmail/templates/_top_nav.html
@@ -1,42 +1,28 @@
<div class="columns">
- <nav class="column">
- <a href="{{ url_for('logout') }}" class="button">{% trans %}Logout{% endtrans %}</a>
- <a href="{{ url_for('write') }}" class="button">{% trans %}Write{% endtrans %}</a>
- </nav>
-
<form class=column>
- <div class="field is-horizontal">
- <div class="field-label is-normal">
- <label for=search class=label>{% trans %}Search{% endtrans %}</label>
- </div>
- <div class=field-body>
- <div class=field>
- <div class=control>
- <input type=search id=search size=8 class=input />
- </div>
- </div>
+ <div class=field>
+ <div class=control>
+ <input type=search id=search size=8 class=input placeholder="{{ gettext('Search') }}" />
</div>
</div>
</form>
<form class=column>
- <div class="field is-horizontal">
- <div class="field-label is-normal">
- <label for=sort class=label>{% trans %}Sort{% endtrans %}</label>
- </div>
- <div class=field-body>
- <div class=field>
- <div class="select" id=sort-select>
+ <div class="field">
+ <div class=control>
+ <label for=sort class="label">
+ {% trans %}Sort{% endtrans %}
+ <div class="select ml-2" id=sort-select>
<select name=sort id=sort>
- <option value="!date">{% trans %}Date{% endtrans %} - {% trans %}Descending{% endtrans %}</option>
- <option value="date">{% trans %}Date{% endtrans %} - {% trans %}Ascending{% endtrans %}</option>
+ <option value="!date">{{ gettext('Date') }} - {{ gettext('Descending') }}</option>
+ <option value="date">{{ gettext('Date') }} - {{ gettext('Ascending') }}</option>
<option value="!size">{{ gettext('Size') }} - {{ gettext('Descending') }}</option>
<option value="!sender">{{ gettext('Sender') }} - {{ gettext('Descending') }}</option>
<option value="sender">{{ gettext('Sender') }} - {{ gettext('Ascending') }}</option>
</select>
</div>
- </div>
+ </label>
</div>
</div>
</form>