lub
/
mailu
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Update the ui macros and polish the overall UI

Browse Source
master
kaiyou 7 years ago
parent eb40ea830f
commit 924760273c
29 changed files with 347 additions and 317 deletions
Show Stats Download Patch File Download Diff File

4
admin/mailu/ui/templates/admin/create.html
Unescape Escape View File

@ -4,7 +4,8 @@
{% trans %}Add a global administrator{% endtrans %}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.admin, id='admin') }}
@ -13,4 +14,5 @@
$("#admin").select2();
</script>
</form>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/admin/list.html
Unescape Escape View File

@ -10,9 +10,8 @@
</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Email{% endtrans %}</th>
@ -25,6 +24,5 @@
<td>{{ admin }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

4
admin/mailu/ui/templates/alias/create.html
Unescape Escape View File

@ -8,7 +8,8 @@
{{ domain }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
@ -23,4 +24,5 @@
})
</script>
</form>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/alias/list.html
Unescape Escape View File

@ -12,9 +12,8 @@
<a class="btn btn-primary" href="{{ url_for('.alias_create', domain_name=domain.name) }}">{% trans %}Add alias{% endtrans %}</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Email{% endtrans %}</th>
@ -36,6 +35,5 @@
<td>{{ alias.updated_at or '' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/alternative/list.html
Unescape Escape View File

@ -12,9 +12,8 @@
<a class="btn btn-primary" href="{{ url_for('.alternative_create', domain_name=domain.name) }}">{% trans %}Add alternative{% endtrans %}</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Name{% endtrans %}</th>
@ -29,6 +28,5 @@
<td>{{ alternative.created_at }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

4
admin/mailu/ui/templates/announcement.html
Unescape Escape View File

@ -8,11 +8,13 @@
{% trans %}from{% endtrans %} {{ from_address }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.announcement_subject) }}
{{ macros.form_field(form.announcement_body, rows=10) }}
{{ macros.form_field(form.submit) }}
</form>
{% endcall %}
{% endblock %}

17
admin/mailu/ui/templates/base.html
Unescape Escape View File

@ -53,22 +53,7 @@ class="hold-transition skin-blue sidebar-mini"
<section class="content">
{{ utils.flashed_messages(container=False) }}
{% block content %}
<div class="row">
<div class="col-lg-12">
<div class="box">
{% block box %}
<div class="box-header">
{% block box_title %}{% endblock %}
</div>
<div class="box-body">
{% block box_content %}{% endblock %}
</div>
{% endblock %}
</div>
</div>
</div>
{% endblock %}
{% block content %}{% endblock %}
</section>
</div>
<footer class="main-footer">

4
admin/mailu/ui/templates/confirm.html
Unescape Escape View File

@ -8,7 +8,9 @@
{{ action }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box(theme="warning") %}
<p>{% trans action %}You are about to {{ action }}. Please confirm your action.{% endtrans %}</p>
{{ macros.form(form) }}
{% endcall %}
{% endblock %}

2
admin/mailu/ui/templates/docker-error.html
Unescape Escape View File

@ -8,7 +8,7 @@
{{ action }}
{% endblock %}
{% block box_content %}
{% block content %}
<p>{% trans action %}An error occurred while talking to the Docker server.{% endtrans %}</p>
<pre>{{ error }}</pre>
{% endblock %}

4
admin/mailu/ui/templates/domain/create.html
Unescape Escape View File

@ -4,7 +4,8 @@
{% trans %}New domain{% endtrans %}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.name) }}
@ -15,4 +16,5 @@
{{ macros.form_field(form.comment) }}
{{ macros.form_field(form.submit) }}
</form>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/domain/details.html
Unescape Escape View File

@ -14,10 +14,9 @@
{% endif %}
{% endblock %}
{% block box %}
{% block content %}
{% call macros.table() %}
{% set hostname = config["HOSTNAMES"].split(",")[0] %}
<table class="table table-bordered">
<tbody>
<tr>
<th>{% trans %}Domain name{% endtrans %}</th>
<td>{{ domain.name }}</td>
@ -46,6 +45,5 @@
<td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject;{% if config["DMARC_RUA"] %} rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }};{% endif %}{% if config["DMARC_RUF"] %} ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }};{% endif %} adkim=s; aspf=s"</pre></td>
</tr>
{% endif %}
</tbody>
</table>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/domain/list.html
Unescape Escape View File

