X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=js%2FeditPage.js;h=c512fcc0d78c1556310b584fb7022933232c3d26;hb=fb86cb6941e466fd43ce45338024c79d0fdb33a2;hp=f0d3d507021ce012ea140ecd1ec256834726b516;hpb=0447be1b59496ca4266226ed52d264009cf41899;p=Rakka.git

diff --git a/js/editPage.js b/js/editPage.js
index f0d3d50..c512fcc 100644
--- a/js/editPage.js
+++ b/js/editPage.js
@@ -15,30 +15,36 @@
             url    : Rakka.baseURI + pageName + ".xml",
             success: function (pageXml) {
                 Rakka.hideWaitingMessage();
-            
-                var $page       = $(pageXml).find("page");
-                var oldRevision = $page.attr("revision");
-                var defaultType
-                    = $page.attr("isBinary") == "yes"          ? "binary"
-                    : $page.attr("type")     == "text/x-rakka" ? "rakka"
-                    : $page.attr("type")     == "text/css"     ? "css"
-                    : $page.attr("redirect") != null           ? "redirect"
-                    :                                            "unknown"
-                    ;
-                var isLocked    = $page.attr("isLocked") == "yes";
-                var source
-                    = $page.attr("redirect") != null ? $page.attr("redirect")
-                    : $page.find("textData").text()
-                    ;
-                var summary     = $page.find("summary").text();
+
+                if (pageXml.documentElement.tagName == "page") {
+                    var $page       = $(pageXml).find("page");
+                    var oldRevision = $page.attr("revision");
+                    var defaultType
+                        = $page.attr("isBinary") == "yes"          ? "binary"
+                        : $page.attr("type")     == "text/x-rakka" ? "rakka"
+                        : $page.attr("type")     == "text/css"     ? "css"
+                        : $page.attr("redirect") != null           ? "redirect"
+                        :                                            "unknown"
+                        ;
+                    var lang        = $page.attr("lang");
+                    var isLocked    = $page.attr("isLocked") == "yes";
+                    var source
+                        = $page.attr("redirect") != null ? $page.attr("redirect")
+                        : $page.find("textData").text()
+                        ;
+                    var summary     = $page.find("summary").text();
                 
-                displayPageEditor(pageName, oldRevision, defaultType, isLocked, source, summary);
+                    displayPageEditor(pageName, oldRevision, defaultType, lang, isLocked, source, summary);
+                }
+                else {
+                    displayPageEditor(pageName, null, "rakka", null, false, null, "");
+                }
             },
             error  : function (req) {
                 Rakka.hideWaitingMessage();
                 
                 if (req.status == 404) {
-                    displayPageEditor(pageName, null, "rakka", false, null, "");
+                    displayPageEditor(pageName, null, "rakka", null, false, null, "");
                 }
                 else {
                     $area.text("Error: " + req.status + " " + req.statusText);
@@ -48,10 +54,10 @@
     };
 
     Rakka.newPage = function () {
-        displayPageEditor("", null, "rakka", false, null, "");
+        displayPageEditor("", null, "rakka", null, false, null, "");
     };
 
-    var displayPageEditor = function (pageName, oldRevision, defaultType, isLocked, source, summary) {
+    var displayPageEditor = function (pageName, oldRevision, defaultType, lang, isLocked, source, summary) {
         var $area = Rakka.switchScreen();
 
         $previewHeader = $( $.H1({}, "Preview") );
@@ -74,8 +80,8 @@
         $(fldPageName).change(makeDirty);
 
         var chkIsLocked
-            = $.INPUT({type   : "checkbox",
-                       checked: (isLocked ? "checked" : "")});
+            = $.INPUT({type    : "checkbox",
+                       checked : (isLocked ? "checked" : "")});
 
         $(chkIsLocked).change(makeDirty);
 
@@ -115,6 +121,34 @@
 
         $(btnTypeRedirect).change(makeDirty);
 
+        var selPageLang
+            = $.SELECT({},
+                       $.OPTION({value: ""}, "(unspecified)"),
+                       (function () {
+                           var options = [];
+                           
+                           $.each(Rakka.getSystemConfig().languages, function (tag, name) {
+                               options.push(
+                                   $.OPTION({value: tag}, name));
+                           });
+
+                           return options;
+                       })());
+
+        $(selPageLang).change(makeDirty);
+
+        if (lang == null || lang == "") {
+            $(selPageLang).val($("html").attr("xml:lang"));
+        }
+        else {
+            $(selPageLang).val(lang);
+        }
+
+        var trPageLang
+            = $.TR({},
+                   $.TH({}, "Page language"),
+                   $.TD({}, selPageLang));
+
         var fldSummary
             = $.TEXTAREA({className: "summary"}, summary);
 
@@ -178,6 +212,7 @@
                     fldPageName.value,
                     chkIsLocked.checked,
                     "text/x-rakka",
+                    $(selPageLang).val(),
                     fldSummary.value,
                     fldRakkaSource.value);
             }
@@ -188,6 +223,7 @@
                     fldPageName.value,
                     chkIsLocked.checked,
                     "text/css",
+                    $(selPageLang).val(),
                     fldSummary.value,
                     fldCSSSource.value);
             }
