From 63a887cd40e7ae0183fcbf0e57aac16c6d850ed5 Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 5 Jan 2014 23:24:17 +0000 Subject: [PATCH] channel info window tidying --- client/assets/css/style.css | 1 + client/src/views/channelinfo.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index a6fe3e2..e445438 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -404,6 +404,7 @@ html, body { height:100%; } #kiwi .channel_info .channel_url { display: none; } +#kiwi .channel_info .channel-banlist table { display: none; } #kiwi .channel_info .remove-ban { cursor: pointer; } diff --git a/client/src/views/channelinfo.js b/client/src/views/channelinfo.js index 97dfde3..edf7871 100644 --- a/client/src/views/channelinfo.js +++ b/client/src/views/channelinfo.js @@ -24,6 +24,8 @@ _kiwi.view.ChannelInfo = Backbone.View.extend({ this.menu.$el.appendTo(channel.view.$container); this.menu.show(); + this.menu.$el.offset({top: _kiwi.app.view.$el.find('.panels').offset().top}); + // Menu box will call this destroy on closing this.$el.dispose = _.bind(this.dispose, this); @@ -86,7 +88,9 @@ _kiwi.view.ChannelInfo = Backbone.View.extend({ updateInfo: function (channel, new_val) { var that = this, - modes, url, banlist; + title, modes, url, banlist; + + this.menu.setTitle(channel.get('name')); modes = channel.get('info_modes'); if (modes) { @@ -109,7 +113,7 @@ _kiwi.view.ChannelInfo = Backbone.View.extend({ url = channel.get('info_url'); if (url) { - this.$el.find('.channel_url a') + this.$el.find('.channel_url') .text(url) .attr('href', url); @@ -118,7 +122,7 @@ _kiwi.view.ChannelInfo = Backbone.View.extend({ banlist = channel.get('banlist'); if (banlist && banlist.length) { - var $table = this.$el.find('.channel_banlist table tbody'); + var $table = this.$el.find('.channel-banlist table tbody'); $table.empty(); _.each(banlist, function(ban) { @@ -131,6 +135,8 @@ _kiwi.view.ChannelInfo = Backbone.View.extend({ $table.append($tr); }); + + this.$el.find('.channel-banlist table').slideDown(); } }, -- 2.25.1