Skip to content

Commit

Permalink
Support for MX v3.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mcrossley committed Jul 29, 2021
1 parent 0057b02 commit b6384c6
Show file tree
Hide file tree
Showing 41 changed files with 7,491 additions and 7,100 deletions.
33 changes: 17 additions & 16 deletions interface/alltimerecseditor.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Last modified: 2021/06/09 21:49:56
Last modified: 2021/07/12 11:44:43
-->
<!doctype html>
<html lang="en">
Expand Down Expand Up @@ -48,6 +48,7 @@
height: 50px;
border-radius: 5px;
}
.shade {background-color: #eef4f9}
</style>
</head>
<body>
Expand All @@ -74,7 +75,7 @@ <h1>All Time Records Editor</h1>
<div class="row">
<div class="col-md-12">
<table id="alltime" class="display dataTable no-footer" cellspacing="0" width="100%" role="grid" style="width: 100%;">
<tr>
<tr style="background-color: #b2c2dc;">
<th>Record</th>
<th>Value</th>
<th>Timestamp</th>
Expand All @@ -92,7 +93,7 @@ <h1>All Time Records Editor</h1>
<td id="highTempValLogfile"></td>
<td id="highTempTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Low temperature</td>
<td id="lowTempVal" data-pk="3" data-type="text" data-url="api/edit/alltime" data-title="Enter new low temp value"></td>
<td id="lowTempTime" data-pk="4" data-type="text" data-url="api/edit/alltime" data-title="Enter new low temp date/time"></td>
Expand All @@ -110,7 +111,7 @@ <h1>All Time Records Editor</h1>
<td id="highDewPointValLogfile"></td>
<td id="highDewPointTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Low dew point</td>
<td id="lowDewPointVal" data-pk="7" data-type="text" data-url="api/edit/alltime" data-title="Enter new low dew point value"></td>
<td id="lowDewPointTime" data-pk="8" data-type="text" data-url="api/edit/alltime" data-title="Enter new low dew point date/time"></td>
Expand All @@ -128,7 +129,7 @@ <h1>All Time Records Editor</h1>
<td id="highApparentTempValLogfile"></td>
<td id="highApparentTempTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Low apparent temperature</td>
<td id="lowApparentTempVal" data-pk="9" data-type="text" data-url="api/edit/alltime" data-title="Enter new low apparent temp value"></td>
<td id="lowApparentTempTime" data-pk="10" data-type="text" data-url="api/edit/alltime" data-title="Enter new low apparent temp date/time"></td>
Expand All @@ -146,7 +147,7 @@ <h1>All Time Records Editor</h1>
<td id="highFeelsLikeValLogfile"></td>
<td id="highFeelsLikeTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Low feels like temp</td>
<td id="lowFeelsLikeVal" data-pk="9" data-type="text" data-url="api/edit/alltime" data-title="Enter new low feels like value"></td>
<td id="lowFeelsLikeTime" data-pk="10" data-type="text" data-url="api/edit/alltime" data-title="Enter new low feels like date/time"></td>
Expand All @@ -164,7 +165,7 @@ <h1>All Time Records Editor</h1>
<td id="highHumidexValLogfile"></td>
<td id="highHumidexTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Low wind chill</td>
<td id="lowWindChillVal" data-pk="11" data-type="text" data-url="api/edit/alltime" data-title="Enter new low wind chill value"></td>
<td id="lowWindChillTime" data-pk="12" data-type="text" data-url="api/edit/alltime" data-title="Enter new low wind chill date/time"></td>
Expand All @@ -182,7 +183,7 @@ <h1>All Time Records Editor</h1>
<td id="highHeatIndexValLogfile"></td>
<td id="highHeatIndexTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High minimum temperature</td>
<td id="highMinTempVal" data-pk="15" data-type="text" data-url="api/edit/alltime" data-title="Enter new high minimum temp value"></td>
<td id="highMinTempTime" data-pk="16" data-type="text" data-url="api/edit/alltime" data-title="Enter new high minimum date"></td>
Expand All @@ -200,7 +201,7 @@ <h1>All Time Records Editor</h1>
<td id="lowMaxTempValLogfile"></td>
<td id="lowMaxTempTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High daily temp range</td>
<td id="highDailyTempRangeVal" data-pk="19" data-type="text" data-url="api/edit/alltime" data-title="Enter new high daily temp range value"></td>
<td id="highDailyTempRangeTime" data-pk="20" data-type="text" data-url="api/edit/alltime" data-title="Enter new high daily temp range date"></td>
Expand All @@ -218,7 +219,7 @@ <h1>All Time Records Editor</h1>
<td id="lowDailyTempRangeValLogfile"></td>
<td id="lowDailyTempRangeTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High humidity</td>
<td id="highHumidityVal" data-pk="23" data-type="text" data-url="api/edit/alltime" data-title="Enter new high humidity value"></td>
<td id="highHumidityTime" data-pk="24" data-type="text" data-url="api/edit/alltime" data-title="Enter new high humidity date/time"></td>
Expand All @@ -236,7 +237,7 @@ <h1>All Time Records Editor</h1>
<td id="lowHumidityValLogfile"></td>
<td id="lowHumidityTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High pressure</td>
<td id="highBarometerVal" data-pk="27" data-type="text" data-url="api/edit/alltime" data-title="Enter new high pressure value"></td>
<td id="highBarometerTime" data-pk="28" data-type="text" data-url="api/edit/alltime" data-title="Enter new high pressure date/time"></td>
Expand All @@ -254,7 +255,7 @@ <h1>All Time Records Editor</h1>
<td id="lowBarometerValLogfile"></td>
<td id="lowBarometerTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High gust speed</td>
<td id="highGustVal" data-pk="31" data-type="text" data-url="api/edit/alltime" data-title="Enter new high gust value"></td>
<td id="highGustTime" data-pk="32" data-type="text" data-url="api/edit/alltime" data-title="Enter new high gust date/time"></td>
Expand All @@ -272,7 +273,7 @@ <h1>All Time Records Editor</h1>
<td id="highWindValLogfile"></td>
<td id="highWindTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High daily wind run</td>
<td id="highWindRunVal" data-pk="35" data-type="text" data-url="api/edit/alltime" data-title="Enter new high daily wind run value"></td>
<td id="highWindRunTime" data-pk="36" data-type="text" data-url="api/edit/alltime" data-title="Enter new high daily wind run date"></td>
Expand All @@ -290,7 +291,7 @@ <h1>All Time Records Editor</h1>
<td id="highRainRateValLogfile"></td>
<td id="highRainRateTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High hourly rain</td>
<td id="highHourlyRainVal" data-pk="39" data-type="text" data-url="api/edit/alltime" data-title="Enter new high hourly rain value"></td>
<td id="highHourlyRainTime" data-pk="40" data-type="text" data-url="api/edit/alltime" data-title="Enter new high hourly rain date/time"></td>
Expand All @@ -308,7 +309,7 @@ <h1>All Time Records Editor</h1>
<td id="highDailyRainValLogfile"></td>
<td id="highDailyRainTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>High monthly rain</td>
<td id="highMonthlyRainVal" data-pk="43" data-type="text" data-url="api/edit/alltime" data-title="Enter new high monthly rain value"></td>
<td id="highMonthlyRainTime" data-pk="44" data-type="text" data-url="api/edit/alltime" data-title="Enter new high monthly rain date"></td>
Expand All @@ -326,7 +327,7 @@ <h1>All Time Records Editor</h1>
<td id="longestDryPeriodValLogfile"></td>
<td id="longestDryPeriodTimeLogfile"></td>
</tr>
<tr>
<tr class="shade">
<td>Longest wet period</td>
<td id="longestWetPeriodVal" data-pk="47" data-type="text" data-url="api/edit/alltime" data-title="Enter new longest wet period value"></td>
<td id="longestWetPeriodTime" data-pk="48" data-type="text" data-url="api/edit/alltime" data-title="Enter new longest wet period end date"></td>
Expand Down
33 changes: 1 addition & 32 deletions interface/calibrationsettings.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Last modified: 2021/06/09 21:50:00
Last modified: 2021/07/16 16:45:19
-->
<!doctype html>
<html lang="en">
Expand Down Expand Up @@ -36,10 +36,6 @@
<style type="text/css">
.radio {display:inline-block;padding-left:40px;vertical-align: middle;margin-top:10px;}
.radio + .radio, .checkbox + .checkbox {margin-top: 10px;}
.help-block {
font-size: 12px;
padding-left: 20px;
}
.alpaca-field > legend > .collapsed::before {
content: '\25B8';
padding-left: 5px;
Expand All @@ -59,36 +55,9 @@
text-align: left;
font-size: 18px;
}
.alpaca-field .alpaca-invalid {
color:red;
}
.alpaca-field {
color: #333;
}
legend {
color: inherit;
}
.hideme {
visibility: hidden;
width: 0px;
height: 0px;
display: flex;
}
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control:focus,
.has-error .input-group-addon {
color: #ff0500;
border-color: #ca2e2b;
}
</style>

<script>
Expand Down
46 changes: 45 additions & 1 deletion interface/css/cumulus.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
CSS overrides for Cumulus UI
Last modified: 2021/05/16 20:51:24
Last modified: 2021/07/16 15:56:02
*/

body {
Expand Down Expand Up @@ -42,3 +42,47 @@ body {
background-color: #080808;
}
/* End increase navigation menu contrast */


/* Bootstrap/Alpaca overrides */
.help-block {
font-size: 13px !important;
padding-left: 20px !important;
color: #00005099 !important;
font-style: italic;
font-weight: 600;
}
.glyphicon-info-sign {
color: #00005099 !important;
}

.alpaca-field {
color: #222;
}

.alpaca-field .alpaca-invalid {
color:red;
}

.hideme {
visibility: hidden;
width: 0px;
height: 0px;
display: flex;
}
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control:focus,
.has-error .input-group-addon {
color: #ff0500;
border-color: #ca2e2b;
}

29 changes: 1 addition & 28 deletions interface/extrasensorsettings.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Last modified: 2021/06/09 21:50:48
Last modified: 2021/07/16 16:26:43
-->
<!doctype html>
<html lang="en">
Expand Down Expand Up @@ -64,36 +64,9 @@
text-align: left;
font-size: 18px;
}
.alpaca-field .alpaca-invalid {
color:red;
}
.alpaca-field {
color: #333;
}
legend {
color: inherit;
}
.hideme {
visibility: hidden;
width: 0px;
height: 0px;
display: flex;
}
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control:focus,
.has-error .input-group-addon {
color: #ff0500;
border-color: #ca2e2b;
}
</style>

<script>
Expand Down
32 changes: 1 addition & 31 deletions interface/internetsettings.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Last modified: 2021/06/09 21:51:10
Last modified: 2021/07/16 16:03:15
-->
<!doctype html>
<html lang="en">
Expand Down Expand Up @@ -59,39 +59,9 @@
text-align: left;
font-size: 18px;
}
.alpaca-field .alpaca-invalid {
color:red;
}
.alpaca-field {
color: #333;
}
legend {
color: inherit;
}
.hideme {
visibility: hidden;
width: 0px;
height: 0px;
display: flex;
}
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control:focus,
.has-error .input-group-addon {
color: #ff0500;
border-color: #ca2e2b;
}
.col-sm-offset-3 {
margin-left: 5%;
}
</style>

<script>
Expand Down
8 changes: 4 additions & 4 deletions interface/js/extrasensorsettings.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Last modified: 2021/06/09 21:44:51
// Last modified: 2021/07/21 22:16:57

let accessMode;

$(document).ready(function () {

$("form").alpaca({
"dataSource": "./api/settings/extrasensordata.json",
"optionsSource": "./json/ExtrasensorOptions.json",
"schemaSource": "./json/ExtrasensorSchema.json",
//"view": "bootstrap-edit",
"optionsSource": "./json/ExtraSensorOptions.json",
"schemaSource": "./json/ExtraSensorSchema.json",
"view": "bootstrap-edit-horizontal",
"ui": "bootstrap",
"options": {
"form": {
Expand Down
Loading

0 comments on commit b6384c6

Please sign in to comment.