From 13ca4c164a7fb0fcdf4576397894ba8262422cb2 Mon Sep 17 00:00:00 2001 From: szaimen Date: Tue, 24 May 2022 19:03:03 +0200 Subject: [PATCH] move the timezone change section to a better place Signed-off-by: szaimen --- php/templates/containers.twig | 50 ++++++++++++------------- tests/QA/050-optional-addons.md | 2 +- tests/QA/060-environmental-variables.md | 4 +- tests/QA/070-timezone-change.md | 8 ++++ 4 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 tests/QA/070-timezone-change.md diff --git a/php/templates/containers.twig b/php/templates/containers.twig index fadb3601..c39ac61a 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -400,31 +400,6 @@ The new password needs to be at least 24 characters long. Allowed characters are the latin characters a-z, A-Z, 0-9 and spaces.

- -

Timezone change

- In order to get the correct time values for certain Nextcloud features, it makes sense to set the timezone for Nextcloud to the one that your users mainly use. Please note that this setting does not apply to the mastercontainer and any backup option.

- {% if isAnyRunning == true %} - Note: You can change the timezone when your containers are stopped.

- {% else %} - {% if timezone == "" %} - You can configure the timezone for Nextcloud below:

-
- - - - -
- You need to make sure that the timezone that you enter is valid. An example is Europe/Berlin. You can get valid values by looking at the 'TZ database name' column of this list: click here.

- {% else %} - The timezone for Nextcloud is currently set to {{ timezone }}. You can reset the timezone again by clicking on the button below.

-
- - - - -
- {% endif %} - {% endif %} {% endif %} {% endif %} {% endif %} @@ -469,6 +444,31 @@ {% endif %} + +

Timezone change

+ In order to get the correct time values for certain Nextcloud features, it makes sense to set the timezone for Nextcloud to the one that your users mainly use. Please note that this setting does not apply to the mastercontainer and any backup option.

+ {% if isAnyRunning == true %} + Note: You can change the timezone when your containers are stopped.

+ {% else %} + {% if timezone == "" %} + You can configure the timezone for Nextcloud below:

+
+ + + + +
+ You need to make sure that the timezone that you enter is valid. An example is Europe/Berlin. You can get valid values by looking at the 'TZ database name' column of this list: click here.

+ {% else %} + The timezone for Nextcloud is currently set to {{ timezone }}. You can reset the timezone again by clicking on the button below.

+
+ + + + +
+ {% endif %} + {% endif %} {% endif %} {% endif %} {% endif %} diff --git a/tests/QA/050-optional-addons.md b/tests/QA/050-optional-addons.md index ce82a33e..909b9552 100644 --- a/tests/QA/050-optional-addons.md +++ b/tests/QA/050-optional-addons.md @@ -1,6 +1,6 @@ # Optional addons -- [ ] At the bottom of the page in the AIO interface, you should see the optional addons section +- [ ] Close to the bottom of the page in the AIO interface, you should see the optional addons section - [ ] You should be able to change optional addons when containers are stopped and not change them when containers are running - [ ] Enabling either of the options should start a new container with the same or comparable name and should also list them in the containers section - [ ] After all containers are started with the new config active, you should verify that the options were automatically activated/deactivated. diff --git a/tests/QA/060-environmental-variables.md b/tests/QA/060-environmental-variables.md index d16e7169..66b91471 100644 --- a/tests/QA/060-environmental-variables.md +++ b/tests/QA/060-environmental-variables.md @@ -3,4 +3,6 @@ - [ ] When starting the mastercontainer with `-e APACHE_PORT=11000` on a clean instance, the domaincheck container should be started with that same port published. That makes sure that also the Apache container will use that port later on. Using a value here that is not a port will not allow the mastercontainer to start correctly. - [ ] Make also sure that reverse proxies work by following https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md#reverse-proxy-documentation and following [001-initial-setup.md](./001-initial-setup.md) and [002-new-instance.md](./002-new-instance.md) - [ ] When starting the mastercontainer with `-e NEXTCLOUD_DATADIR="/mnt/testdata"` it should map that location from `/mnt/testdata` to `/mnt/ncdata` inside the Nextcloud container. Not having adjusted the permissions correctly before starting the Nextcloud container the first time will not allow the Nextcloud container to start correctly. See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir for allowed values. -- [ ] When starting the mastercontainer with `-e NEXTCLOUD_MOUNT="/mnt/"` it should map `/mnt/` to `/mnt/` inside the Nextcloud container. See https://github.com/nextcloud/all-in-one#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host for allowed values. \ No newline at end of file +- [ ] When starting the mastercontainer with `-e NEXTCLOUD_MOUNT="/mnt/"` it should map `/mnt/` to `/mnt/` inside the Nextcloud container. See https://github.com/nextcloud/all-in-one#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host for allowed values. + +You can now continue with [070-timezone-change.md](./070-timezone-change.md) diff --git a/tests/QA/070-timezone-change.md b/tests/QA/070-timezone-change.md new file mode 100644 index 00000000..2b649f7e --- /dev/null +++ b/tests/QA/070-timezone-change.md @@ -0,0 +1,8 @@ +# Timezone change + +- [ ] At the very bottom of the page you should see the timezone change section +- [ ] When the containers are stopped, you should be able to change it and set/reset it +- [ ] If not already set, it should show an input field where you can enter a timezone +- [ ] `Europe/Berlin` should be accepted, e.g. `Europe Berlin` not +- [ ] When it is set, it should show that it is set to which timezone and display a button that allows to reset it again which does this on a press +- [ ] When it is set, running `date` inside Nextcloud releated containers should return the correct timezone