@@ -197,6 +233,7 @@
                     oldRevision,
                     fldPageName.value,
                     chkIsLocked.checked,
+                    $(selPageLang).val(),
                     fldSummary.value,
                     fldUploadFile.value);
             }
@@ -235,24 +272,28 @@
 
         var updateTRContent = function () {
             if (btnTypeRakka.checked) {
+                $(trPageLang).show();
                 $(trSummary).show();
                 $(trContent).find("th").text("Wiki source");
                 $(trContent).find("td").empty().append(fldRakkaSource);
                 $(btnPreview).show();
             }
             else if (btnTypeCSS.checked) {
+                $(trPageLang).show();
                 $(trSummary).show();
                 $(trContent).find("th").text("CSS source");
                 $(trContent).find("td").empty().append(fldCSSSource);
                 $(btnPreview).hide();
             }
             else if (btnTypeBinary.checked) {
+                $(trPageLang).show();
                 $(trSummary).show();
                 $(trContent).find("th").text("File");
                 $(trContent).find("td").empty().append(fldUploadFile);
                 $(btnPreview).show();
             }
             else if (btnTypeRedirect.checked) {
+                $(trPageLang).hide();
                 $(trSummary).hide();
                 $(trContent).find("th").text("Destination Page");
                 $(trContent).find("td").empty().append(fldRedirect);
@@ -304,6 +345,7 @@
                                             )
                                        )
                                   ),
+                              trPageLang,
                               trSummary,
                               trContent,
                               $.TR({},
@@ -320,6 +362,10 @@
 
         $area.append(pageEditor);
 
+        if (!Rakka.isLoggedIn() || Rakka.isGlobalLocked) {
+            $(trIsLocked).hide();
+        }
+
         isDirty = false;
     };
 
@@ -385,7 +431,7 @@
         Rakka.scrollToTopLeft();
     };
 
-    var submitTextPage = function (pageName, oldRevision, givenPageName, isLocked, mimeType, summary, text) {
+    var submitTextPage = function (pageName, oldRevision, givenPageName, isLocked, mimeType, lang, summary, text) {
         var doc = document.implementation.createDocument(
             "http://cielonegro.org/schema/Rakka/Page/1.0", "page", null);
 
@@ -408,7 +454,11 @@
         page.setAttribute("isLocked", isLocked ? "yes" : "no");
         page.setAttribute("type", mimeType);
 
-        if (summary != null) {
+        if (lang != null && lang != "") {
+            page.setAttribute("lang", lang);
+        }
+
+        if (summary != null && summary != "") {
             var s = doc.createElement("summary");
             s.appendChild(
                 doc.createTextNode(summary));
@@ -445,7 +495,7 @@
         });
     };
 
-    var submitBinaryPage = function (pageName, oldRevision, givenPageName, isLocked, summary, path) {
+    var submitBinaryPage = function (pageName, oldRevision, givenPageName, isLocked, lang, summary, path) {
         var doc = document.implementation.createDocument(
             "http://cielonegro.org/schema/Rakka/Page/1.0", "page", null);
 
@@ -468,6 +518,10 @@
         page.setAttribute("isLocked", isLocked ? "yes" : "no");
         page.setAttribute("type", "");
 
+        if (lang != null && lang != "") {
+            page.setAttribute("lang", lang);
+        }
+
         if (summary != null) {
             var s = doc.createElement("summary");
             s.appendChild(