projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev check
[brisk.git]
/
web
/
room.js
diff --git
a/web/room.js
b/web/room.js
index
0fd7ac1
..
7085be4
100644
(file)
--- a/
web/room.js
+++ b/
web/room.js
@@
-274,7
+274,7
@@
function j_stand_cont(ddata)
var data;
var data;
- if (g_listen & l_list_isol) {
+ if (g_
prefs.
listen & l_list_isol) {
data = new Array();
for (i = 0, ii = 0 ; ii < ddata.length ; ii++) {
data = new Array();
for (i = 0, ii = 0 ; ii < ddata.length ; ii++) {
@@
-294,6
+294,9
@@
function j_stand_cont(ddata)
if (standup_data_old == null || data.length < 4) {
content = '<table cols="'+(data.length < 4 ? data.length : 4)+'" class="table_standup">';
for (i = 0 ; i < data.length ; i++) {
if (standup_data_old == null || data.length < 4) {
content = '<table cols="'+(data.length < 4 ? data.length : 4)+'" class="table_standup">';
for (i = 0 ; i < data.length ; i++) {
+ if (ddata[i][1] == window.myname) {
+ ddata[i][0] |= 1;
+ }
if ((i % 4) == 0)
content += '<tr>';
content += '<td id="'+i+'" class="room_standup">';
if ((i % 4) == 0)
content += '<tr>';
content += '<td id="'+i+'" class="room_standup">';
@@
-421,11
+424,13
@@
function j_stand_cont(ddata)
table_add($("standup"), td);
}
table_add($("standup"), td);
}
-
standup_data_old = data;
standup_data_old = data;
- return;
}
}
- // $("esco").innerHTML = '<input class="button" name="logout" value="Esco." onclick="esco_cb();" type="button">';
+
+ var usr = $("standup").getElementsByClassName("id_usr");
+ for (i = 0 ; i < usr.length ; i++) {
+ addEvent(usr[i], "click", info_show_cb);
+ }
}
function esco_cb() {
}
function esco_cb() {
@@
-435,21
+440,24
@@
function esco_cb() {
act_logout(0);
};
act_logout(0);
};
-
-
function j_tab_cont(table_idx, data)
{
var i;
var content = '';
for (i = 0 ; i < data.length ; i++) {
function j_tab_cont(table_idx, data)
{
var i;
var content = '';
for (i = 0 ; i < data.length ; i++) {
- // content += user_decorator(data[i]);
- // content += state_add(data[i][0]);
+ if (data[i][1] == window.myname) {
+ data[i][0] |= 1;
+ }
content += j_stand_tdcont(data[i]);
content += '<br>';
}
$("table"+table_idx).innerHTML = content;
content += j_stand_tdcont(data[i]);
content += '<br>';
}
$("table"+table_idx).innerHTML = content;
+ var usr = $("table"+table_idx).getElementsByClassName("id_usr");
+ for (i = 0 ; i < usr.length ; i++) {
+ addEvent(usr[i], "click", info_show_cb);
+ }
}
function j_tab_act_cont(idx, act)
}
function j_tab_act_cont(idx, act)
@@
-458,6
+466,10
@@
function j_tab_act_cont(idx, act)
// MLANG 1
$("table_act"+idx).innerHTML = '<input type="button" class="button" name="xhenter'+idx+'" value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');">';
}
// MLANG 1
$("table_act"+idx).innerHTML = '<input type="button" class="button" name="xhenter'+idx+'" value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');">';
}
+ else if (act == 'sitappr') {
+ // MLANG 1
+ $("table_act"+idx).innerHTML = '<input type="button" style="background-repeat: no-repeat; background-position: center; background-image: url(\'img/okappr.png\');" class="button" name="xhenter'+idx+'" value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');" title="'+(g_lang == 'en' ? "reserved table for authenticated and apprentice users only" : "tavolo riservato agli utenti registrati e agli apprendisti")+'" alt="'+(g_lang == 'en' ? "reserved table for authenticated and apprentice users only" : "tavolo riservato agli utenti registrati e agli apprendisti")+'">';
+ }
else if (act == 'sitreser') {
// MLANG 1
$("table_act"+idx).innerHTML = '<input type="button" style="background-repeat: no-repeat; background-position: center; background-image: url(\'img/okauth.png\');" class="button" name="xhenter'+idx+'" value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');" title="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'" alt="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'">';
else if (act == 'sitreser') {
// MLANG 1
$("table_act"+idx).innerHTML = '<input type="button" style="background-repeat: no-repeat; background-position: center; background-image: url(\'img/okauth.png\');" class="button" name="xhenter'+idx+'" value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');" title="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'" alt="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'">';
@@
-498,13
+510,13
@@
function j_check_login(login, ret)
(login[i] >= 'A' && login[i] <= 'Z')) {
if (old_c != login[i]) {
old_c = login[i];
(login[i] >= 'A' && login[i] <= 'Z')) {
if (old_c != login[i]) {
old_c = login[i];
- old_ct =
0
;
+ old_ct =
1
;
}
else {
}
else {
- if (old_ct >
3
) {
+ if (old_ct >
2
) {
// FIXME LANG
// FIXME LANG
- ret.ret = (g_lang == 'en' ? "More than t
hree
contiguous '" + old_c + "' not allowed." :
- "Il nickname contiene più di
tre
caratteri '" + old_c + "' consecutivi.");
+ ret.ret = (g_lang == 'en' ? "More than t
wo
contiguous '" + old_c + "' not allowed." :
+ "Il nickname contiene più di
2
caratteri '" + old_c + "' consecutivi.");
return (false);
}
}
return (false);
}
}
@@
-523,12
+535,17
@@
function j_check_login(login, ret)
}
}
-function j_new_appren
d
ice(form)
+function j_new_appren
t
ice(form)
{
var ret = { ret: '' };
var token;
do {
{
var ret = { ret: '' };
var token;
do {
+ if (form.elements['realsub'].value == "close") {
+ $('apprentice_div').style.display = 'none';
+ break;
+ }
+
if (j_check_login(form.elements['nameid'].value, ret) == false ||
j_check_email(form.elements['emailid'].value, ret) == false) {
if (j_check_login(form.elements['nameid'].value, ret) == false ||
j_check_email(form.elements['emailid'].value, ret) == false) {
@@
-628,7
+645,7
@@
function mesgtoadm_formtext_hilite(form)
function j_check_email(email, ret)
{
function j_check_email(email, ret)
{
- if (/^\w+([\.-]
?\w+)*@\w+([\.-]?
\w+)*(\.\w{2,10})+$/.test(email))
+ if (/^\w+([\.-]
*\w+)*@\w+([\.-]*
\w+)*(\.\w{2,10})+$/.test(email))
return (true);
ret.ret += (g_lang == 'en' ? "Invalid email address. " :
"Indirizzo e-mail non valido.");
return (true);
ret.ret += (g_lang == 'en' ? "Invalid email address. " :
"Indirizzo e-mail non valido.");
@@
-693,7
+710,7
@@
function j_mesgtoadmbox(form)
var no;
do {
var no;
do {
- if (form.elements['realsub'].value == "c
hiudi
") {
+ if (form.elements['realsub'].value == "c
loid
") {
$('mesgtoadmbox').style.visibility = "hidden";
break;
}
$('mesgtoadmbox').style.visibility = "hidden";
break;
}