From 59d5e9eac5f5f97df64b93b2afd766edf2352a5d Mon Sep 17 00:00:00 2001 From: Darren Date: Sat, 20 Oct 2012 13:08:27 +0100 Subject: [PATCH] Giving the nicklist an (ugly) body --- client/assets/css/style.css | 25 +++++++++++++++++++++---- client/assets/dev/model_application.js | 1 + client/assets/dev/view.js | 10 ++++++++-- client/index.html | 3 +++ 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index 3f03207..39549bd 100644 --- 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 2f0610c..fef9064 100644 --- 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); if (!panel) { panel = new kiwi.model.Channel({name: destination}); + panel.set('members', undefined); kiwi.app.panels.add(panel); } diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js index 542a993..20d8f02 100644 --- 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({ events: { 'click .query': 'queryClick', - 'click .info': 'infoClick' + 'click .info': 'infoClick', + 'click .slap': 'slapClick' }, initialize: function () { @@ -48,12 +49,17 @@ kiwi.view.UserBox = Backbone.View.extend({ queryClick: function (event) { var panel = new kiwi.model.Channel({name: this.member.get('nick')}); + panel.set('members', undefined); kiwi.app.panels.add(panel); panel.view.show(); }, infoClick: function (event) { - kiwi.gateway.raw('WHOIS ' + this.member.get('nick')); + kiwi.app.controlbox.processInput('/whois ' + this.member.get('nick')); + }, + + slapClick: function (event) { + kiwi.app.controlbox.processInput('/slap ' + this.member.get('nick')); } }); diff --git a/client/index.html b/client/index.html index 6036794..03c7384 100644 --- a/client/index.html +++ b/client/index.html @@ -48,6 +48,9 @@
Message Info + Slap! + +
-- 2.25.1