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 pull request #83 from jtanx/master
[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
18769d2
..
034a50c
100644
(file)
--- a/
testing/MCTXWeb/public_html/control.html
+++ b/
testing/MCTXWeb/public_html/control.html
@@
-18,9
+18,10
@@
$(document).ready(function () {
$("form").submit(function () { //Prevent form submit globally
return false;
$(document).ready(function () {
$("form").submit(function () { //Prevent form submit globally
return false;
- }).each(function () {
- this.reset();
- });
+ }).trigger("reset"); //Reset forms
+
+ //Force enable start buttons if previously disabled
+ $("#start-controls input[type='button']").removeAttr("disabled");
//Set the status updated
$("#state-exp").setStatusUpdater();
//Set the status updated
$("#state-exp").setStatusUpdater();
@@
-106,6
+107,7
@@
<div id="logout-container">
<form action="#">
<div>
<div id="logout-container">
<form action="#">
<div>
+ <input type="button" id="change-password" value="Change password">
<input type="button" id="logout" value="Logout">
</div>
</form>
<input type="button" id="logout" value="Logout">
</div>
</form>
@@
-181,7
+183,6
@@
</p>
<p class="centre">
</p>
<p class="centre">
-
<input type="button" name="start_explode" value="Explode test">
<input type="button" name="start_strain" value="Strain test">
</p>
<input type="button" name="start_explode" value="Explode test">
<input type="button" name="start_strain" value="Strain test">
</p>
UCC
git Repository :: git.ucc.asn.au