From 625def2367c1f6b566e2a11cbea441e72b74d485 Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Sun, 3 May 2020 10:48:21 +0200 Subject: [PATCH] use 2-column layout for api key, domain, directory, mailbox --- .../templates/dashboard/api_key.html | 82 ++++++------ .../templates/dashboard/custom_domain.html | 47 +++---- .../templates/dashboard/directory.html | 71 +++++----- .../templates/dashboard/mailbox.html | 123 +++++++++--------- 4 files changed, 165 insertions(+), 158 deletions(-) diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index f16e22e9..c9a03995 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -37,66 +37,68 @@ - {% for api_key in api_keys %} -
-
-
{{ api_key.name }}
-
- {% if api_key.last_used %} - Last used: {{ api_key.last_used | dt }}
- Used: {{ api_key.times }} times. - {% else %} - Never used - {% endif %} -
+
+ {% for api_key in api_keys %} +
+
+
+
{{ api_key.name }}
+
+ {% if api_key.last_used %} + Last used: {{ api_key.last_used | dt }}
+ Used: {{ api_key.times }} times. + {% else %} + Never used + {% endif %} +
-
- -
+
+ +
-
-
+
+
-
+
-
-
- -
+
+
+ +
-
-
- - - +
+ + + + Delete - + +
+
+
-
-
- {% endfor %} - -
+ {% endfor %} +
{{ new_api_key_form.csrf_token }} - - - Name of the api key, e.g. where it will be used. +

New Api Key

{{ new_api_key_form.name(class="form-control", placeholder="Chrome, Firefox") }} {{ render_field_errors(new_api_key_form.name) }} +
Name of the api key, e.g. where it will be used.
+
diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index a03047db..edab5c1d 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -31,42 +31,45 @@ You could also enable catch-all feature that allows you to create aliases on-the-fly.
- {% for custom_domain in custom_domains %} -
-
-
- {{ custom_domain.domain }} - {% if custom_domain.verified %} - ✅ - {% else %} - +
+ {% for custom_domain in custom_domains %} +
+
+
+
+ {{ custom_domain.domain }} + {% if custom_domain.verified %} + ✅ + {% else %} + 🚫 - {% endif %} -
-
- Created {{ custom_domain.created_at | dt }}
- {{ custom_domain.nb_alias() }} aliases. -
+ {% endif %} +
+
+ Created {{ custom_domain.created_at | dt }}
+ {{ custom_domain.nb_alias() }} aliases. +
- Details ➡ + Details ➡ +
+
-
- {% endfor %} - -
+ {% endfor %} +
{{ new_custom_domain_form.csrf_token }} - - Please use full path domain, for ex my-subdomain.my-domain.com +

New Domain

{{ new_custom_domain_form.domain(class="form-control", placeholder="my-domain.com") }} {{ render_field_errors(new_custom_domain_form.domain) }} +
Please use full path domain, for ex my-subdomain.my-domain.com
+
diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index 8f7ed8fe..f5d353d4 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -53,55 +53,56 @@ - {% for dir in dirs %} -
-
-
- {{ dir.name }} -
-
- Created {{ dir.created_at | dt }}
- {{ dir.nb_alias() }} aliases. -
-
+
+ {% for dir in dirs %} +
+
+
+
+ {{ dir.name }} +
+
+ Created {{ dir.created_at | dt }}
+ {{ dir.nb_alias() }} aliases. +
+
-
-
-
-
- - - - +
+
+
+ + + + + Delete - + +
+
+
+
-
+ {% endfor %} +
-
- {% endfor %} - - {% if dirs|length > 0 %} -
- {% endif %} - -
+ {{ new_dir_form.csrf_token }} -
Directory Name
-
- Directory name must be at least 3 characters. - Only lowercase letter, number, dash (-), underscore (_) can be used. -
+

New Directory

{{ new_dir_form.name(class="form-control", placeholder="my-directory", pattern="[0-9a-z-_]{3,}", title="Only letter, number, dash (-), underscore (_) can be used. Directory name must be at least 3 characters.") }} {{ render_field_errors(new_dir_form.name) }} +
+ Directory name must be at least 3 characters. + Only lowercase letter, number, dash (-), underscore (_) can be used. +
+
@@ -117,7 +118,7 @@ let that = $(this); let message = `All aliases associated with ${directory} directory will also be deleted, ` + - " please confirm."; + " please confirm."; bootbox.confirm({ message: message, diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index 99075f25..4abb7873 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -34,88 +34,89 @@ if you want to create aliases for your buddy.
- {% for mailbox in mailboxes %} -
-
-
- {{ mailbox.email }} - {% if mailbox.verified %} - ✅ - {% else %} - +
+ {% for mailbox in mailboxes %} +
+
+
+
+ {{ mailbox.email }} + {% if mailbox.verified %} + ✅ + {% else %} + 🚫 - {% endif %} - {% if mailbox.pgp_finger_print %} - 🗝 - {% endif %} + {% endif %} + {% if mailbox.pgp_finger_print %} + 🗝 + {% endif %} - {% if mailbox.id == current_user.default_mailbox_id %} -
Default Mailbox -
- {% endif %} -
+ {% if mailbox.id == current_user.default_mailbox_id %} +
Default Mailbox +
+ {% endif %} +
-
- Created {{ mailbox.created_at | dt }}
- {{ mailbox.nb_alias() }} aliases.
+
+ Created {{ mailbox.created_at | dt }}
+ {{ mailbox.nb_alias() }} aliases.
-
+ - Edit ➡ -
+ Edit ➡ +
-
-
- {% if mailbox.verified %} -
-
- - - - -
-
- {% endif %} + > + Set As Default Mailbox + + +
+ {% endif %} -
-
- - - - + + + + + Delete - + +
+
+
+
- + {% endfor %} + - - {% endfor %} - - {% if mailboxs|length > 0 %} -
- {% endif %} - -
+ {{ new_mailbox_form.csrf_token }} -
Email
-
- A verification email will be sent to this email to make sure you have access to this email. -
+

New Mailbox

{{ new_mailbox_form.email(class="form-control", placeholder="email@example.com") }} {{ render_field_errors(new_mailbox_form.email) }} +
+ A verification email will be sent to this email address. +
+
@@ -131,7 +132,7 @@ let that = $(this); let message = `All aliases owned by this mailbox ${mailbox} will be also deleted, ` + - " please confirm."; + " please confirm."; bootbox.confirm({ message: message,