X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=82e6fcc1fac0e1e592bbcce3191c72b183dd04c8;hb=b65dddf6cb8fdc5a98719ed170ca38c2059b362c;hp=e8b19eabf6aad56e18624ad8c8426a9f1be1980d;hpb=a00b90507135651af999d563310a85faf82b4463;p=brisk.git

diff --git a/web/room.js b/web/room.js
index e8b19ea..82e6fcc 100644
--- a/web/room.js
+++ b/web/room.js
@@ -1,7 +1,7 @@
 /*
  *  brisk - room.js
  *
- *  Copyright (C) 2006-2009 Matteo Nastasi
+ *  Copyright (C) 2006-2012 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -23,15 +23,18 @@
 
 
 /* 
+
    data = [ [ flags, name ],  ... ]
    
 */
 
+
 function state_add(flags)
 {
-    var content = "";
-    var st, name = "";
-    var tit = "";
+    var content = "", supercont = "";
+    var st, superst, name = "", supername = "", supersfx = "";
+    var tit = "", supertit = "";
+
 
     if ((flags & 0xf00) != 0) {
         st = flags & 0xf00;
@@ -65,14 +68,65 @@ function state_add(flags)
             name = "st_eye.png";
             tit = (g_lang == 'en' ? "I'm here!" : "sono presente!");
             break;
+        case 0x800:
+            name = "st_rabbit.png";
+            tit = (g_lang == 'en' ? "Rabbit time" : "sono a spasso col coniglio");
+            break;
+        case 0x900:
+            name = "st_soccer.png";
+            tit = (g_lang == 'en' ? "Soccer time" : "c'è la partita!!");
+            break;
+        case 0xa00:
+            name = "st_baby.png";
+            tit = (g_lang == 'en' ? "Children time" : "ho il pupo da accudire");
+            break;
+        case 0xb00:
+            name = "st_mop.png";
+            tit = (g_lang == 'en' ? "Mop time" : "sto rassettando");
+            break;
+        case 0xc00:
+            name = "st_babbo.png";
+            tit = (g_lang == 'en' ? "Sto dando i regali" : "sto dando i regali");
+            break;
+        case 0xd00:
+            name = "st_renna.png";
+            tit = (g_lang == 'en' ? "in giro per regali" : "in giro per regali");
+            break;
+        case 0xe00:
+            name = "st_pupaz.png";
+            tit = (g_lang == 'en' ? "Neve a gogò" : "neve a gogò");
+            break;
+        case 0xf00:
+            name = "st_visch.png";
+            tit = (g_lang == 'en' ? "aspettando sotto al vischio" : "aspettando sotto al vischio");
+            break;
         default:
             break;
         }
+    }
+
+    if ((flags & 0xf0000) != 0) {
+        superst = flags & 0xf0000;
         if (name != "") {
-            content += '&nbsp;<img title="'+tit+'" class="unbo" src="img/'+name+'">';
+            supersfx = "_side";                
+        }
+
+        switch (superst) {
+        case 0x20000:
+            supername = "superuser"+supersfx+".png";
+            supertit = (g_lang == 'en' ? "Brisk Supporter" : "Brisk Supporter");
+            break;
         }
     }
 
+    if (supername != "") {
+        content += '&nbsp;<img title="'+supertit+'" class="inline" src="img/'+supername+'">';
+    }
+    
+    if (name != "") {
+        content += '&nbsp;<img title="'+tit+'" class="inline" src="img/'+name+'">';
+    }
+
     return content;
 }
 
@@ -83,7 +137,7 @@ var standup_data_old = null;
 
 function table_add(curtag, td)
 {
-    var tbody  = null, tr;
+    var tbody  = null, tr, ct;
 
     do {
         // console.log("wt: "+curtag.tagName);
@@ -201,34 +255,31 @@ function table_walk(curtag)
 
 function j_stand_tdcont(el)
 {
-    var content = "";
-
-    if (el[0] & 0x01)
-        content += '<b>';
-    
-    if (el[0] & 0x02)
-        content += '<i>';
-    
-    content += el[1];
-    
-    if (el[0] & 0x02)
-        content += '</i>';
-    
-    if (el[0] & 0x01)
-        content += '</b>';
-            
-    content += state_add(el[0]);
-    
-    return (content);
+    return (user_dec_and_state(el));
 }
 
-function j_stand_cont(data)
+function j_stand_cont(ddata)
 {
-    var i;
+    var i, ii;
     var content;
     var st = 0, name = "";
     var curtag, nextag;
 
+    var data;
+
+    if (g_listen & l_list_isol) {
+        data = new Array();
+
+        for (i = 0, ii = 0 ; ii < ddata.length ; ii++) {
+            if ((ddata[ii][0] & 0x02) == 0) {
+                continue;
+            }
+            data[i++] = ddata[ii];
+        }
+    }
+    else
+        data = ddata;
+
     if (standup_data_old == null || data.length < 4) {
     // if (standup_data_old == null) {
         
@@ -243,6 +294,8 @@ function j_stand_cont(data)
             if ((i % 4) == 3)
                 content += '</tr>';
         }
+        if ((i % 4) < 3)
+            content += '</tr>';
         content += '</table>';
         
         $("standup").innerHTML = content;
@@ -380,7 +433,7 @@ function esco_cb() {
     window.onbeforeunload = null; 
     window.onunload = null; 
     // nonunload = true; 
-    act_logout();
+    act_logout(0);
  };
 
 
@@ -391,20 +444,9 @@ function j_tab_cont(table_idx, data)
     var content = '';
 
     for (i = 0 ; i < data.length ; i++) {
-        if (data[i][0] & 0x01)
-            content += '<b>';
-
-        if (data[i][0] & 0x02)
-            content += '<i>';
-
-        content += data[i][1];
-        
-        if (data[i][0] & 0x02)
-            content += '</i>';
-
-        if (data[i][0] & 0x01)
-            content += '</b>';
-        content += state_add(data[i][0]);
+        // content += user_decorator(data[i]);
+        // content += state_add(data[i][0]);
+        content += j_stand_tdcont(data[i]);
 
         content += '<br>';
     }
@@ -651,24 +693,6 @@ function j_pollbox(form)
 }
 
 
-
-
-function list_set(what, setco, info)
-{
-    if (what == 'auth') {
-        $('list_auth').style.color = 'red';
-        $('list_all').style.color = 'black';
-    }
-    else {
-        $('list_auth').style.color = 'black';
-        $('list_all').style.color = 'red';
-    }
-    $('list_info').innerHTML = info;
-    if (setco) {
-        createCookie("CO_list", what, 24*365, cookiepath);
-    }
-}
-
 function sideslide(domobj, height, step)
 {
     this.st = 'wait';