From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Mon, 31 Aug 2015 16:03:04 +0000 (+0200)
Subject: graphical rappresentation of apprentice
X-Git-Tag: v5.0.0~32
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=d23202ced9f2b4cdb3712aefcf5dcebd508e2231;p=brisk.git

graphical rappresentation of apprentice
---

diff --git a/web/brisk.css b/web/brisk.css
index cd480b5..c2eef51 100644
--- a/web/brisk.css
+++ b/web/brisk.css
@@ -2,7 +2,7 @@
  *  brisk - brisk.css
  *
  *  Copyright (C) 2006-2014 Matteo Nastasi
- *                          mailto: nastasi@alternativeoutput.it 
+ *                          mailto: nastasi@alternativeoutput.it
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
  *
@@ -39,7 +39,7 @@ body {
     background-image: url('img/happysunbg.png');
     background-color: #fafafa;
     background-repeat: no-repeat;
-    background-position: center center; 
+    background-position: center center;
     margin:0px;
 
     padding: 0px;
@@ -56,7 +56,7 @@ td {
 }
 
 img {
-    position:     absolute; 
+    position:     absolute;
     border-style: solid;
     border-width: 1px;
     border-color: gray;
@@ -69,11 +69,11 @@ img.unbo {
 img.nobo {
     position:     relative;
     border-width: 0px;
-    display: block; 
+    display: block;
     margin: auto;
 }
 
-img.inline { 
+img.inline {
     position:     relative;
     vertical-align: middle;
     border-width: 0px;
@@ -119,7 +119,7 @@ img.ib_nobo {
     top: 0;
     padding: 8px;
 
-    left: 50%; 
+    left: 50%;
     position: absolute;
     border-style: solid;
     border-width: 1px;
@@ -129,20 +129,20 @@ img.ib_nobo {
     bottom: 0;
     right: 0;
     align: center;
-    text-align: center; 
-    background-color: white; 
+    text-align: center;
+    background-color: white;
     z-index: 10;
     visibility: hidden;
     filter: alpha(opacity=90);
     -moz-opacity: 0.90;
-    opacity: 0.90;  
+    opacity: 0.90;
 }
 
 .notify_opaque {
 /*    top: 10%; */
     top: 0;
 
-    left: 50%; 
+    left: 50%;
     position: absolute;
     border-style: solid;
     border-width: 1px;
@@ -152,13 +152,13 @@ img.ib_nobo {
     bottom: 0;
     right: 0;
     align: center;
-    text-align: center; 
-    background-color: white; 
+    text-align: center;
+    background-color: white;
     z-index: 10;
     visibility: hidden;
 }
 
-div.notify_clo { 
+div.notify_clo {
     position: absolute;
     align: center;
     width: 100%;
@@ -176,25 +176,25 @@ div.doc_alert {
     padding: 8px;
 }
 
-.input_text { 
+.input_text {
     background-color: #f8f8f8;
-    border: 1px solid gray;  
+    border: 1px solid gray;
     margin: 1px;
  }
 
-.input_text:hover { 
+.input_text:hover {
     background-color: white;
-    border: 1px solid #ffae00;  
+    border: 1px solid #ffae00;
  }
 
-.input_text_hi { 
+.input_text_hi {
     background-color: white;
     border: 2px solid #ffae00;
     margin: 0px;
  }
 
 input.input_sub {
-    border: 1px solid gray;  
+    border: 1px solid gray;
     margin: 0px;
     padding: 1px;
     color: black;
@@ -208,8 +208,8 @@ input.input_sub {
     min-height: 22px ! important;
     display: inline;
 }
-input.input_sub:hover { 
-    border: 1px solid #ffae00;  
+input.input_sub:hover {
+    border: 1px solid #ffae00;
     margin: 0px;
     padding: 1px;
  }
@@ -232,7 +232,7 @@ input.input_sub_hi {
 }
 
 input.button {
-    border: 1px solid gray;  
+    border: 1px solid gray;
     margin: 1px;
     padding: 2px;
     color: black;
@@ -256,11 +256,11 @@ img.button:hover {
     cursor: pointer;
 }
 
-span.au0 {
+span.au0 span {
     font-weight: bold;
 }
 
-span.au1 {
+span.au1 span {
     padding-left: 2px;
     padding-right: 4px;
     font-style: italic;
@@ -269,10 +269,21 @@ span.au1 {
     background-color: #a1c8ff;
 }
 
-span.au2 {
+span.au2 span {
     background-color: #bafcba;
 }
 
+span.au3 {
+    padding-left: 24px;
+    background-image: url('img/books.png');
+    background-repeat: no-repeat;
+    background-position: left center;
+}
+
+span.au3 span {
+    background-color: transparent;
+}
+
 div.bye_msg {
     font-weigth: bold;
 }
\ No newline at end of file
diff --git a/web/commons.js b/web/commons.js
index 851749f..0c9a88e 100644
--- a/web/commons.js
+++ b/web/commons.js
@@ -1027,9 +1027,11 @@ var CHATT_MAXLINES = 40;
 function user_decorator(user)
 {
     var name, i, sp = "", cl = "";
-    var flags = user[0] & 0x03 | ((user[0] & 0x040000) >> 16);
+    var flags = user[0] & 0x03 | ((user[0] & 0x0c0000) >> 16);
 
-    for (i = 0 ; i < 3 ; i++) {
+    console.log(user[1]+" FLAGS: "+flags);
+
+    for (i = 0 ; i < 4 ; i++) {
         if (flags & (1 << i)) {
             cl += sp + "au" + i;
             sp = " ";
@@ -1037,7 +1039,7 @@ function user_decorator(user)
     }
 
     if (flags != 0)
-        name = "<span class='" + cl + "'>"+user[1]+"</span>";
+        name = "<span class='" + cl + "'><span>"+user[1]+"</span></span>";
     else
         name = user[1];
 
diff --git a/web/usermgmt.php b/web/usermgmt.php
index 851f5d5..f3ea4e1 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -484,7 +484,6 @@ SELECT usr.*, guar.login AS guar_login
 
 
                 if (brisk_mail($usr_obj->email, $subj, $body_txt, $body_htm) == FALSE) {
-            // if (brisk_mail($usr_obj->email, "Il titolo", "zozozo", "il <b>body</b> fine.") == FALSE) {
                     // mail error
                     fprintf(STDERR, "ERROR: mail send FAILED\n");
                     break;