Skip to content

Commit

Permalink
HTML Setup: Switch to using just one Status/Error popup.
Browse files Browse the repository at this point in the history 
Before there was a reason to have two, but now we only need one.

There is a lingering small bug where a modal dialog overlays the status div, but it just makes it hard to read, not impossible.  I'll see about a fix.
  • Loading branch information
Robert McNamara committed Apr 8, 2011
1 parent 458c85e commit 9e9810e
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 52 deletions.
2 changes: 1 addition & 1 deletion mythtv/html/css/site.css
View file
Expand Up @@ -73,7 +73,7 @@
#header_error {
position: fixed;
text-align: left;
bottom: 30px;
bottom: 80px;
left: 100px;
right: 100px;
height: 38px;
Expand Down
16 changes: 8 additions & 8 deletions mythtv/html/js/databaseutil.js
View file
Expand Up @@ -5,25 +5,25 @@ function checkDatabase() {
{ Repair: repair },
function(data) {
if (data.bool == "true")
setHeaderStatusMessage("Database is healthy.");
setStatusMessage("Database is healthy.");
else
setHeaderErrorMessage("Error while checking database, check backend logs.");
setErrorMessage("Error while checking database, check backend logs.");
}, "json").error(function(data) {
setHeaderErrorMessage("Error while checking database, check backend logs.");
setErrorMessage("Error while checking database, check backend logs.");
});
setHeaderStatusMessage("Checking database tables...");
setStatusMessage("Checking database tables...");
}

function backupDatabase() {
$.post("/Myth/BackupDatabase", {},
function(data) {
if (data.bool == "true")
setHeaderStatusMessage("Database backup completed successfully.");
setStatusMessage("Database backup completed successfully.");
else
setHeaderErrorMessage("Database backup failed, check backend logs.");
setErrorMessage("Database backup failed, check backend logs.");
}, "json").error(function(data) {
setHeaderErrorMessage("Database backup failed, check backend logs.");
setErrorMessage("Database backup failed, check backend logs.");
});
setHeaderStatusMessage("Database backup started...");
setStatusMessage("Database backup started...");
}

