From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 10 Mar 2011 22:34:31 +0000 (+0100)
Subject: pull conflicts solved
X-Git-Tag: 3.4.2~1
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=9cbf3bfaad0cad7feaf6413eb53df0a1475c6303;hp=312a6acc00ec7f331ab461894c319776eec95cae;p=brisk.git

pull conflicts solved
---

diff --git a/sql/builder.sh b/sql/builder.sh
index 0417a05..221bd87 100755
--- a/sql/builder.sh
+++ b/sql/builder.sh
@@ -65,7 +65,9 @@ elif [ "$1" = "rebuild" ]; then
         echo "-- MESG: build start" ; one_or_all $2 | grep -iv '^drop' ; echo "-- MESG: build end" ;   ) \
         | sqlexe $sht
 elif [ "$1" = "psql" ]; then
-    psql -h $DBHOST -U $DBUSER $DBBASE
+   psql -h $DBHOST -U $DBUSER $DBBASE $@
+elif [ "$1" = "piped" ]; then
+   psql -h $DBHOST -U $DBUSER $DBBASE -t -q -A -F '|' $@
 elif [ "$1" = "dump" ]; then
     if [ $# -eq 1 ]; then
         pg_dump -a --inserts -h $DBHOST -U $DBUSER $DBBASE
@@ -88,6 +90,7 @@ else
     echo "   ./builder build"
     echo "   ./builder rebuild"
     echo "   ./builder psql"
+    echo "   ./builder piped"
     echo "   ./builder add <filesql>"
     echo "   ./builder dump [dumpfile]"
     echo "   ./builder dumpall [dumpfile]"
diff --git a/web/room.css b/web/room.css
index e1ab1f4..1b5c679 100644
--- a/web/room.css
+++ b/web/room.css
@@ -114,7 +114,7 @@ span.room_titin {
     position: relative;
     left: 6px;
     top: 6px;
-    z-index: 100;
+    z-index: 20;
     background-color: white; 
 }
 
@@ -308,7 +308,7 @@ div.esco {
     text-align: right; 	
     top:  2px;
     right: 4px;
-    z-index: 10;
+    z-index: 20;
 }
 
 .chatt {
@@ -351,7 +351,7 @@ div.esco {
     position: absolute;
     background-color: white;
     left: 80px;
-    z-index: 20;
+    z-index: 50;
     visibility: hidden;
     border: 1px solid gray;
     text-align: left;