-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from mcrossley/master
B3054 updates
- Loading branch information
Showing
26 changed files
with
1,339 additions
and
136 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| <!doctype html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Cumulus MX</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <meta name="description" content=""> | ||
|
|
||
| <link href="css/main.css" rel="stylesheet"> | ||
|
|
||
| <!-- jquery --> | ||
| <script src="lib/jquery/jquery-latest.min.js"></script> | ||
| <script src="lib/jquery/jquery.tmpl.js"></script> | ||
|
|
||
| <!-- Bootstrap --> | ||
| <link href="lib/bootstrap/css/bootstrap.css" rel="stylesheet"> | ||
| <link href="lib/bootstrap/css/bootstrap-theme.css" rel="stylesheet" /> | ||
| <script src="lib/bootstrap/js/bootstrap.js"></script> | ||
|
|
||
| <!-- Alpaca --> | ||
| <script src="lib/alpaca/alpaca.js"></script> | ||
| <link href="lib/alpaca/alpaca.css" rel="stylesheet" /> | ||
|
|
||
| <!-- Alpaca support for Bootstrap --> | ||
| <link href="lib/alpaca/alpaca-bootstrap.css" rel="stylesheet" /> | ||
|
|
||
| <!-- Custom Files --> | ||
|
|
||
| <link href="css/cumulus.css" rel="stylesheet"> | ||
|
|
||
| <style type="text/css"> | ||
| body { | ||
| padding-top: 60px; | ||
| } | ||
| .top-buffer { margin-top:40px; } | ||
| .radio {display:inline-block;padding-left:40px;vertical-align: middle;margin-top:10px;} | ||
| .radio + .radio, .checkbox + .checkbox {margin-top: 10px;} | ||
| textarea {background: #fff} | ||
| </style> | ||
|
|
||
| <script> | ||
|
|
||
| $(document).ready(function () { | ||
| $.ajax({url: "api/settings/version.json", dataType:"json", success: function (result) { | ||
| $('#Version').text(result.Version); | ||
| $('#Build').text(result.Build); | ||
| }}); | ||
|
|
||
| load(); | ||
| }); | ||
|
|
||
| function load() { | ||
| $.ajax({ | ||
| url: 'api/edit/currentcond.json' | ||
| }).done(function(resp) { | ||
| //$('#inputCurrCond').val(resp.data); | ||
| $('#inputCurrCond')[0].value = resp.data; | ||
| }).fail(function(jqXHR, textStatus) { | ||
| alert('Something went wrong loading the text! (' + textStatus + ')'); | ||
| }); | ||
| } | ||
|
|
||
| function applyEntry() { | ||
| var body = $('#inputCurrCond')[0].value; | ||
| body = body.replace(/\n/g, ' '); | ||
| $.ajax({ | ||
| url : 'api/edit/currcond', | ||
| type : 'POST', | ||
| data : body, | ||
| dataType: 'json' | ||
| }).done(function (result) { | ||
| console.log(result.result); | ||
| // notify user | ||
| if (result.result === 'Success') { | ||
| alert('Entry added/updated OK.'); | ||
| load(); | ||
| } else { | ||
| alert('Failed to add/update entry!'); | ||
| } | ||
| } | ||
| ).fail(function(jqXHR, textStatus) { | ||
| alert('Something went wrong updating the text! (' + textStatus + ')'); | ||
| }); | ||
| } | ||
| </script> | ||
| </head> | ||
| <body> | ||
| <!-- NAVIGATION MENU --> | ||
| <div class="navbar-nav navbar-inverse navbar-fixed-top"> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| </div> | ||
| <div class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li><a href="index.html">Dashboard</a></li> | ||
| <li><a href="now.html">Now</a></li> | ||
| <li><a href="gauges.html">Gauges</a></li> | ||
| <li><a href="charts.html">Charts</a></li> | ||
| <li><a href="todayyest.html">Today/Yesterday</a></li> | ||
| <li><a href="records.html">Records</a></li> | ||
| <li><a href="extra.html">Extra sensors</a></li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Data logs<span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="datalogs.html">Data logs</a></li> | ||
| <li><a href="extradatalogs.html">Extra data logs</a></li> | ||
| <li><a href="dayfileviewer.html">Dayfile</a></li> | ||
| </ul> | ||
| </li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="noaamonthreport.html">NOAA Month Report</a></li> | ||
| <li><a href="noaayearreport.html">NOAA Year Report</a></li> | ||
| </ul> | ||
| </li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings<span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="stationsettings.html">Station settings</a></li> | ||
| <li><a href="internetsettings.html">Internet settings</a></li> | ||
| <li><a href="extrawebfiles.html">Extra web files</a></li> | ||
| <li><a href="calibrationsettings.html">Calibration settings</a></li> | ||
| <li><a href="noaasettings.html">NOAA settings</a></li> | ||
| <li><a href="mysqlsettings.html">MySQL settings</a></li> | ||
| </ul> | ||
| </li> | ||
| <li class="dropdown active"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Edit<span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="raintodayeditor.html">Today's rain</a></li> | ||
| <li><a href="diaryeditor.html">Weather Diary</a></li> | ||
| <li><a href="currentcondeditor.html">Current Conditions</a></li> | ||
| <li><a href="alltimerecseditor.html">All Time Records</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div><!--/.nav-collapse --> | ||
| </div> | ||
| </div> | ||
| <!-- END NAVIGATION MENU --> | ||
|
|
||
| <div class="container"> | ||
| <h1>Current Conditions</h1> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <label for="inputCurrCond">Text to display - Note new lines will be replaced by spaces</label> | ||
| <textarea wrap="hard" id="inputCurrCond" style="height: 120px"></textarea> | ||
| <button type="button" class="btn btn-default" id="apply-button" onclick="applyEntry()" style="margin:10px;">Apply</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| <!-- FOOTER --> | ||
| <div id="footerwrap"> | ||
| <footer class="clearfix"></footer> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-sm-12 col-lg-12"> | ||
| <!--<p><img src="img/logo.png" alt=""></p>--> | ||
| <p>Cumulus MX <span id="Version"></span> b<span id="Build"></span></p> | ||
| </div> | ||
| </div><!-- /row --> | ||
| </div><!-- /container --> | ||
| </div><!-- /footerwrap --> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.