X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=js%2FsystemConfig.js;h=82abaeeb9dbfc587fbc5739121fc70fb6afa252b;hp=fee6d367ed094f6f079dbbaf63d6c56441eef005;hb=87df74aaf1fc55047bac7ac234546db7547cf166;hpb=706ee842873fdceb9465cdf6a583176ab855fae2 diff --git a/js/systemConfig.js b/js/systemConfig.js index fee6d36..82abaee 100644 --- a/js/systemConfig.js +++ b/js/systemConfig.js @@ -13,7 +13,7 @@ var lines = src.split(/\n/); $.each(lines, function () { - var m = this.match(/^(\S+)\s+(\S+)$/); + var m = this.match(/^(\S+)\s+(\S+)$/); map[ m[1] ] = m[2]; }); @@ -63,39 +63,41 @@ parseUri.options.strictMode = true; var uri = parseUri(str); - return (uri.protocol != "" && + return (uri.protocol != "" && uri.authority != "" && - uri.path != "" && + uri.path != "" && uri.path.match(/\/$/) && - uri.query == "" && - uri.anchor == ""); + uri.query == "" && + uri.anchor == ""); }; + // FIXME: Don't let user to manipulate directly this structure. + // FIXME: Values may include spaces. var isValidMap = function (src) { - return src.match(/^\S+\s+\S+(?:\n\S+\s+\S+)*\n?$/) != null; + return src.match(/^(?:\S+\s+\S+(?:\n\S+\s+\S+)*\n?)?$/) != null; }; Rakka.getUserList = function () { - var users = []; - - $.ajax({ - type: "GET", - url: Rakka.baseURI + "users", - async: false, - beforeSend: function (req) { - Rakka.setAuthorization(req); - }, - success: function (xml) { - $(xml).find("user").each(function () { - users.push(this.getAttribute("id")); - }); - }, - error: function (req) { - throw new Error(req.status + " " + req.statusText); - } - }); - - return users; + var users = []; + + $.ajax({ + type: "GET", + url: Rakka.baseURI + "users", + async: false, + beforeSend: function (req) { + Rakka.setAuthorization(req); + }, + success: function (xml) { + $(xml).find("user").each(function () { + users.push(this.getAttribute("id")); + }); + }, + error: function (req) { + throw new Error(req.status + " " + req.statusText); + } + }); + + return users; }; Rakka.getSystemConfig = function () { @@ -132,152 +134,142 @@ }; var appendConfigPanel = function ($area) { - var conf = Rakka.getSystemConfig(); - $area.append($.H1({}, "Configuration")); - - var fldSiteName - = $.INPUT({type: "text", value: conf.siteName}); - - var fldBaseURI - = $.INPUT({type: "text", value: conf.baseURI}); - - var fldDefaultPage - = $.INPUT({type: "text", value: conf.defaultPage}); - - var fldStyleSheet - = $.INPUT({type: "text", value: conf.styleSheet}); - - var fldLanguages - = $.TEXTAREA({value: encoder_of.languages(conf.languages)}); - - var chkGlobalLock - = $.INPUT({type: "checkbox", checked: conf.globalLock}); - - var btnSave - = $.INPUT({type: "button", value: "Save"}); - - $(btnSave).click(function () { - var NS = "http://cielonegro.org/schema/Rakka/Config/1.0"; - var doc = document.implementation.createDocument(NS, "systemConfig", null); - var sc = doc.documentElement; - - var mkValue = function (path, value) { - var elem = doc.createElementNS(NS, "value"); - elem.setAttribute("path", path); - elem.appendChild(doc.createTextNode(value)); - return elem; - }; - - sc.appendChild(mkValue("siteName" , fldSiteName.value)); - sc.appendChild(mkValue("baseURI" , fldBaseURI.value)); - sc.appendChild(mkValue("defaultPage", fldDefaultPage.value)); - sc.appendChild(mkValue("styleSheet" , fldStyleSheet.value)); - sc.appendChild(mkValue("languages" , fldLanguages.value)); - sc.appendChild(mkValue("globalLock" , encoder_of["globalLock"](chkGlobalLock.checked))); - - Rakka.displayWaitingMessage("Submitting... please wait."); - - var url = Rakka.baseURI + "systemConfig"; - $.ajax({ type : "PUT", - url : url, - contentType: "text/xml", - data : doc, - processData: false, - beforeSend : function (req) { - Rakka.setAuthorization(req); - }, - success : function () { - cachedConf = null; - Rakka.hideWaitingMessage(); - Rakka.restoreScreen(); - }, - error : function (req) { - Rakka.hideWaitingMessage(); - - var $area = Rakka.switchScreen(); - $area.text("Error: " + req.status + " " + req.statusText); - } - }); - }); - - var btnCancel - = $.INPUT({type: "button", value: "Cancel"}); - - $(btnCancel).click(function () { - if (isDirty) { - if (window.confirm("Do you really want to discard changes?")) { - Rakka.restoreScreen(); - } - } - else { - Rakka.restoreScreen(); - } - }); - - var configPanel - = $.TABLE({className: "pageEditor"}, - $.TBODY({}, - $.TR({}, - $.TH({}, "Site name"), - $.TD({}, fldSiteName) - ), - $.TR({}, - $.TH({}, "Base URI"), - $.TD({}, fldBaseURI) - ), - $.TR({}, - $.TH({}, "Default page"), - $.TD({}, fldDefaultPage) - ), - $.TR({}, - $.TH({}, "Style sheet"), - $.TD({}, fldStyleSheet) - ), - $.TR({}, - $.TH({}, "Languages"), - $.TD({}, fldLanguages) - ), - $.TR({}, - $.TH({}, "Global lock"), - $.TD({}, - $.LABEL({}, - chkGlobalLock, - "Disallow guest users to edit pages.")) - ), - $.TR({}, - $.TH({}), - $.TD({}, btnSave, btnCancel) - ) - ) - ); - - var validate = function () { - var isValid = (function () { - if (!isValidBaseURI(fldBaseURI.value)) { - return false; - } - - if (fldDefaultPage.value.match(Rakka.rePageName) == null) { - return false; - } + var conf = Rakka.getSystemConfig(); + $area.append($.H1({}, "Configuration")); + + var fldSiteName + = $.INPUT({type: "text", value: conf.siteName}); + + var fldBaseURI + = $.INPUT({type: "text", value: conf.baseURI}); + + var fldDefaultPage + = $.INPUT({type: "text", value: conf.defaultPage}); + + var fldStyleSheet + = $.INPUT({type: "text", value: conf.styleSheet}); + + var fldLanguages + = $.TEXTAREA({value: encoder_of.languages(conf.languages)}); + + var chkGlobalLock + = $.INPUT({type: "checkbox", checked: conf.globalLock}); + + var btnSave + = $.INPUT({type: "button", value: "Save changes", disabled: "disabled"}); + + $(btnSave).click(function () { + var NS = "http://cielonegro.org/schema/Rakka/Config/1.0"; + var doc = document.implementation.createDocument(NS, "systemConfig", null); + var sc = doc.documentElement; + + var mkValue = function (path, value) { + var elem = doc.createElementNS(NS, "value"); + elem.setAttribute("path", path); + elem.appendChild(doc.createTextNode(value)); + return elem; + }; + + sc.appendChild(mkValue("siteName" , fldSiteName.value)); + sc.appendChild(mkValue("baseURI" , fldBaseURI.value)); + sc.appendChild(mkValue("defaultPage", fldDefaultPage.value)); + sc.appendChild(mkValue("styleSheet" , fldStyleSheet.value)); + sc.appendChild(mkValue("languages" , fldLanguages.value)); + sc.appendChild(mkValue("globalLock" , encoder_of["globalLock"](chkGlobalLock.checked))); + + Rakka.displayWaitingMessage("Submitting... please wait."); + + var url = Rakka.baseURI + "systemConfig"; + $.ajax({ type : "PUT", + url : url, + contentType: "text/xml", + data : doc, + processData: false, + beforeSend : function (req) { + Rakka.setAuthorization(req); + }, + success : function () { + cachedConf = null; + Rakka.hideWaitingMessage(); + Rakka.restoreScreen(); + }, + error : function (req) { + Rakka.hideWaitingMessage(); + + var $area = Rakka.switchScreen(); + $area.text("Error: " + req.status + " " + req.statusText); + } + }); + }); - if (fldStyleSheet.value.match(Rakka.rePageName) == null) { - return false; - } + var btnRevert + = $.INPUT({type: "button", value: "Revert changes", disabled: "disabled"}); - if (!isValidMap(fldLanguages.value)) { - return false; - } + $(btnRevert).click(function () { + if (window.confirm("Do you really want to discard changes?")) { + // FIXME: implement this + } + }); - return true; - })(); + var configPanel + = $.TABLE({className: "pageEditor"}, + $.TBODY({}, + $.TR({}, + $.TH({}, "Site name"), + $.TD({}, fldSiteName)), + $.TR({}, + $.TH({}, "Base URI"), + $.TD({}, fldBaseURI)), + $.TR({}, + $.TH({}, "Default page"), + $.TD({}, fldDefaultPage)), + $.TR({}, + $.TH({}, "Style sheet"), + $.TD({}, fldStyleSheet)), + $.TR({}, + $.TH({}, "Languages"), + $.TD({}, fldLanguages)), + $.TR({}, + $.TH({}, "Global lock"), + $.TD({}, + $.LABEL({}, + chkGlobalLock, + "Disallow guest users to edit pages."))), + $.TR({}, + $.TH({}), + $.TD({}, btnSave, btnRevert)))); + + var validate = function () { + var isValid = (function () { + if (!isValidBaseURI(fldBaseURI.value)) { + return false; + } + + if (fldDefaultPage.value.match(Rakka.rePageName) == null) { + return false; + } + + if (fldStyleSheet.value.match(Rakka.rePageName) == null) { + return false; + } + + if (!isValidMap(fldLanguages.value)) { + return false; + } + + return true; + })(); $(btnSave).attr({disabled: (isValid ? "" : "disabled")}); }; var isDirty = null; var makeDirty = function () { - isDirty = true; + if (!isDirty) { + $(btnRevert).attr({disabled: ""}); + isDirty = true; + } + validate(); }; $(fldSiteName) @@ -285,8 +277,7 @@ .add(fldDefaultPage) .add(fldStyleSheet) .add(fldLanguages) - .change(validate) - .keyup(validate) + .keyup(makeDirty) .change(makeDirty); $area.append(configPanel); @@ -294,52 +285,49 @@ var appendUsersPanel = function ($area) { $area.append($.H2({}, "Users")); - $area.append($.H3({}, "Existing Users")); + $area.append($.H3({}, "Existing Users")); - var tbody = $.TBODY(); + var tbody = $.TBODY(); - var usersPanel + var usersPanel = $.TABLE({className: "pageEditor"}, - $.THEAD({}, - $.TR({}, - $.TH({}, "User ID"), - $.TH({}, "Change Password"), - $.TH({}, "Delete User") - ) - ), - tbody - ); - - var updateUserList = function () { + $.THEAD({}, + $.TR({}, + $.TH({}, "User ID"), + $.TH({}, "Change Password"), + $.TH({}, "Delete User"))), + tbody); + + var updateUserList = function () { var users = Rakka.getUserList(); - $(tbody).empty(); + $(tbody).empty(); - for (var i = 0; i < users.length; i++) { - var pass1 = $.INPUT({type: "password"}); - var pass2 = $.INPUT({type: "password"}); - var change = $.INPUT({type: "button", value: "Change"}); + for (var i = 0; i < users.length; i++) { + var pass1 = $.INPUT({type: "password"}); + var pass2 = $.INPUT({type: "password"}); + var change = $.INPUT({type: "button", value: "Change"}); - var chpass = $.TABLE({className: "pageEditor"}, + var chpass = $.TABLE({className: "pageEditor"}, $.TR({}, - $.TD({}, pass1), - $.TD({rowSpan: 2}, change)), - $.TR({}, - $.TD({}, pass2))); + $.TD({}, pass1), + $.TD({rowSpan: 2}, change)), + $.TR({}, + $.TD({}, pass2))); - var delUser = $.INPUT({type: "button", value: "Delete"}); + var delUser = $.INPUT({type: "button", value: "Delete"}); var validatePassword = function () { var isValid = (function () { - if (pass1.value == "") { - return false; - } + if (pass1.value == "") { + return false; + } - if (pass1.value != pass2.value) { - return false; - } + if (pass1.value != pass2.value) { + return false; + } - return true; + return true; })(); $(change).attr({disabled: (isValid ? "" : "disabled")}); }; @@ -349,55 +337,55 @@ .change(validatePassword) .keyup(validatePassword); - $.each(users, function () { - var id = users[i]; - var tr = $.TR({}, - $.TD({}, id), - $.TD({}, chpass), - $.TD({}, delUser) - ); - tbody.appendChild(tr); - }); - } - }; - updateUserList(); - - $area.append(usersPanel); - - $area.append($.H3({}, "Add new user")); - - var userID = $.INPUT({type: "text"}); - var pass1 = $.INPUT({type: "password"}); - var pass2 = $.INPUT({type: "password"}); - var addUser = $.INPUT({type: "button", value: "Add"}); - var addUserPanel = $.TABLE({className: "pageEditor"}, + $.each(users, function () { + var id = users[i]; + var tr = $.TR({}, + $.TD({}, id), + $.TD({}, chpass), + $.TD({}, delUser) + ); + tbody.appendChild(tr); + }); + } + }; + updateUserList(); + + $area.append(usersPanel); + + $area.append($.H3({}, "Add new user")); + + var userID = $.INPUT({type: "text"}); + var pass1 = $.INPUT({type: "password"}); + var pass2 = $.INPUT({type: "password"}); + var addUser = $.INPUT({type: "button", value: "Add"}); + var addUserPanel = $.TABLE({className: "pageEditor"}, $.TR({}, - $.TH({}, "User ID"), - $.TD({}, userID)), - $.TR({}, - $.TH({}, "Password"), - $.TD({}, pass1)), - $.TR({}, - $.TH({}, "Password (retype)"), - $.TD({}, pass2)), - $.TR({}, - $.TH({}), - $.TD({}, addUser))); - - $area.append(addUserPanel); + $.TH({}, "User ID"), + $.TD({}, userID)), + $.TR({}, + $.TH({}, "Password"), + $.TD({}, pass1)), + $.TR({}, + $.TH({}, "Password (retype)"), + $.TD({}, pass2)), + $.TR({}, + $.TH({}), + $.TD({}, addUser))); + + $area.append(addUserPanel); }; Rakka.showConfigPanel = function () { var $area = Rakka.switchScreen(); - appendConfigPanel($area); - appendUsersPanel($area); + appendConfigPanel($area); + appendUsersPanel($area); }; $(document).ready(function () { - $("input.configButton") - .click(function () { - Rakka.showConfigPanel(); - }); - }); + $("input.configButton") + .click(function () { + Rakka.showConfigPanel(); + }); + }); })(); \ No newline at end of file