X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=c8c5052aff88dac953fa677304e78a324af7487c;hb=509c28d644b55837dcddb5cf4610dba58446a451;hp=d5d49f2df3301946c045d265b046c5844671f0b9;hpb=79b3f2cd1c0b8c48292119f8eb17ee58e64b5740;p=brisk.git

diff --git a/web/room.js b/web/room.js
index d5d49f2..c8c5052 100644
--- a/web/room.js
+++ b/web/room.js
@@ -1,7 +1,7 @@
 /*
  *  brisk - room.js
  *
- *  Copyright (C) 2006-2011 Matteo Nastasi
+ *  Copyright (C) 2006-2012 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -86,6 +86,22 @@ function state_add(flags)
             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;
         }
@@ -123,7 +139,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);
@@ -241,22 +257,7 @@ function table_walk(curtag)
 
 function j_stand_tdcont(el)
 {
-    var content = "";
-    var val_el;
-
-    val_el = el[0] & 0x03;
-    
-    if (val_el > 0) 
-        content += '<span class="au'+val_el+'">';
-    
-    content += el[1];
-    
-    if (val_el > 0) 
-        content += '</span>';
-
-    content += state_add(el[0]);
-    
-    return (content);
+    return (user_dec_and_state(el));
 }
 
 function j_stand_cont(ddata)
@@ -434,7 +435,7 @@ function esco_cb() {
     window.onbeforeunload = null; 
     window.onunload = null; 
     // nonunload = true; 
-    act_logout();
+    act_logout(0);
  };
 
 
@@ -445,19 +446,9 @@ function j_tab_cont(table_idx, data)
     var content = '';
 
     for (i = 0 ; i < data.length ; i++) {
-        var val_el;
-        
-        val_el = data[i][0] & 0x03;
-        
-        if (val_el > 0)
-            content += '<span class="au'+val_el+'">';
-    
-        content += data[i][1];
-        
-        if (val_el > 0)
-            content += '</span>';
-
-        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>';
     }