mirror
/
stratux
kopia lustrzana https://github.com/cyoung/stratux
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed Confirm Modal and cleaned up modals

pull/734/head^2
peepsnet 2017-07-22 14:49:15 -04:00 zatwierdzone przez GitHub
rodzic c406c344aa
commit 8932abf342
1 zmienionych plików z 11 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

52
web/plates/settings.html
Wyświetl plik

@ -64,8 +64,7 @@
<div class="form-group reset-flow">
<label class="control-label col-xs-5">WiFi Passphrase</label>
<input class="col-xs-7" type="string" ng-model="WiFiPassphrase"
ng-disabled="!WiFiSecurityEnabled" ng-class="{grayout: !WiFiSecurityEnabled}"
placeholder="WiFi Passphrase" />
ng-disabled="!WiFiSecurityEnabled" placeholder="WiFi Passphrase" />
</div>
<div class="form-group reset-flow">
<label class="control-label col-xs-7">WiFi Channel</label>
@ -84,7 +83,7 @@
</select>
</div>
<div class="form-group reset-flow">
<button class="btn btn-primary btn-block" ui-turn-on="modalSubmitWiFi">Submit WiFi Changes</button>
<button class="btn btn-primary btn-block" ng-click="updateWiFi()">Submit WiFi Changes</button>
</div>
</form>
</div>
@ -206,7 +205,7 @@
<label class="control-label col-xs-3">G Limits</label>
<form name="GLimitForm" ng-submit="updateGLimits()" novalidate>
<input class="col-xs-9" type="string" required ng-model="GLimits" ng-blur="updateGLimits()"
ng-disabled="!IMU_Sensor_Enabled" ng-class="{grayout: !IMU_Sensor_Enabled}"
ng-disabled="!IMU_Sensor_Enabled"
placeholder="Space-separated negative and positive G meter limits"/>
</form>
</div>
@ -406,52 +405,23 @@
</div>
</div>
</div>
<!-- WiFi Submit Modal -->
<div class="modal" ui-if="modalSubmitWiFi" ui-state="modalSubmitWiFi">
<div class="modal-overlay"></div>
<div class="vertical-alignment-helper center-block">
<div class="modal-dialog vertical-align-center">
<div class="modal-content">
<div class="modal-header">
<button class="close" ui-turn-off="modalSubmitWiFi"></button>
<h4 class="modal-title">Are you really sure?</h4>
</div>
<div class="modal-body">
<p>Do you wish to submit the WiFi changes?</p>
<p>Note that the wireless services will reboot immediately and
it will stop responding during the reboot</p>
<p>You might have to reselect the new WiFi network on your device
if you made changes to the SSID or security settings.</p>
</div>
<div class="modal-footer">
<a ui-turn-off="modalSubmitWiFi" ui-turn-on="modalCancelWiFi" class="btn btn-default">Cancel</a>
<a ng-click="updateWiFi()" ui-turn-off="modalSubmitWiFi" ui-turn-on="WiFiRestart"
class="btn btn-primary">Submit Changes</a>
</div>
</div>
</div>
</div>
</div>
<!-- WiFi Success Modal -->
<div class="modal" ui-if="modalSuccessWiFi" ui-state="modalSuccessWiFi">
<div class="modal" ui-if="modalSuccessWiFi" ui-state="modalSuccessWiFi" id="WiFiSuccessModal">
<div class="modal-overlay "></div>
<div class="vertical-alignment-helper center-block">
<div class="modal-dialog vertical-align-center">
<div class="modal-content">
<div class="modal-header">
<button class="close" ui-turn-off="modalSuccessWiFi"></button>
<h4 class="modal-title">Success</h4>
<h4 class="modal-title">Your WiFi settings were successfully changed.</h4>
</div>
<div class="modal-body">
<p>Your WiFi settings were successful. </p>
<ul>
<li>WiFi SSID: {{WiFiSSID}}</li>
<li>WiFi Security: {{WiFiSecurityEnabled}}</li>
<li>WiFi Passphrase: {{WiFiPassphrase}}</li>
<li>WiFi Channel: {{WiFiChannel}}</li>
</ul>
<p>Your Stratux's WiFi services are now restarting to apply the new settings.
You might have to reconnect to your new WiFi SSID.</p>
<p>WiFi SSID: <b>{{WiFiSSID}}</b></p>
<p>WiFi Security: <b>{{WiFiSecurityEnabled}}</b></p>
<p>WiFi Passphrase: <b>{{WiFiPassphrase}}</b></p>
<p>WiFi Channel: <b>{{WiFiChannel}}</b></p>
<p>Your Stratux's WiFi services are now restarting to apply the new settings. This could take up to 30 seconds<br />
You might have to reconnect to your new WiFi SSID. </p>
</div>
<div class="modal-footer">
<a ui-turn-off="modalSuccessWiFi" class="btn btn-default">Close</a>