git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
control.html
diff --git
a/testing/MCTXWeb/public_html/control.html
b/testing/MCTXWeb/public_html/control.html
index
0a27efc
..
ecefd5a
100644
(file)
--- a/
testing/MCTXWeb/public_html/control.html
+++ b/
testing/MCTXWeb/public_html/control.html
@@
-33,6
+33,7
@@
});
$("#errorlog").setErrorLog();
});
$("#errorlog").setErrorLog();
+ $("#strain-graphs").setStrainGraphs();
});
})
});
})
@@
-128,6
+129,12
@@
<b>Error and warning messages</b><br>
<textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
</div>
<b>Error and warning messages</b><br>
<textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
</div>
+ <div class="widget">
+ <div class="title">Strain gauges</div>
+ <div id="strain-graphs" class="graph">
+ <!-- Strain graph placeholder -->
+ </div>
+ </div>
</div>
<!-- End main content -->
</div>
</div>
<!-- End main content -->
</div>
UCC
git Repository :: git.ucc.asn.au