From 89caf9d7250d907f9c93ddc0af3dddcd93df1442 Mon Sep 17 00:00:00 2001 From: szaimen Date: Tue, 22 Mar 2022 20:24:50 +0100 Subject: [PATCH] reorder the aio interface a bit more Signed-off-by: szaimen --- php/public/style.css | 4 +++ php/templates/containers.twig | 61 +++++++++++++++-------------------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/php/public/style.css b/php/public/style.css index a014166c..3c619b24 100644 --- a/php/public/style.css +++ b/php/public/style.css @@ -23,6 +23,10 @@ a { outline: none; } +summary { + cursor: pointer; +} + ul { list-style: none; padding: 0; diff --git a/php/templates/containers.twig b/php/templates/containers.twig index 3073936f..bf7d0152 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -55,6 +55,7 @@ Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done.

Reload ↻
{% else %} + You are currently running the {{ current_channel }} channel. (Logs)

{% if isBackupOrRestoreRunning == false and domain == "" %} {% if is_mastercontainer_update_available == true %}

Mastercontainer update

@@ -140,6 +141,13 @@ {% if isApacheStarting != true %} {% if is_mastercontainer_update_available == true %} ⚠ A mastercontainer update is available. Please click on the button below to stop your containers in order to be able to update the mastercontainer.

+ {% if current_channel starts with 'latest' %} + You can find the changelog here

+ {% elseif current_channel starts with 'beta' %} + You can find the changelog here

+ {% elseif current_channel starts with 'develop' %} + You can find all changes here

+ {% endif %} {% endif %}
@@ -157,7 +165,12 @@ Clicking on the button below will download all docker containers and start them. This can take a lot of time depending on your internect connection. Since the overall size is a few GB, this will take around 5-10 min or more. So be aware and patient!

{% endif %} {% if is_mastercontainer_update_available == true %} - ⚠ Please update your mastercontainer. (The update button is in the Mastercontainer section below the Backup section. Click here to go there.) Afterwards, you will be able to start your containers again.

+ ⚠ A mastercontainer update is available. Please click on the button below to update it.

+ + + + + {% else %} {% if was_start_button_clicked == false or has_update_available == false %}
@@ -205,22 +218,17 @@ {% endif %} {% if isBackupContainerRunning == false %} -

Backup information

{% if has_backup_run_once == true %}
- Click here to reveal the backup information
+ Click here to reveal all backup options
{% endif %} +

Backup information

This is your encryption password for backups: {{ borgbackup_password }}

Please save it at a safe place since you won't be able to restore from backup if you loose this password!

Backed up will get all important data of your Nextcloud AIO instance like the database, your files and configuration files of the mastercontainer and else.

The backup itself will use a tool that is called BorgBackup which is a well-known server backup tool that efficiently backs up your files and encrypts them on the fly.

Backups get created in the following directory on the host: {{ borg_backup_host_location }}/borg

Be aware that this solution does not back up files and folders that are mounted into Nextcloud using the external storage app. - {% if has_backup_run_once == false %} -

- {% else %} -


- {% endif %} {% if isApacheStarting != true %}

Backup creation

@@ -254,6 +262,11 @@ {% endif %} {% endif %} + {% if has_backup_run_once == false %} +

+ {% else %} +

+ {% endif %} {% else %} Backup container currently running. (
Logs)

@@ -262,30 +275,8 @@ {% endif %} {% if isBackupContainerRunning == false %} -

Mastercontainer

- You are currently running the {{ current_channel }} channel. (Logs)

- - {% if is_mastercontainer_update_available == true %} - {% if isAnyRunning == false %} - ⚠ A mastercontainer update is available. Please click on the button below to update it.

-
- - - -
- {% else %} - ⚠ A mastercontainer update is available. Please stop your containers in order to be able to update the mastercontainer.

- {% endif %} - {% if current_channel starts with 'latest' %} - You can find the changelog here

- {% elseif current_channel starts with 'beta' %} - You can find the changelog here

- {% elseif current_channel starts with 'develop' %} - You can find all changes here

- {% endif %} - {% endif %} {% if isApacheStarting == false %} -

AIO password change

+

AIO password change

Click here to change your AIO password
You can change your AIO password below:

@@ -303,16 +294,16 @@ {% endif %} {% if isBackupContainerRunning == false %}

Optional

- In this section, you can find optional addons.

- You can change the state of them when your containers are stopped.

+ In this section, you can find optional addons.
+ You can enable or disaable them when your containers are stopped.

{% if is_clamav_enabled == true %} -
+
{% else %} -
+
{% endif %} {% if is_collabora_enabled == true %}