X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageProfile.js;h=c5ea5df3285e16566e22fbd45f544795bb0f1f73;hp=fa7235b48e1fc7908760df71eefaf9e9d75ff7a6;hb=cb02531d4a4b217997db3fdfe2661af18c576ddd;hpb=4f15129b495827b1894f8a234cc8f32262233fb1

diff --git a/js/pageProfile.js b/js/pageProfile.js
index fa7235b..c5ea5df 100755
--- a/js/pageProfile.js
+++ b/js/pageProfile.js
@@ -16,11 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
-euphorik.PageProfile = function(client, formateur, util) {
-   this.nom = "profile";
-   
+euphorik.PageProfile = function(client, formater, util) {
+   this.name = "profile";
+
    this.client = client;
-   this.formateur = formateur;
+   this.formater = formater;
    this.util = util;
 };
 
@@ -31,32 +31,32 @@ euphorik.PageProfile.prototype.contenu = function() {
 
 euphorik.PageProfile.prototype.charger = function() {
    $("#page").html(this.getHTML());
-   
+
    // en fonction du statut
    if (this.client.authentifie()) {
       this.chargerProfile();
    } else {
       this.chargerLogin();
    }
-      
+
    $("#page form#profile").submit(function(){ return false; });
 };
 
-euphorik.PageProfile.prototype.chargerProfile = function() { 
+euphorik.PageProfile.prototype.chargerProfile = function() {
    var thisPage = this;
-   
+
    $("form#profile input.login").val(this.client.login);
-   $("form#profile input.pseudo").val(this.client.pseudo);
+   $("form#profile input.nick").val(this.client.nick);
    $("form#profile input.email").val(this.client.email);
    $("form#profile input#viewTooltips").attr("checked", this.client.viewTooltips);
    $("form#profile input#viewTimes").attr("checked", this.client.viewTimes);
-   
+
    $("form#profile select#chatOrder option").removeAttr("selected");
    $("form#profile select#chatOrder option[value=" + this.client.chatOrder + "]").attr("selected", "selected");
-   
+
    $("form#profile select#affichagePseudo option").removeAttr("selected");
    $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected");
-    
+
    if (this.client.ostentatiousMaster) {
        $("form#profile select#degreeOstentatoire option").removeAttr("selected");
        $("form#profile select#degreeOstentatoire option[value=" + this.client.ostentatiousMaster + "]").attr("selected", "selected");
@@ -64,7 +64,7 @@ euphorik.PageProfile.prototype.chargerProfile = function() {
 
    $("form#profile button").click(
       function() {
-         thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo($("form#profile input.pseudo").val());
+         thisPage.client.nick = thisPage.formater.formatNick($("form#profile input.nick").val());
          thisPage.client.email = $("form#profile input.email").val();
          thisPage.client.chatOrder = $("form#profile select#chatOrder option:selected").attr("value");
          thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value");
@@ -73,35 +73,35 @@ euphorik.PageProfile.prototype.chargerProfile = function() {
          }
          thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked");
          thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked");
-         
+
          var password = $("form#profile input.password").val();
          var passwordRe = $("form#profile input.passwordRe").val();
          if (password !== "" || passwordRe !== "") {
-            if (password !== passwordRe) {            
-               thisPage.util.messageDialogue("Les mots de passes ne correspondent pas");
+            if (password !== passwordRe) {
+               thisPage.util.messageDialog("Les mots de passes ne correspondent pas");
                return;
             }
             thisPage.client.password = thisPage.util.md5(password);
          }
-         
+
          if(!thisPage.client.flush()) {
-            thisPage.util.messageDialogue("Impossible de mettre à jour votre profile, causes inconnues", euphorik.Util.messageType.erreur);
-         } else { 
-            thisPage.util.messageDialogue("Votre profile a été mis à jour");
-            thisPage.pages.afficherPage("minichat");
+            thisPage.util.messageDialog("Impossible de mettre à jour votre profile, causes inconnues", euphorik.Util.messageType.erreur);
+         } else {
+            thisPage.util.messageDialog("Votre profile a été mis à jour");
+            thisPage.pages.displayPage("minichat");
          }
       }
    );
 };
 
-euphorik.PageProfile.prototype.chargerLogin = function() {   
+euphorik.PageProfile.prototype.chargerLogin = function() {
    var thisPage = this;
 
    $("#page form#profile button").click(
       function() {
          if(thisPage.client.connexionLogin($("form#profile input.login").val(), thisPage.util.md5($("form#profile input.password").val()))) {
             // TODO afficher un message "ok"
-            thisPage.pages.afficherPage("minichat");
+            thisPage.pages.displayPage("minichat");
          }
       }
    );
@@ -113,19 +113,20 @@ euphorik.PageProfile.prototype.getHTML = function() {
       '  <tr>' +
       '   <td>login</td>' +
       '   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>' +
+      (this.client.authentifie() ? '' : '   <td>(sensible à la <a href="http://fr.wikipedia.org/wiki/Casse_(informatique)">casse</a>)</td>') +
       '  </tr>' +
       '  <tr>' +
       '   <td>password</td>' +
       '   <td><input class="password" type="password" size="20" maxlength="20"/></td>' +
-      '  </tr>' + 
+      '  </tr>' +
       (this.client.authentifie() ? '' +
          '  <tr>' +
          '   <td>password re</td>' +
          '   <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>' +
          '  </tr>' +
          '  <tr>' +
-         '   <td>pseudo</td>' +
-         '   <td><input class="pseudo" type="text" size="40" maxlength="20"/></td>' +
+         '   <td>nick</td>' +
+         '   <td><input class="nick" type="text" size="40" maxlength="20"/></td>' +
          '  </tr>' +
          '  <tr>' +
          '   <td>e-mail</td>' +
@@ -171,7 +172,7 @@ euphorik.PageProfile.prototype.getHTML = function() {
          '  </tr>' : '') +
       '  <tr>' +
       '   <td></td>' +
-      '   <td><button>Valider</button>' +
+      '   <td><button>Valider</button></td>' +
       '  </tr>' +
       ' </table>' +
       '</form>';