Merge branch 'platal-0.9.17'

[platal.git] / htdocs / javascript / xorg.js

diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index cd6d253..e8b7952 100644 (file)
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -160,7 +160,7 @@ function popWin(theNode,w,h) {
 function goodiesPopup(node) {
     if (node.href.indexOf('ical') > -1) {
         __goodies_popup(node, __goodies_ical_sites, 'Calendrier iCal');
-    } else if (node.href.indexOf('rss') > -1 && (node.href.indexOf('xml') > -1 || node.href.indexOf('hash'))) {
+    } else if (node.href.indexOf('rss') > -1 && node.href.indexOf('prefs/rss') < 0 &&  (node.href.indexOf('xml') > -1 || node.href.indexOf('hash'))) {
         __goodies_popup(node, __goodies_rss_sites, 'Fil rss');
     }
 }
@@ -299,7 +299,7 @@ function getType(char) {
     }
 }
 
-function checkPassword(box) {
+function checkPassword(box, okLabel) {
     var prev = 0;
     var prop = 0;
     var pass = box.value;
@@ -328,28 +328,31 @@ function checkPassword(box) {
         prop = 0;
     }
     if (prop >= 60) {
-        if (prop == 100) {
-            color = "#47f";
-        } else {
-            color = "#4f4";
-        }
+        color = "#4f4";
+        bgcolor = "#050";
         ok = true;
     } else if (prop >= 40) {
         color = "#ff4";
-        ok = false;
+        bgcolor = "#750";
+        ok = true;
     } else {
         color = "#f20";
+        bgcolor = "#700";
         ok = false;
     }
     $("#passwords_measure")
-        .stop()
-        .animate({ width: prop + "%",
-                   backgroundColor: color
-                 }, 750);
+           .stop()
+           .animate({ width: prop + "%",
+                      backgroundColor: color
+                    }, 750)
+           .parent().stop()
+                    .animate({ backgroundColor: bgcolor }, 750);
     var submitButton = $(":submit[@name='" + passwordprompt_submit + "']");
-    if (ok) {
+    if (ok && pass.length >= 6) {
+        submitButton.attr("value", okLabel);
         submitButton.removeAttr("disabled");
     } else {
+        submitButton.attr("value", "Mot de passe trop faible");
         submitButton.attr("disabled", "disabled");
     }
 }