impl options explanation, uiLock (#343)

* update schemas

* update

* killed upstream change

* min prio is now 100

* reset watchdog regularly

* update

* fix

* update
This commit is contained in:
brindosch
2016-12-21 18:24:03 +01:00
committed by GitHub
parent 0414e3c860
commit 88bed79c07
34 changed files with 879 additions and 399 deletions

View File

@@ -213,14 +213,14 @@
<!-- Page Content -->
<div id="page-wrapper" style="padding-top:10px">
<div id="hyperion_reload_notify" class="alert alert-warning" style="display:none;padding:10px;margin:0">
<div id="hyperion_reload_notify" class="alert alert-warning" style="display:none;padding:10px;margin:0">
<div class="panel-danger" style="text-align:right">
<div style="float:left;line-height:33px;" data-i18n="dashboard_alert_message_confedit">Your Hyperion configuration has been modified. To apply it, restart Hyperion.</div>
<button id="btn_hyperion_reload" class="btn btn-danger" data-i18n="dashboard_alert_button_restarthyerion">Restart Hyperion</button>
<button id="btn_hyperion_reload" class="btn btn-danger" data-i18n="general_btn_restarthyperion">Restart Hyperion</button>
</div>
</div>
<div id="page-content" />
<div id="page-content"></div>
</div>
</div>
@@ -232,18 +232,19 @@
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-body">
<center>
<div class="modal-bodyicon" style="margin-bottom:20px;"></div>
<h4 class="modal-bodytitle" style="font-weight:bold;text-transform:uppercase;"></h4>
<div class="modal-bodycontent"></div>
<select id="modal_select" class="form-control" style="margin-top:10px;width:auto;"></select>
</center>
</div>
<div class="modal-footer">
<center>
<div class="modal-footer-button"></div>
</center>
<div class="modal-body">
<center>
<div class="modal-bodyicon" style="margin-bottom:20px;"></div>
<h4 class="modal-bodytitle" style="font-weight:bold;text-transform:uppercase;"></h4>
<div class="modal-bodycontent"></div>
<select id="modal_select" class="form-control" style="margin-top:10px;width:auto;"></select>
</center>
</div>
<div class="modal-footer">
<center>
<div class="modal-footer-button"></div>
</center>
</div>
</div>
</div>
</div>