Skip to content

Commit

Permalink
* Moved settings reload entries from settings to control menu
Browse files Browse the repository at this point in the history 
* Hide Remix and Resync infos if feature was disabled
  • Loading branch information
@awalon
awalon committed Jun 27, 2021
1 parent b9a2d75 commit 236bfa2
Showing 1 changed file with 38 additions and 34 deletions.
72 changes: 38 additions & 34 deletions templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
<a class="dropdown-item {{ nav_active_settings }}" href="/settings"><i class="fa fa-sliders-h"></i> Settings</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item {{ nav_active_users }}" href="/users"><i class="fa fa-users"></i> Users</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" onclick="callRemote('/settings-web-reload');"><i
class="fa fa-sync"></i> Reload Web Settings</a>
<a class="dropdown-item" href="#" onclick="callRemote('/settings-slideshow-reload');"><i
class="fa fa-sync"></i> Reload Slideshow Settings</a>
</div>
</li>

Expand All @@ -83,6 +78,11 @@
<a class="dropdown-item" href="#" onclick="callRemote('/restart-webserver');"><i
class="fa fa-sync"></i> Restart Webserver</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" onclick="callRemote('/settings-web-reload');"><i
class="fa fa-sync"></i> Reload Webserver Settings</a>
<a class="dropdown-item" href="#" onclick="callRemote('/settings-slideshow-reload');"><i
class="fa fa-sync"></i> Reload Slideshow Settings</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" onclick="callRemote('/reboot');"><i class="fa fa-bolt"></i>
Reboot</a>
<a class="dropdown-item" href="#" onclick="callRemote('/shutdown');"><i
Expand Down Expand Up @@ -157,6 +157,7 @@ <h5 class="card-header">Pictures</h5>
({{ stat_pic_duration }} sec)
</td>
</tr>
{% if stat_pic_remix != '-' %}
<tr>
<td>Next remix</td>
<td class="text-end text-wrap text-break">{{ stat_pic_remix }}</td>
Expand All @@ -179,6 +180,7 @@ <h5 class="card-header">Pictures</h5>
</div>
</td>
</tr>
{% endif %}
</table>
</div>
</div>
Expand All @@ -192,36 +194,38 @@ <h5 class="card-header">Synchronization</h5>
<td>Mode</td>
<td class="text-end text-wrap text-break">{{ stat_sync_mode }}</td>
</tr>
<tr>
<td>Source URL</td>
<td class="text-end text-wrap text-break">{{ stat_sync_source }}</td>
</tr>
<tr>
<td>Sync Interval</td>
<td class="text-end text-wrap text-break">{{ "%.2f min"|format(stat_sync_interval / 60) }}</td>
</tr>
<tr>
<td>Next resync</td>
<td class="text-end text-wrap text-break">{{ stat_sync_resync }}</td>
</tr>
<tr>
<td colspan="2">
<div class="progress position-relative bg-light">
<span class="position-absolute
{% if stat_sync_resync_percent < 55 %}
text-darkX text-white
{% endif %}
top-50 start-50 translate-middle"
style="font-size: .8rem">{{ stat_sync_resync_info }}</span>
<div class="progress-bar" role="progressbar"
style="width: {{ stat_sync_resync_percent }}%;"
aria-valuenow="{{ stat_sync_resync_percent }}"
aria-valuemin="0"
aria-valuemax="{{ 100 }}">
{% if stat_sync_resync != '-' %}
<tr>
<td>Source URL</td>
<td class="text-end text-wrap text-break">{{ stat_sync_source }}</td>
</tr>
<tr>
<td>Sync Interval</td>
<td class="text-end text-wrap text-break">{{ "%.2f min"|format(stat_sync_interval / 60) }}</td>
</tr>
<tr>
<td>Next resync</td>
<td class="text-end text-wrap text-break">{{ stat_sync_resync }}</td>
</tr>
<tr>
<td colspan="2">
<div class="progress position-relative bg-light">
<span class="position-absolute
{% if stat_sync_resync_percent < 55 %}
text-darkX text-white
{% endif %}
top-50 start-50 translate-middle"
style="font-size: .8rem">{{ stat_sync_resync_info }}</span>
<div class="progress-bar" role="progressbar"
style="width: {{ stat_sync_resync_percent }}%;"
aria-valuenow="{{ stat_sync_resync_percent }}"
aria-valuemin="0"
aria-valuemax="{{ 100 }}">
</div>
</div>
</div>
</td>
</tr>
</td>
</tr>
{% endif %}
</table>
</div>
</div>
Expand Down

0 comments on commit 236bfa2

Please sign in to comment.