X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageProfile.js;h=b6920d2b7a070a9bbd6168b1bcb82c4db1057e14;hb=4c8bece326d3f8f7d65faf7f80a19cf796fb46d1;hp=7270c23f0132a8f28ba58c04fe114abdee7e84cd;hpb=6feaef2a51f7226c41d69f9e86f605718b78aa02;p=euphorik.git

diff --git a/js/pageProfile.js b/js/pageProfile.js
index 7270c23..b6920d2 100755
--- a/js/pageProfile.js
+++ b/js/pageProfile.js
@@ -1,4 +1,20 @@
-// coding: utf-8
+// coding: utf-8
+// Copyright 2008 Grégory Burri
+//
+// This file is part of Euphorik.
+//
+// Euphorik is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Euphorik is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
 function PageProfile(client, formateur, util)
 {
@@ -11,38 +27,44 @@ function PageProfile(client, formateur, util)
 
 PageProfile.prototype.contenu = function()
 {
+   // pourquoi ?
    return ""
 }
 
 PageProfile.prototype.charger = function()
 {
-   jQuery("#page").html(this.getHTML())
+   $("#page").html(this.getHTML())
    
    // en fonction du statut
-   if (this.client.identifie())
+   if (this.client.authentifie())
       this.chargerProfile()
    else
       this.chargerLogin()
       
-   jQuery("#page form#profile").submit(function(){return false})
+   $("#page form#profile").submit(function(){return false})
 }
 
 PageProfile.prototype.chargerProfile = function()
 { 
    var thisPage = this
    
-   jQuery("form#profile input.login").val(this.client.login)
-   jQuery("form#profile input.pseudo").val(this.client.pseudo)
-   jQuery("form#profile input.email").val(this.client.email)
+   $("form#profile input.login").val(this.client.login)
+   $("form#profile input.pseudo").val(this.client.pseudo)
+   $("form#profile input.email").val(this.client.email)
+   
+   $("form#profile select#affichagePseudo option").removeAttr("selected")
+   $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected")
+   
 
-   jQuery("#page form#profile button").click(
+   $("form#profile button").click(
       function()
       {
-         thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo(jQuery("form#profile input.pseudo").val())
-         thisPage.client.email = jQuery("form#profile input.email").val()
+         thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo($("form#profile input.pseudo").val())
+         thisPage.client.email = $("form#profile input.email").val()
+         thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value") 
          
-         var password = jQuery("form#profile input.password").val()
-         var passwordRe = jQuery("form#profile input.passwordRe").val()  
+         var password = $("form#profile input.password").val()
+         var passwordRe = $("form#profile input.passwordRe").val()  
          if (password != "" || passwordRe != "")
          {
             if (password != passwordRe)
@@ -68,12 +90,10 @@ PageProfile.prototype.chargerLogin = function()
 {   
    var thisPage = this
 
-   jQuery("#page form#profile button").click(
+   $("#page form#profile button").click(
       function()
       {
-         if(!thisPage.client.connexionLogin(jQuery("form#profile input.login").val(), thisPage.util.md5(jQuery("form#profile input.password").val())))
-            thisPage.util.messageDialogue("Couple login/pass introuvable")
-         else
+         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")
@@ -85,17 +105,17 @@ PageProfile.prototype.chargerLogin = function()
 PageProfile.prototype.getHTML = function()
 {
 return '\
-<form id="profile" >\
+<form action="" id="profile" >\
  <table>\
   <tr>\
    <td>login</td>\
-   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.identifie() ? 'readonly="readonly"' : '') + ' /></td>\
+   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>\
   </tr>\
   <tr>\
    <td>password</td>\
    <td><input class="password" type="password" size="20" maxlength="20"/></td>\
   </tr>' + 
-  (this.client.identifie() ? '\
+  (this.client.authentifie() ? '\
   <tr>\
    <td>password re</td>\
    <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>\
@@ -108,6 +128,16 @@ return '\
    <td>e-mail</td>\
    <td><input class="email" type="text" size="40" maxlength="100"/></td>\
   </tr>\
+  <tr>\
+   <td>Affichage des identifiants</td>\
+   <td>\
+    <select id="affichagePseudo">\
+     <option value="nick">Pseudo</option>\
+     <option value="login">Login</option>\
+     <option value="nick_login">Pseudo(Login)</option>\
+    </select>\
+   </td>\
+  </tr>\
   <tr>' : '') + '\
   <tr>\
   <td></td>\
@@ -115,4 +145,5 @@ return '\
   </tr>\
  </table>\
 </form>' 
-}
\ No newline at end of file
+}
+