From b7b1330bde96f17e92783ca86b58b87272e04c04 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 31 Jul 2019 11:35:41 +0200
Subject: [PATCH] add better render for summary and result

---
 bin/vhost-add              |  2 +-
 src/templates/result.twig  |  7 +++++--
 src/templates/summary.twig | 32 +++++++++++++++++++-------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/bin/vhost-add b/bin/vhost-add
index 7f7af39..90c6d19 100755
--- a/bin/vhost-add
+++ b/bin/vhost-add
@@ -151,5 +151,5 @@ export USER_PASSWORD
 TMP_FILE="/tmp/vhost-add-$(tr -dc "qwertQWERTasdfgASDFGzxcvbZXCVB" < /dev/urandom | head -c 16)"
 template result > "$TMP_FILE"
 chmod 600 "$TMP_FILE"
-whiptail --textbox "$TMP_FILE" 8 0
+whiptail --textbox "$TMP_FILE" 25 80
 rm "$TMP_FILE"
diff --git a/src/templates/result.twig b/src/templates/result.twig
index 0800c5d..450e775 100644
--- a/src/templates/result.twig
+++ b/src/templates/result.twig
@@ -1,2 +1,5 @@
-Username: {{ SYSTEM_USER_USERNAME }}
-Password: {{ USER_PASSWORD }}
+{% extends 'summary.twig' %}
+
+{% block user_password %}
+│ PASSWORD │ {{ '%- 25s'|format(USER_PASSWORD) }} │
+{% endblock %}
diff --git a/src/templates/summary.twig b/src/templates/summary.twig
index 80304d6..87f0ceb 100644
--- a/src/templates/summary.twig
+++ b/src/templates/summary.twig
@@ -1,13 +1,19 @@
-DOMAIN: {{ DOMAIN }}
-DOMAIN_ALIASES: {{ DOMAIN }}
-DOCUMENT_ROOT: {{ DOCUMENT_ROOT }}
-
-SYSTEM_USER_USERNAME: {{ SYSTEM_USER_USERNAME }}
-SYSTEM_USER_GROUP: {{ SYSTEM_USER_GROUP }}
-
-WEB_HTTP: {{ WEB_HTTP }}
-WEB_HTTPS: {{ WEB_HTTPS }}
-WEB_HTTPS_FORCE: {{ WEB_HTTPS_FORCE }}
-
-PHP_ENABLED: {{ PHP_ENABLED }}
-PHP_VERSION: {{ PHP_VERSION }}
+┌───────────┬─────────────────────────────────────────────────────────┐
+│ DOMAIN    │ {{ '%- 55s'|format(DOMAIN) }} │
+│ ALIASES   │ {{ '%- 55s'|format(DOMAIN_ALIASES) }} │
+│ DIRECTORY │ {{ '%- 55s'|format(DOCUMENT_ROOT) }} │
+└───────────┴─────────────────────────────────────────────────────────┘
+┌──────────┬───────────────────────────┐
+│ USERNAME │ {{ '%- 25s'|format(SYSTEM_USER_USERNAME) }} │
+{% block user_password %}{% endblock %}
+│ GROUP    │ {{ '%- 25s'|format(SYSTEM_USER_GROUP) }} │
+└──────────┴───────────────────────────┘
+┌──────────────┬─────┐
+│ HTTP         │ {{ '%- 3s'|format(WEB_HTTP) }} │
+│ HTTPS        │ {{ '%- 3s'|format(WEB_HTTPS) }} │
+│ HTTP → HTTPS │ {{ '%- 3s'|format(WEB_HTTPS_FORCE) }} │
+└──────────────┴─────┘
+┌─────────────┬─────┐
+│ PHP ENABLED │ {{ '%- 3s'|format(PHP_ENABLED) }} │
+│ PHP VERSION │ {{ '%- 3s'|format(PHP_VERSION) }} │
+└─────────────┴─────┘