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

Merge pull request #442 from nextcloud/enh/418/show-current-status-better

Browse source 
improve showing the current status
This commit is contained in:
Simon L 2022-03-31 16:06:05 +02:00 • committed by GitHub
commit 06dd83f07a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
php/templates/containers.twig
View file

@ -52,7 +52,7 @@
{% endfor %} {% endfor %}
{% if isWatchtowerRunning == true %} {% if isWatchtowerRunning == true %}
Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done.<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-mastercontainer">Logs</a>)<br /><br />
<a href="" class="button reload">Reload ↻</a><br/> <a href="" class="button reload">Reload ↻</a><br/>
{% else %} {% else %}
You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br> You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
@ -146,8 +146,8 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if isBackupContainerRunning == true and domain == "" %} {% if isBackupContainerRunning == true %}
Backup container is currently running.<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>
{% endif %} {% endif %}
@ -163,7 +163,7 @@
<a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/> <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
{% else %} {% else %}
{% if isAnyRestarting == false %} {% if isAnyRestarting == false %}
Containers are currently starting.<br /><br /> <span class="status running"></span> Containers are currently starting.<br /><br />
<a href="" class="button reload">Reload ↻</a><br/><br> <a href="" class="button reload">Reload ↻</a><br/><br>
{% else %} {% else %}
It seems like at least one container is currently restarting which means it is not able to start correctly.<br><br> It seems like at least one container is currently restarting which means it is not able to start correctly.<br><br>
@ -340,10 +340,6 @@
{% else %} {% else %}
</details><br /><br /> </details><br /><br />
{% endif %} {% endif %}
{% else %}
<span class="status running"></span> Backup container currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
<a href="" class="button reload">Reload ↻</a><br/>
{% endif %} {% endif %}
{% endif %} {% endif %}