merging waldir-patch-1

diff --cc client/assets/css/style.css
index a3f6e3375bec93f3fa920c251fb4d3dae4748c30,270ade3507bd3ceee843469cce1cc22dcb70f195..2712b9a424409984684459eb2f553ccc858769de
--- 1/client/assets/css/style.css
--- 2/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@@ -508,13 -463,24 +508,24 @@@ html, body { height:100%; 
      -webkit-border-radius:5px;
      -khtml-border-radius:5px;
  }
- #kiwi.theme_relaxed .controlbox .input .nick { text-align: right; width:11em; left:0px; position:absolute; padding:2px; overflow:hidden; }
 -#kiwi.theme_relaxed #controlbox .input .nick {
 +#kiwi.theme_relaxed .controlbox .input .nick a { text-decoration:none; color:black; }
++#kiwi.theme_relaxed .controlbox .input .nick {
+     text-align: right;
+     width: 11em;
+     left: 0px;
+     position: absolute;
+     overflow: hidden;
+     background-color: #eee;
+     border-radius: 3px 0 0 3px;
+     border-right: 1px solid #ccc;
+     padding: 2px;
+     padding-right: 0.5em;
 -    text-decoration: underline;
+ }
  
 -#kiwi.theme_relaxed.narrow #controlbox .input .nick { display:none; }
 -#kiwi.theme_relaxed.narrow #controlbox .input .input_wrap { left:7px; }
 +#kiwi.theme_relaxed.narrow .controlbox .input .nick { display:none; }
 +#kiwi.theme_relaxed.narrow .controlbox .input .input_wrap { left:7px; }
  
 -#kiwi.theme_relaxed #controlbox .input .input_wrap {
 +#kiwi.theme_relaxed .controlbox .input .input_wrap {
      position:absolute;
      right:7px; left: 12.2em;
      height:1.7em;