12 changes: 6 additions & 6 deletions mythtv/html/js/util.qjs
View file
Expand Up @@ -101,26 +101,26 @@ function loadSetupPage(pageName) {

function loadEditWindow(contentURL, jsURL) {
loadSetupJavascript();
clearEditMessages();
clearMessages();
loadDiv("edit", contentURL, jsURL);
showEditWindow();
}

function setHeaderStatusMessage(message) {
function setStatusMessage(message) {
$("#header_status_message").html(message);
$("#header_status").show();
setTimeout('$("#header_status").hide("slow")', statusMessageTimeout);
}

function setHeaderErrorMessage(message) {
function setErrorMessage(message) {
$("#header_error_message").html(message);
$("#header_error").show();
setTimeout('$("#header_error").hide("slow")', errorMessageTimeout);
}

function clearHeaderMessages() {
$("#header_status").html("");
$("#header_error").html("");
function clearMessages() {
$("#header_status_message").html("");
$("#header_error_message").html("");
}

function preloadTabs(tabs) {
Expand Down
4 changes: 2 additions & 2 deletions mythtv/html/setup/js/jobqueue.js
View file
Expand Up @@ -67,10 +67,10 @@ function saveJobEditor() {
}

if (errorMessage.length)
setEditErrorMessage(errorMessage);
setErrorMessage(errorMessage);

if (descSavedOK && cmdSavedOK)
setEditStatusMessage("Save Successful");
setStatusMessage("Save Successful");
}

setupTabs("jobqueuetabs");
Expand Down
10 changes: 5 additions & 5 deletions mythtv/html/setup/js/password.js
View file
Expand Up @@ -6,21 +6,21 @@ function changePassword() {
var newPasswordConfirm = $("#newPasswordConfirm").val();

if (newPassword.length == 0) {
setHeaderErrorMessage("ERROR: New password is empty.");
setErrorMessage("New password is empty.");
} else if (newPassword != newPasswordConfirm) {
setHeaderErrorMessage("ERROR: New passwords do not match.");
setErrorMessage("New passwords do not match.");
} else {
$.post("/Myth/ChangePassword",
{ UserName: "admin",
OldPassword: oldPassword,
NewPassword: newPassword },
function(data) {
if (data.bool == "true")
setHeaderStatusMessage("Password successfully changed.");
setStatusMessage("Password successfully changed.");
else
setHeaderErrorMessage("Error changing password, check backend logs for detailed information.");
setErrorMessage("Error changing password, check backend logs for detailed information.");
}, "json").error(function(data) {
setHeaderErrorMessage("Error changing password, check backend logs for detailed information.");
setErrorMessage("Error changing password, check backend logs for detailed information.");
});
}
}
Expand Down
21 changes: 2 additions & 19 deletions mythtv/html/setup/js/setup.js
View file
Expand Up @@ -46,23 +46,6 @@ function hideEditWindow() {
$("#edit").hide();
}

function clearEditMessages() {
setEditStatusMessage("");
setEditErrorMessage("");
}

function setEditStatusMessage(message) {
$("#editErrorMessage").html("");
$("#editStatusMessage").html(message);
setTimeout('$("#editStatusMessage").html("")', statusMessageTimeout);
}

function setEditErrorMessage(message) {
$("#editStatusMessage").html("");
$("#editErrorMessage").html(message);
setTimeout('$("#editErrorMessage").html("")', errorMessageTimeout);
}

function submitConfigForm(form) {
var data = $("#config_form_" + form).serialize();
var url = $("#__config_form_action__").val();
Expand All @@ -85,9 +68,9 @@ function submitConfigForm(form) {
$.ajaxSetup({ async: true });

if (savedOK)
setHeaderStatusMessage("Changes saved successfully");
setStatusMessage("Changes saved successfully");
else
setHeaderErrorMessage("Error saving changes!");
setErrorMessage("Error saving changes!");
}

function setSettingInputValues(divName) {
Expand Down
12 changes: 6 additions & 6 deletions mythtv/html/setup/js/storagegroups.js
View file
Expand Up @@ -91,10 +91,10 @@ function addNewStorageGroup() {
if (addStorageGroupDir(group, dir, host)) {
$("#storagegrouptabs").tabs("remove", sgTabCount);
$("#sgAddNewGroupLink").show();
setHeaderStatusMessage("Storage Group Directory save Succeeded.");
setStatusMessage("Storage Group Directory save Succeeded.");
initStorageGroups(group);
} else {
setHeaderErrorMessage("Storage Group Directory save Failed!");
setErrorMessage("Storage Group Directory save Failed!");
}
}

Expand All @@ -117,10 +117,10 @@ function saveDir(tabID) {
appendTabRow(tabID, 0, group, host, dir);
$("#sgtabs-" + tabID + "-add").css("display", "");
$("#sgtabs-" + tabID + "-edit").css("display", "none");
setHeaderStatusMessage("Storage Group Directory save Succeeded.");
setStatusMessage("Storage Group Directory save Succeeded.");
$("#sgtabs-" + tabID + "-edit-dirname").val("");
} else {
setHeaderErrorMessage("Storage Group Directory save Failed!");
setErrorMessage("Storage Group Directory save Failed!");
}
}

Expand All @@ -136,13 +136,13 @@ function removeStorageGroupTableRow( tabID, rowID ) {
var dir = $("#" + rowID).find("td").eq(2).html();

if (removeStorageGroupDir(group, dir, host)) {
setHeaderStatusMessage("Remove Storage Group Directory Succeeded.");
setStatusMessage("Remove Storage Group Directory Succeeded.");
$("#" + rowID).remove();
if ($('#sgtable-' + tabID + ' tr').length == 1) {
initStorageGroups(); /* could optimize this and not reload */
}
} else {
setHeaderErrorMessage("Remove Storage Group Directory Failed!");
setErrorMessage("Remove Storage Group Directory Failed!");
}
}

Expand Down
10 changes: 5 additions & 5 deletions mythtv/html/setup/js/wizard.js
View file
Expand Up @@ -6,7 +6,7 @@ function testDBSettings() {
var name = $("#dbName").val();
var port = $("#dbPort").val();

clearEditMessages();
clearMessages();

if (name == null)
name = "mythconverg";
Expand All @@ -19,12 +19,12 @@ function testDBSettings() {
function(data) {
if (data.bool == "true") {
result = 1;
setEditStatusMessage("Database connection succeeded!");
setStatusMessage("Database connection succeeded!");
}
else
setEditErrorMessage("Database connection failed!");
setErrorMessage("Database connection failed!");
}, "json").error(function(data) {
setEditErrorMessage("Database connection failed!");
setErrorMessage("Database connection failed!");
});

return result;
Expand All @@ -46,7 +46,7 @@ function validateSettingsInDiv(divName) {

function saveWizard() {
if (!validateSettingsInDiv("wizard-network")) {
setEditErrorMessage("Network Setup has an error.");
setErrorMessage("Network Setup has an error.");
}

alert("Saving is not fully functional, the database has not been modified!");
Expand Down

0 comments on commit 9e9810e

Please sign in to comment.