-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/firmware_mod/www/js/control.js b/firmware_mod/www/js/control.js
index 53faa6d..465ab7e 100755
--- a/firmware_mod/www/js/control.js
+++ b/firmware_mod/www/js/control.js
@@ -1,6 +1,6 @@
function timedRefresh(timeoutPeriod) {
timeoutPeriod -= 1;
- $('#message').text("Rebooting ... wait..." + timeoutPeriod);
+ $('#message').text("Rebooting ... please wait..." + timeoutPeriod);
if (timeoutPeriod == 0) {
window.location.href = window.location.href;
@@ -57,53 +57,53 @@ function showupdatepage(result) {
var update_status = parseInt(update[1],10);
if (update_status == 0) {
- $('#updatemsg').html("You have already the lastest version from branch " + update[0])
+ $('#updatemsg').html("You have already the lastest version from the " + update[0] + " branch")
if (update[0] == "master") {
- $('#updatemsg').append('
\
+ $('#updatemsg').append('
\
');
}
else {
- $('#updatemsg').append('
\
+ $('#updatemsg').append('
\
');
}
}
else if (update_status == -1) {
- $('#updatemsg').html("No version file found.
You can update the firmware on this camera to the latest from
Github repository.
Settings will be retained after update.")
+ $('#updatemsg').html("No version file found.
You can update the firmware on this camera to the latest version from
Github repository.
Settings will be retained after update.")
$('#updatemsg').append('\
-
\
-
');
+
\
+
');
}
else if (update_status > 0) {
$('#updatemsg').html("You are "+ update_status +" commits behind "+ update[0] + " branch");
if (update[0] == "master") {
- $('#updatemsg').append('
');
- $('#updatemsg').append('
\
+ $('#updatemsg').append('
');
+ $('#updatemsg').append('
\
');
}
else {
- $('#updatemsg').append('
');
- $('#updatemsg').append('
\
+ $('#updatemsg').append('
');
+ $('#updatemsg').append('
\
');
}
}
else {
- $('#updatemsg').text("There is a problem with your VERSION file. Please do a full update to create a correct VERSION file.");
+ $('#updatemsg').text("There is a problem with your VERSION file. Please do a full update to create a valid VERSION file.");
$('#updatemsg').append('\
-
\
-
');
+
\
+
');
}
});
}
@@ -116,7 +116,7 @@ function start(branch,mode) {
//Open modal window
document.getElementById('modal_box').style.display='block'
$('#modal_title').html('Update in progress');
- $('#modal_content').html('
Please note: at the end of this process the camera will reboot without notice
\
+ $('#modal_content').html('
Please note: at the end of this process the camera will reboot without notice!
\
');
var url = 'cgi-bin/action.cgi?cmd=update&release='+branch+'&mode='+mode;
@@ -129,7 +129,7 @@ function start(branch,mode) {
if (result.length > 0) {
update(false);
} else {
- $('#modal_content').text("Error starting update progress");
+ $('#modal_content').text("Error starting update process!!!");
}
});
}
diff --git a/firmware_mod/www/js/info.js b/firmware_mod/www/js/info.js
index 6bb2c47..c150f3b 100755
--- a/firmware_mod/www/js/info.js
+++ b/firmware_mod/www/js/info.js
@@ -11,7 +11,7 @@ function getConfig() {
}
-//Get network informations
+//Get network information
function getInfo(infoname) {
$.get("cgi-bin/info2.cgi", {cmd: "get_info", info: infoname}, function(config){
config = config.replace(/\n/g,'
');
diff --git a/firmware_mod/www/js/sdcard.js b/firmware_mod/www/js/sdcard.js
index 86f8e64..131b3e0 100755
--- a/firmware_mod/www/js/sdcard.js
+++ b/firmware_mod/www/js/sdcard.js
@@ -30,7 +30,7 @@ function getFiles(dir) {
");
var config_all = config.split("\n");
if ( config_all.length == 1)
- $('#'+dir).html("No file found
");
+ $('#'+dir).html("No files found
");
for (var i = 0; i < config_all.length-1; i++) {
var config_info = config_all[i].split("#:#");
var file_info = config_info[3].split(".");
@@ -45,7 +45,7 @@ function getFiles(dir) {
\
\
"+html_photo+"\
- ");
+ ");
}
$('#'+dir).append("