Giving the nicklist an (ugly) body

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 3f032076fdef390658bb9e4fa470cf21c1f39979..39549bdd48684d27d5f77ca122948a33e2e2b5f4 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -143,12 +143,11 @@ a img { border:none; }
 #memberlists ul { list-style: none; display:none; }
 #memberlists ul.active { display:block; }
 #memberlists ul li { padding: 0.2em 1em; overflow-y:auto; overflow-x:hidden; cursor:pointer; }
-#memberlists ul li:hover { background-color:#FAF7D3; }
 #memberlists ul li a.nick { display:block; color:black; }
 
-#memberlists ul li .userbox { margin:0 1em 5px 1em; font-size:.9em; }
-#memberlists ul li .userbox a { display:block; text-decoration:none; border-bottom: 1px dashed #aaa; }
-
+#memberlists ul li .userbox { position:relative; margin:0 1em 5px 1em; padding-bottom:0.7em; font-size:.9em; }
+#memberlists ul li .userbox a { display:block; text-decoration:none; }
+#memberlists ul li .userbox a:before { content:"> "; }
 
 
 #controlbox .input {
@@ -270,6 +269,24 @@ a img { border:none; }
  */
 
 
+/* Default */
+#kiwi #memberlists {
+    background-color: #DADADA;
+    border-left: 1px solid #6A6A6A;
+}
+#kiwi #memberlists ul li:hover {
+    /* border-left: 5px solid #88C56A; */
+    background: #88C56A;
+    -webkit-transition: 0.2s ease;
+    -moz-transition: 0.2s ease;
+    -ms-transition: 0.2s ease;
+    -o-transition: 0.2s ease;
+    transition: 0.2s ease; 
+}
+
+
+
+
 /* Relaxed theme */
 #kiwi.theme_relaxed .messages .msg { border-bottom: 1px solid #DEDEDE; font-family:arial; font-size:0.9em; }
 #kiwi.theme_relaxed .messages .msg .time { width:6em; float:left; color:#777; display:none; }

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 2f0610c6af3fed166979be47ebb7548d18327f2e..fef90644f681697efb305bb12182927e76dbb9b4 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -788,6 +788,7 @@ kiwi.model.Application = function () {
             panel = that.panels.getByName(destination);\r
             if (!panel) {\r
                 panel = new kiwi.model.Channel({name: destination});\r
+                panel.set('members', undefined);\r
                 kiwi.app.panels.add(panel);\r
             }\r
 \r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index 542a9938f4fb618d0d412eb763bf04aaba476a98..20d8f02f2d6b2e023ac2e2f8f61088ae69ee82aa 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -39,7 +39,8 @@ kiwi.view.MemberList = Backbone.View.extend({
 kiwi.view.UserBox = Backbone.View.extend({\r
     events: {\r
         'click .query': 'queryClick',\r
-        'click .info': 'infoClick'\r
+        'click .info': 'infoClick',\r
+        'click .slap': 'slapClick'\r
     },\r
 \r
     initialize: function () {\r
@@ -48,12 +49,17 @@ kiwi.view.UserBox = Backbone.View.extend({
 \r
     queryClick: function (event) {\r
         var panel = new kiwi.model.Channel({name: this.member.get('nick')});\r
+        panel.set('members', undefined);\r
         kiwi.app.panels.add(panel);\r
         panel.view.show();\r
     },\r
 \r
     infoClick: function (event) {\r
-        kiwi.gateway.raw('WHOIS ' + this.member.get('nick'));\r
+        kiwi.app.controlbox.processInput('/whois ' + this.member.get('nick'));\r
+    },\r
+\r
+    slapClick: function (event) {\r
+        kiwi.app.controlbox.processInput('/slap ' + this.member.get('nick'));\r
     }\r
 });\r
 \r

diff --git a/client/index.html b/client/index.html
index 6036794a070aba0b713dfa3561e90e25afae0e3d..03c738429c7bb38ba6f8f8d2ea23e85c01685407 100644 (file)
--- a/client/index.html
+++ b/client/index.html
@@ -48,6 +48,9 @@
         <div class="userbox">
             <a class="query">Message</a>
             <a class="info">Info</a>
+            <a class="slap">Slap!</a>
+            
+            <div class="divider-horizontal"></div>
         </div>
     </script>