@ -10,9 +10,8 @@
{% endif %}
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Manage{% endtrans %}</th>
@ -48,6 +47,5 @@
<td>{{ domain.updated_at or '' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

20
admin/mailu/ui/templates/fetch/create.html
Unescape Escape View File

@ -1,4 +1,4 @@
{% extends "form.html" %}
{% extends "base.html" %}
{% block title %}
{% trans %}Add a fetched account{% endtrans %}
@ -7,3 +7,21 @@
{% block subtitle %}
{{ user }}
{% endblock %}
{% block content %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{% call macros.box(title="Remote server") %}
{{ macros.form_field(form.protocol) }}
{{ macros.form_fields((form.host, form.port)) }}
{{ macros.form_field(form.tls) }}
{% endcall %}
{% call macros.box(title="Authentication") %}
{{ macros.form_field(form.username) }}
{{ macros.form_field(form.password) }}
{% endcall %}
{{ macros.form_field(form.submit) }}
</form>
{% endblock %}

2
admin/mailu/ui/templates/fetch/edit.html
Unescape Escape View File

@ -1,4 +1,4 @@
{% extends "form.html" %}
{% extends "fetch/create.html" %}
{% block title %}
{% trans %}Update a fetched account{% endtrans %}

8
admin/mailu/ui/templates/fetch/list.html
Unescape Escape View File

@ -12,9 +12,8 @@
<a class="btn btn-primary" href="{{ url_for('.fetch_create', user_email=user.email) }}">{% trans %}Add an account{% endtrans %}</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Endpoint{% endtrans %}</th>
@ -40,6 +39,5 @@
<td>{{ fetch.updated_at or '' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

4
admin/mailu/ui/templates/form.html
Unescape Escape View File

@ -1,5 +1,7 @@
{% extends "base.html" %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
{{ macros.form(form) }}
{% endcall %}
{% endblock %}

13
admin/mailu/ui/templates/helpers.html
Unescape Escape View File

@ -1,13 +0,0 @@
{% macro render_field(field, label_visible=true) -%}
<div class="form-group {% if field.errors %}has-error{% endif %} {{ kwargs.pop('class_', '') }}">
{% if field.type != 'HiddenField' and label_visible %}
<label for="{{ field.id }}" class="control-label">{{ field.label }}</label>
{% endif %}
{{ field(class_='form-control', **kwargs) }}
{% if field.errors %}
{% for e in field.errors %}
<p class="help-block">{{ e }}</p>
{% endfor %}
{% endif %}
</div>
{%- endmacro %}

5
admin/mailu/ui/templates/index.html
Unescape Escape View File

@ -1,5 +0,0 @@
{% extends "general.html" %}
{% block content %}
Test
{% endblock %}

4
admin/mailu/ui/templates/login.html
Unescape Escape View File

@ -21,6 +21,8 @@
{% trans %}to access the administration tools{% endtrans %}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
{{ macros.form(form) }}
{% endcall %}
{% endblock %}

33
admin/mailu/ui/templates/macros.html
Unescape Escape View File

@ -63,3 +63,36 @@
{% endfor %}
</form>
{% endmacro %}
{% macro box(title=None, theme="primary", header=True) %}
<div class="row">
<div class="col-lg-12">
<div class="box box-{{ theme }}">
{% if header %}
<div class="box-header">
{% if title %}
<h3 class="box-title">{{ title }}</h3>
{% endif %}
</div>
{% endif %}
<div class="box-body">
{{ caller() }}
</div>
</div>
</div>
</div>
{% endmacro %}
{% macro table(theme="primary") %}
<div class="row">
<div class="col-lg-12">
<div class="box box-{{ theme }}">
<table class="table table-bordered">
<tbody>
{{ caller() }}
</tbody>
</table>
</div>
</div>
</div>
{% endmacro %}

4
admin/mailu/ui/templates/manager/create.html
Unescape Escape View File

@ -8,7 +8,8 @@
{{ domain }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.manager, id='manager') }}
@ -17,4 +18,5 @@
$("#manager").select2();
</script>
</form>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/manager/list.html
Unescape Escape View File

@ -12,9 +12,8 @@
<a class="btn btn-primary" href="{{ url_for('.manager_create', domain_name=domain.name) }}">{% trans %}Add manager{% endtrans %}</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Email{% endtrans %}</th>
@ -27,6 +26,5 @@
<td>{{ manager }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/relay/list.html
Unescape Escape View File

@ -10,9 +10,8 @@
{% endif %}
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Domain name{% endtrans %}</th>
@ -34,6 +33,5 @@
<td>{{ relay.updated_at or '' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/services.html
Unescape Escape View File

@ -4,9 +4,8 @@
{% trans %}Services status{% endtrans %}
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call table() %}
<tr>
<th>{% trans %}Service{% endtrans %}</th>
<th>{% trans %}Status{% endtrans %}</th>
@ -25,6 +24,5 @@
<td>{{ container['Image']['Created'] }}
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

11
admin/mailu/ui/templates/user/create.html
Unescape Escape View File

@ -8,17 +8,24 @@
{{ domain.name }}
{% endblock %}
{% block box_content %}
{% block content %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{% call macros.box("General") %}
{{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
{{ macros.form_fields((form.pw, form.pw2)) }}
{{ macros.form_field(form.comment) }}
{% endcall %}
{% call macros.box("Features and quotas", theme="success") %}
{{ macros.form_field(form.quota_bytes, step=1000000000, max=(max_quota_bytes or domain.max_quota_bytes or 50000000000),
prepend='<span class="input-group-addon"><span id="quota">'+(form.quota_bytes.data//1000000000).__str__()+'</span> GiB</span>',
oninput='$("#quota").text(this.value/1000000000);') }}
{{ macros.form_field(form.enable_imap) }}
{{ macros.form_field(form.enable_pop) }}
{{ macros.form_field(form.comment) }}
{% endcall %}
{{ macros.form_field(form.submit) }}
</form>
{% endblock %}

4
admin/mailu/ui/templates/user/forward.html
Unescape Escape View File

@ -8,7 +8,8 @@
{{ user }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.forward_enabled,
@ -20,4 +21,5 @@
**{("enabled" if user.forward_enabled else "disabled"): ""}) }}
{{ macros.form_field(form.submit) }}
</form>
{% endcall %}
{% endblock %}

8
admin/mailu/ui/templates/user/list.html
Unescape Escape View File

@ -12,9 +12,8 @@
<a class="btn btn-primary" href="{{ url_for('.user_create', domain_name=domain.name) }}">{% trans %}Add user{% endtrans %}</a>
{% endblock %}
{% block box %}
<table class="table table-bordered">
<tbody>
{% block content %}
{% call macros.table() %}
<tr>
<th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}User settings{% endtrans %}</th>
@ -48,6 +47,5 @@
<td>{{ user.updated_at or '' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endcall %}
{% endblock %}

4
admin/mailu/ui/templates/user/reply.html
Unescape Escape View File

@ -8,7 +8,8 @@
{{ user }}
{% endblock %}
{% block box_content %}
{% block content %}
{% call macros.box() %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{{ macros.form_field(form.reply_enabled,
@ -20,4 +21,5 @@
**{("rw" if user.reply_enabled else "readonly"): ""}) }}
{{ macros.form_field(form.submit) }}
</form>
{% endcall %}
{% endblock %}

7
admin/mailu/ui/templates/user/settings.html
Unescape Escape View File

@ -8,14 +8,19 @@
{{ user }}
{% endblock %}
{% block box_content %}
{% block content %}
<form class="form" method="post" role="form">
{{ form.hidden_tag() }}
{% call macros.box(title="General settings") %}
{{ macros.form_field(form.displayed_name) }}
{% endcall %}
{% call macros.box(title="Antispam") %}
{{ macros.form_field(form.spam_enabled) }}
{{ macros.form_field(form.spam_threshold, step=1, max=100,
prepend='<span class="input-group-addon"><span id="threshold">'+form.spam_threshold.data.__str__()+'</span>&nbsp;/&nbsp;100</span>',
oninput='$("#threshold").text(this.value);') }}
{% endcall %}
{{ macros.form_field(form.submit) }}
</form>
{% endblock %}

Write Preview
Loading…
Cancel
Save