eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

some further small enhancements

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-04-03 20:20:11 +02:00
parent b4e18256a6
commit 0d4152a7f9
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/Bug_report.md vendored
View file

@ -27,6 +27,6 @@ labels: bug, 0. Needs triage
#### Nextcloud AIO version <!--- (see Nextcloud AIO interface) --> #### Nextcloud AIO version <!--- (see Nextcloud AIO interface) -->
#### Current channel <!--- (see the channel name in the Mastercontainer section) --> #### Current channel <!--- (see the channel name in the AIO interface) -->
#### Other valuable info <!--- (like logs, screenshots & Co.) --> #### Other valuable info <!--- (like logs, screenshots & Co.) -->

11
php/templates/containers.twig
View file

@ -51,7 +51,7 @@
{% endfor %} {% endfor %}
{% if isWatchtowerRunning == true %} {% if isWatchtowerRunning == true %}
<span class="status running"></span> Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br /><br /> <span class="status running"></span> Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done. (<a href="/api/docker/logs?id=nextcloud-aio-watchtower">Logs</a>)<br /><br />
<a href="" class="button reload">Reload ↻</a><br/> <a href="" class="button reload">Reload ↻</a><br/>
{% else %} {% else %}
{% if is_backup_container_running == false and domain == "" %} {% if is_backup_container_running == false and domain == "" %}
@ -86,7 +86,7 @@
{% if backup_exit_code > 0 %} {% if backup_exit_code > 0 %}
<span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br /> <span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
{% if borg_backup_mode == 'test' %} {% if borg_backup_mode == 'test' %}
Please adjust the path and/or password in order to make it work! Afterwards click on 'Test path and password' button to verify the settings!<br><br> Please adjust the path and/or password in order to make it work! After changing and submitting the values, click on 'Test path and password' button at the bottom of this page to verify and test the new settings!<br><br>
{% elseif borg_backup_mode == 'check' %} {% elseif borg_backup_mode == 'check' %}
The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html?highlight=repair#:~:text=repairing%20a%20damaged%20repository"><b>this documentation</b></a> The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html?highlight=repair#:~:text=repairing%20a%20damaged%20repository"><b>this documentation</b></a>
{% endif %} {% endif %}
@ -144,6 +144,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if is_backup_container_running == true %} {% if is_backup_container_running == true %}
<span class="status running"></span> Backup container is currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br /> <span class="status running"></span> Backup container is currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
<a href="" class="button reload">Reload ↻</a><br/><br> <a href="" class="button reload">Reload ↻</a><br/><br>
@ -151,7 +152,7 @@
{% if domain != "" %} {% if domain != "" %}
{% if was_start_button_clicked == true %} {% if was_start_button_clicked == true %}
You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br> You are running the <b>{{ current_channel }}</b> channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
{% endif %} {% endif %}
{% if isAnyRunning == true %} {% if isAnyRunning == true %}
@ -361,8 +362,8 @@
{% endif %} {% endif %}
{% if is_backup_container_running == false %} {% if is_backup_container_running == false %}
<h2>Optional addons</h2> <h2>Optional addons</h2>
In this section, you can find optional addons.<br> In this section you can find optional addons.<br>
You can enable or disaable them when your containers are stopped.<br><br> You can enable or disable them when your containers are stopped.<br><br>
<form id="options-form" method="POST" action="/api/configuration" class="xhr"> <form id="options-form" method="POST" action="/api/configuration" class="xhr">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">