projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
221a44d
)
MOD légère amélioration de code HTML pour plus de respect des standards
author
Greg Burri
<greg.burri@gmail.com>
Sat, 17 May 2008 17:39:39 +0000
(17:39 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Sat, 17 May 2008 17:39:39 +0000
(17:39 +0000)
index.html
patch
|
blob
|
history
js/euphorik.js
patch
|
blob
|
history
js/pageAdmin.js
patch
|
blob
|
history
js/pageMinichat.js
patch
|
blob
|
history
js/pageProfile.js
patch
|
blob
|
history
js/pageRegister.js
patch
|
blob
|
history
modules/include/euphorik_defines.hrl
patch
|
blob
|
history
diff --git
a/index.html
b/index.html
index
a35a982
..
5b53b6a
100755
(executable)
--- a/
index.html
+++ b/
index.html
@@
-4,8
+4,8
@@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" >
<head>
<title>euphorik.ch</title>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" >
<head>
<title>euphorik.ch</title>
- <link id="cssPrincipale" rel="stylesheet" href="css/1/euphorik.css" type="text/css" media="screen"
/
>
- <link rel="stylesheet" href="css/jquery.lightbox.css" type="text/css" media="screen"
/
>
+ <link id="cssPrincipale" rel="stylesheet" href="css/1/euphorik.css" type="text/css" media="screen"
></link
>
+ <link rel="stylesheet" href="css/jquery.lightbox.css" type="text/css" media="screen"
></link
>
<script type="text/javascript" src="js/jquery.js" ></script>
<script type="text/javascript" src="js/jquery.lightbox.js"></script>
<script type="text/javascript" src="js/md5.js" ></script>
<script type="text/javascript" src="js/jquery.js" ></script>
<script type="text/javascript" src="js/jquery.lightbox.js"></script>
<script type="text/javascript" src="js/md5.js" ></script>
@@
-24,12
+24,14
@@
<div id="menu">
<div class="minichat">chat</div><div class="admin" style="display:none">admin</div><div class="profile"></div><div class="register">register</div><div class="logout">logout</div><div class="about">about</div>
\r
</div>
<div id="menu">
<div class="minichat">chat</div><div class="admin" style="display:none">admin</div><div class="profile"></div><div class="register">register</div><div class="logout">logout</div><div class="about">about</div>
\r
</div>
- <form>
- <select id="menuCss">
- <option value="1" selected="selected">Dark</option>
- <option value="2">Cold</option>
- <option value="3">Classic</option>
- </select>
+ <form action="">
+ <p>
+ <select id="menuCss">
+ <option value="1" selected="selected">Dark</option>
+ <option value="2">Cold</option>
+ <option value="3">Classic</option>
+ </select>
+ </p>
</form>
<div id="page"></div>
<div id="footer"><a href="http://yaws.hyber.org"><img src="img/powered-by-yaws.gif" alt="powered by Yaws" /></a></div>
</form>
<div id="page"></div>
<div id="footer"><a href="http://yaws.hyber.org"><img src="img/powered-by-yaws.gif" alt="powered by Yaws" /></a></div>
diff --git
a/js/euphorik.js
b/js/euphorik.js
index
29e85ad
..
4210713
100755
(executable)
--- a/
js/euphorik.js
+++ b/
js/euphorik.js
@@
-277,7
+277,7
@@
Formateur.prototype.getSmilesHTML = function()
var XHTML = ""
\r
for (var sNom in this.smiles)
\r
{
\r
var XHTML = ""
\r
for (var sNom in this.smiles)
\r
{
\r
- XHTML += "<img class=\"" + sNom + "\" src=\"img/smileys/" + sNom + ".gif\" />"
\r
+ XHTML += "<img class=\"" + sNom + "\" src=\"img/smileys/" + sNom + ".gif\"
alt =\"" + sNom + "\"
/>"
\r
}
\r
return XHTML
\r
}
\r
}
\r
return XHTML
\r
}
\r
@@
-311,7
+311,7
@@
Formateur.prototype.traiterLiensConv = function(M)
\r
/**
\r
* FIXME : Cette méthode est attrocement lourde ! A optimiser.
\r
/**
\r
* FIXME : Cette méthode est attrocement lourde ! A optimiser.
- * moyenne su échantillon : 234ms
\r
+ * moyenne su
r
échantillon : 234ms
\r
*/
Formateur.prototype.traiterSmiles = function(M)
{
*/
Formateur.prototype.traiterSmiles = function(M)
{
@@
-319,7
+319,7
@@
Formateur.prototype.traiterSmiles = function(M)
{
ss = this.smiles[sNom]
for (var i = 0; i < ss.length; i++)
{
ss = this.smiles[sNom]
for (var i = 0; i < ss.length; i++)
- M = M.replace(ss[i], "<img src=\"img/smileys/" + sNom + ".gif\" />")
+ M = M.replace(ss[i], "<img src=\"img/smileys/" + sNom + ".gif\"
alt =\"" + sNom + "\"
/>")
}
return M
}
}
return M
}
diff --git
a/js/pageAdmin.js
b/js/pageAdmin.js
index
a0b8d68
..
6dc96de
100644
(file)
--- a/
js/pageAdmin.js
+++ b/
js/pageAdmin.js
@@
-13,7
+13,7
@@
PageAdmin.prototype.contenu = function()
{
return '<h1>Trolls</h1>\
<p>Chaque semaine un troll est choisit au hasard parmis les trolls proposés et devient le troll de la semaine.</p>\
{
return '<h1>Trolls</h1>\
<p>Chaque semaine un troll est choisit au hasard parmis les trolls proposés et devient le troll de la semaine.</p>\
- <form id="nouveauTroll"><p>\
+ <form
action=""
id="nouveauTroll"><p>\
<input class="troll" name="troll" type="text" maxlength="500" value=""></input>\
<button class="return" value="return">poster</button>\
</p></form><div id="trolls"></div>'
<input class="troll" name="troll" type="text" maxlength="500" value=""></input>\
<button class="return" value="return">poster</button>\
</p></form><div id="trolls"></div>'
diff --git
a/js/pageMinichat.js
b/js/pageMinichat.js
index
217069d
..
541c980
100755
(executable)
--- a/
js/pageMinichat.js
+++ b/
js/pageMinichat.js
@@
-46,7
+46,7
@@
PageMinichat.prototype.charger = function()
{
$("body").append(
'<div id="outilsBan">' +
{
$("body").append(
'<div id="outilsBan">' +
- '<form><p><input id="raison" name="raison" type="text" size="10" maxlength="200"></input></p></form>' +
+ '<form
action=""
><p><input id="raison" name="raison" type="text" size="10" maxlength="200"></input></p></form>' +
'<img id="ban" src="img/ban.gif" alt="Ban de 3 jours" />' +
'<img id="kick" src="img/kick.gif" alt="Ban de 15min" />' +
'<img id="slap" src="img/slap.gif" alt="Avertissement" />' +
'<img id="ban" src="img/ban.gif" alt="Ban de 3 jours" />' +
'<img id="kick" src="img/kick.gif" alt="Ban de 15min" />' +
'<img id="slap" src="img/slap.gif" alt="Avertissement" />' +
@@
-505,7
+505,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span>"
XHTML +=
XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span>"
XHTML +=
- "<div id=\"" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
+ "<div id=\"
mess
" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
(this.messages[i].appartientAuClient ? " proprietaire" : "") +
(this.messages[i].clientARepondu ? " repondu" : "") +
(this.messages[i].estUneReponse ? " reponse" : "") +
(this.messages[i].appartientAuClient ? " proprietaire" : "") +
(this.messages[i].clientARepondu ? " repondu" : "") +
(this.messages[i].estUneReponse ? " reponse" : "") +
@@
-514,7
+514,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
"\">" +
"<div class=\"extraire\">></div>" +
"[<span class=\"date\">" + message.date + "</span>]" +
"\">" +
"<div class=\"extraire\">></div>" +
"[<span class=\"date\">" + message.date + "</span>]" +
- "<span class=\"pseudo\"
id=\"user" + message.auteurId + "\"
>" + identifiant + "</span>:" +
+ "<span class=\"pseudo\"
><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span
>" + identifiant + "</span>:" +
XHTMLrepondA +
"<span class=\"contenu\">" + (message.systeme ? this.formateur.remplacerBalisesHTML(message.contenu) : this.formateur.traitementComplet(message.contenu, message.pseudo)) + "</span>" +
"</div>"
XHTMLrepondA +
"<span class=\"contenu\">" + (message.systeme ? this.formateur.remplacerBalisesHTML(message.contenu) : this.formateur.traitementComplet(message.contenu, message.pseudo)) + "</span>" +
"</div>"
@@
-531,7
+531,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
$("#conversations #" + this.getId() + " .message").slice(this.nbMessageMax, nbMessagesAffiche).empty()
// ajoute les événements liés à chaque nouveau message
$("#conversations #" + this.getId() + " .message").slice(this.nbMessageMax, nbMessagesAffiche).empty()
// ajoute les événements liés à chaque nouveau message
- $("#conversations #" + this.getId() + " .message").filter(function(){return parseInt($(this).attr("id"), 36) > thisConversation.idDernierMessageAffiche}).each(
+ $("#conversations #" + this.getId() + " .message").filter(function(){return parseInt($(this).attr("id")
.substr(4)
, 36) > thisConversation.idDernierMessageAffiche}).each(
function()
{
$(".lienConv", this).click(
function()
{
$(".lienConv", this).click(
@@
-551,7
+551,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
$(".pseudo", this).hover(
function(e)
{
$(".pseudo", this).hover(
function(e)
{
- var userId = parseInt($(
this).attr("id").substr(4
))
+ var userId = parseInt($(
".id", this).text(
))
var element = $(this)
var h = element.height()
var offset = element.offset()
var element = $(this)
var h = element.height()
var offset = element.offset()
@@
-588,7
+588,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
if ($(event.target).is("a")) return
// l'id du message
if ($(event.target).is("a")) return
// l'id du message
- var idMess = $(this).attr("id")
+ var idMess = $(this).attr("id")
.substr(4)
// extraction d'une conversation
if ($(event.target).is(".extraire"))
// extraction d'une conversation
if ($(event.target).is(".extraire"))
@@
-632,7
+632,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
Conversation.prototype.afficherConversation = function(element)
{
// cherche le message selectionné
Conversation.prototype.afficherConversation = function(element)
{
// cherche le message selectionné
- var id = parseInt($(element).attr("id"), 36)
+ var id = parseInt($(element).attr("id")
.substr(4)
, 36)
var message = this.messagesParId[id]
if (message == undefined) return
var message = this.messagesParId[id]
if (message == undefined) return
@@
-644,7
+644,7
@@
Conversation.prototype.afficherConversation = function(element)
function()
{
var jq = $(this)
function()
{
var jq = $(this)
- if (!mess.hasOwnProperty(parseInt(jq.attr("id"), 36)))
+ if (!mess.hasOwnProperty(parseInt(jq.attr("id")
.substr(4)
, 36)))
jq.addClass("cache")
else
jq.removeClass("cache")
jq.addClass("cache")
else
jq.removeClass("cache")
diff --git
a/js/pageProfile.js
b/js/pageProfile.js
index
0641e7c
..
b8d210e
100755
(executable)
--- a/
js/pageProfile.js
+++ b/
js/pageProfile.js
@@
-91,7
+91,7
@@
PageProfile.prototype.chargerLogin = function()
PageProfile.prototype.getHTML = function()
{
return '\
PageProfile.prototype.getHTML = function()
{
return '\
-<form id="profile" >\
+<form
action=""
id="profile" >\
<table>\
<tr>\
<td>login</td>\
<table>\
<tr>\
<td>login</td>\
diff --git
a/js/pageRegister.js
b/js/pageRegister.js
index
ea9092d
..
42a9bec
100755
(executable)
--- a/
js/pageRegister.js
+++ b/
js/pageRegister.js
@@
-12,7
+12,7
@@
function PageRegister(client, formateur, util)
PageRegister.prototype.contenu = function()
{
return '\
PageRegister.prototype.contenu = function()
{
return '\
-<form id="register" >\
+<form
action=""
id="register" >\
<table>\
<tr>\
<td>login</td>\
<table>\
<tr>\
<td>login</td>\
diff --git
a/modules/include/euphorik_defines.hrl
b/modules/include/euphorik_defines.hrl
index
03c7ff1
..
e9beafb
100755
(executable)
--- a/
modules/include/euphorik_defines.hrl
+++ b/
modules/include/euphorik_defines.hrl
@@
-24,4
+24,4
@@
% Le jour ainsi que l'heure à laquelle est élu un nouveau troll (lundi à 3 heure du mat)
-define(JOUR_ELECTION_TROLL, 1). % 1 = lundi
% Le jour ainsi que l'heure à laquelle est élu un nouveau troll (lundi à 3 heure du mat)
-define(JOUR_ELECTION_TROLL, 1). % 1 = lundi
--define(HEURE_ELECTION_TROLL, 3). % 3 heure du matin
\ No newline at end of file
+-define(HEURE_ELECTION_TROLL, 3). % 3 heure du matin