X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageProfile.js;h=1a474d7feb213920783e3314b9d8112fadc9d998;hp=d77231750ba52ecfea66874937de1eda7b770772;hb=5d9992368bb386d2e606ae037c5478fe10ac70e8;hpb=7203835bce6f94b6afcc7403694145c829a4f833
diff --git a/js/pageProfile.js b/js/pageProfile.js
index d772317..1a474d7 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 .
-euphorik.PageProfile = function(client, formateur, util) {
- this.nom = "profile";
-
+euphorik.PageProfile = function(client, formatter, util) {
+ this.name = "profile";
+
this.client = client;
- this.formateur = formateur;
+ this.formatter = formatter;
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.formatter.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");
}
}
);
@@ -118,15 +118,15 @@ euphorik.PageProfile.prototype.getHTML = function() {
'
' +
' password | ' +
' | ' +
- '
' +
+ ' ' +
(this.client.authentifie() ? '' +
' ' +
' password re | ' +
' | ' +
'
' +
' ' +
- ' pseudo | ' +
- ' | ' +
+ ' nick | ' +
+ ' | ' +
'
' +
' ' +
' e-mail | ' +