diff --git a/app/assets/javascripts/backbone/helpers/channels.js.coffee b/app/assets/javascripts/backbone/helpers/channels.js.coffee index be7bb396..66210c67 100644 --- a/app/assets/javascripts/backbone/helpers/channels.js.coffee +++ b/app/assets/javascripts/backbone/helpers/channels.js.coffee @@ -17,10 +17,14 @@ class Kandan.Helpers.Channels scrollPercentage > @options.autoScrollThreshold @scrollToLatestMessage: (channelId)-> - @channel_activities_el(channelId).parent().scrollTop(100000) + console.log("scrolling to last message"); + $('document').scrollTop($('docoument').height()) + #@channel_activities_el(channelId).parent().scrollTop(100000) @currentScrollPosition: (channelId)-> - @channel_activities_el(channelId).parent().scrollTop() + console.log("current scroll position"); + $('document').scrollTop() + #@channel_activities_el(channelId).parent().scrollTop() @channel_activities_el: (channelId)-> $("#channel-activities-#{channelId}") diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee index b4dbea3a..73c6fe98 100644 --- a/app/assets/javascripts/backbone/kandan.js.coffee +++ b/app/assets/javascripts/backbone/kandan.js.coffee @@ -37,16 +37,14 @@ window.Kandan = window.broadcaster.subscribe "/channels/*" initTabs: ()-> - $('#channels').tabs({ - create: (event, ui)-> - $('ul.ui-tabs-nav').css({top: $('.header').offset().top + "px"}) + $('#kandan').tabs({ select: (event, ui)-> $(document).data('active_channel_id', Kandan.Helpers.Channels.getChannelIdByTabIndex(ui.index)) Kandan.Data.Channels.runCallbacks('change') }) - $("#channels").tabs 'option', 'tabTemplate', ''' + $("#kandan").tabs 'option', 'tabTemplate', '''
  • diff --git a/app/assets/javascripts/backbone/views/chatarea.js.coffee b/app/assets/javascripts/backbone/views/chatarea.js.coffee index 20938ae2..5ad8b665 100644 --- a/app/assets/javascripts/backbone/views/chatarea.js.coffee +++ b/app/assets/javascripts/backbone/views/chatarea.js.coffee @@ -8,7 +8,7 @@ class Kandan.Views.ChatArea extends Backbone.View "click .create_channel": "createChannel" render: -> - $(@el).html(@template({channels: @options.channels})) + $('.header .logo').after(@template({channels: @options.channels})) for channel in @options.channels.models view = new Kandan.Views.ChannelPane({channel: channel}) $(@el).append(view.render().el) @@ -29,4 +29,4 @@ class Kandan.Views.ChatArea extends Backbone.View deleteChannel: (event)-> channelIndex = $(event.target).parent().prevAll().length console.log "request for deletion", channelIndex - Kandan.Helpers.Channels.deleteChannelByTabIndex(channelIndex) if channelIndex != 0 \ No newline at end of file + Kandan.Helpers.Channels.deleteChannelByTabIndex(channelIndex) if channelIndex != 0 diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass index 2c7df376..445adab1 100644 --- a/app/assets/stylesheets/_base.sass +++ b/app/assets/stylesheets/_base.sass @@ -5,11 +5,15 @@ * +box-sizing(border-box) +#kandan + height: 100% + width: 100% + .header display: block - height: $header-height width: 100% position: fixed + height: $header-height top: 0 background-color: $header-bg-1 +background-image(linear-gradient($header-bg-1, $header-bg-2)) @@ -53,6 +57,7 @@ /* gotta bump stuff in the header .logo, .ui-tabs-nav padding-top: 7px !important + float: left .search form padding-top: 5px diff --git a/app/assets/stylesheets/_chat_area.sass b/app/assets/stylesheets/_chat_area.sass index d4f6ccad..2aa7825d 100644 --- a/app/assets/stylesheets/_chat_area.sass +++ b/app/assets/stylesheets/_chat_area.sass @@ -2,7 +2,7 @@ margin-top: 0px .ui-widget-header - +background-image(linear-gradient($header-bg-1, $header-bg-2)) + background: transparent !important +border-radius(0px) border: none .ui-state-active @@ -23,28 +23,23 @@ html body .ui-tabs .ui-tabs-nav li .create_channel cursor: hover -body html ul.ui-tabs-nav - display: block - width: 1050px - height: 32px +.ui-tabs-nav -/* html body #app_body .main-area #channels li.ui-state-active -/* backgroun-color: $active-tab-bg !important - -/* html body li.ui-state-default -/* background-color: #9da7aa !important - .ui-tabs +border-radius(0px) padding: 0px margin-top: 0px border: none .ui-tabs-nav - position: fixed - top: 0px - left: 90px z-index: 20 + display: block + position: absolute + bottom: 0px + float: left + padding: 0px !important + margin-left: 80px + margin-bottom: 1px !important li a font-size: 14px .ui-state-default @@ -83,13 +78,13 @@ body html ul.ui-tabs-nav .paginated-activities +box-shadow(5px 0px 5px -3px #cccccc, -5px 0px 5px -3px #cccccc, 5px 10px 5px -3px #cccccc, -5px 10px 5px -3px #cccccc) +border-top-radius(4px) - overflow-y: scroll float: left width: 100% min-height: 88% height: 88% background: #FFF padding: 10px + padding-bottom: 72px .pagination text-decoration: underline cursor: pointer @@ -103,7 +98,9 @@ body html ul.ui-tabs-nav float: left border-top: 1px solid #EBEFF1 padding: 10px 0px 10px 10px - width: 100% + width: 77% + position: fixed + bottom: 0px textarea +border-top-left-radius(4px) +border-bottom-left-radius(4px) diff --git a/app/assets/stylesheets/_sidebar.sass b/app/assets/stylesheets/_sidebar.sass index 14f63c7e..e775b295 100644 --- a/app/assets/stylesheets/_sidebar.sass +++ b/app/assets/stylesheets/_sidebar.sass @@ -1,4 +1,8 @@ .sidebar + padding-top: $header-height + 20 + position: fixed + top: 0px + right: 0px min-height: 100% height: 100% width: $sidebar-width diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 990aebfe..425fa628 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -6,31 +6,32 @@ - -
    - <%= image_tag "logo.png", :class=>"logo" %> - - - -
    -
    - -
    - logout +
    +
    + <%= image_tag "logo.png", :class=>"logo" %> + + + +
    +
    + +
    + logout +
    + +
    - -
    - -
    -
    +
    +
    -
    diff --git a/config/kandan_settings.yml b/config/kandan_settings.yml index 3659952b..b860b3eb 100644 --- a/config/kandan_settings.yml +++ b/config/kandan_settings.yml @@ -8,4 +8,4 @@ :broadcaster: :name: "Faye" -:per_page: 5 +:per_page: 30