@@ -23,18 +23,39 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

   initialize: ->

     _.bindAll(this)

-    @counter = 0

+

     @friendsList = new Xmpp.Views.Contacts.ListView(collection: this, attributes: {title: 'chat.roster.friends', id: 'js-inactive-friends'})

-#    @activeList  = new Xmpp.Views.Contacts.ListView(collection: this, attributes: {title: 'chat.roster.chat-group', id: 'js-active-friends'})

+    @friendsList.createListContainer()

+

+    @activeList  = new Xmpp.Views.Contacts.ListView(collection: this, attributes: {title: 'chat.roster.chat-group', id: 'js-active-friends'})

+    @activeList.setAsActiveChatGroup()

     @on("add", @appendContact)

   appendContact: (contact) ->

-    @counter++

     @friendsList.appendContact(contact)

+  moveToActiveList: (contact) ->

+    @_switchContactBelongingList(@get(contact), @friendsList, @activeList)

+

+  moveToInactiveList: (contact) ->

+    if contact == 'all'

+      _.each(@activeList.contactViews, (view) =>

+        @_switchContactBelongingList(view.model, @activeList, @friendsList)

+      )

+    else

+      @_switchContactBelongingList(@get(contact), @activeList, @friendsList)

+

   updateStatus: (response) ->

     @get(response.jid).set(message: response.status.message, status: response.status.status)

   udpateVcard: (response) ->

-    @get(response.jid).set(name: response.vcard.name, avatar: response.vcard.avatar)

\ No newline at end of file

+    @get(response.jid).set(name: response.vcard.name, avatar: response.vcard.avatar)

+

+  _switchContactBelongingList: (contact, fromList, toList) ->

+    if !contact?

+      false

+

+    fromList.detachContact(contact) && toList.appendContact(contact)

+

+    true

\ No newline at end of file

@@ -1,2 +1,6 @@

-%h1.group-header #{@title}

-%ul

+- if @isActiveGroup

+  %h1.group-header.active #{@title}

+  %ul.active-group

+- else

+  %h1.group-header #{@title}

+  %ul

@@ -11,7 +11,7 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

   initialize: () ->

     _.bindAll(this)

-    # Patrim nejakemu zoznamu

+#    Patrim nejakemu zoznamu

     @parentList = @attributes['listView']

     @model.on('change', @updateContact, this)

@@ -25,8 +25,14 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

     $(@el).html(@template(contact))

     return this

+  belongsToActiveList: ->

+    @parentList.activeGroup == true

+

   startChat: (event) ->

-    who = App.Models.me

+    if @belongsToActiveList()

+      return

+

+    who      = App.Models.me

     withWhom = @model

     App.debug ['opening chat with: ', who.get('jid'), withWhom.get('jid')]

@@ -38,6 +44,8 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

       App.Collections.chats.add(chat)

     App.Views.tabbar.addOrSelect(chat)

+    App.Collections.contacts.moveToInactiveList('all')

+    App.Collections.contacts.moveToActiveList(withWhom)

 #    @openChat(chat)

   openChat: (chat) ->

@@ -9,18 +9,43 @@ class Xmpp.Views.Contacts.ListView extends Backbone.View

     @el = '#' + @attributes['id']

     @title = I18n.t(@attributes['title'])

+    @titleClass = @listClass = ''

+    @activeGroup = false

     @contactViews = []

-    @createListContainer()

-

   createListContainer: ->

-    $(@el).html(@template(title: @title))

+    $(@el).html(@template(title: @title, isActiveGroup: @activeGroup))

   appendContact: (contact) ->

+    if @hasContact(contact)

+      return false

+

+    if @contactViews.length == 0

+      @createListContainer()

+

     view =  new Xmpp.Views.Contacts.ContactView(model: contact, attributes: {listView: this})

     @contactViews.push view

     @render(view.render().el)

+  detachContact: (contact) ->

+    matchingView = @hasContact(contact)

+    if matchingView

+      @contactViews = _.without(@contactViews, matchingView)

+      matchingView.remove()

+

+      if @contactViews.length == 0

+        $(@el).html('')

+

+    return !!matchingView

+

+  hasContact: (contact) ->

+    _.find(@contactViews, (view) ->

+      view.model == contact

+    )

+

+  setAsActiveChatGroup: ->

+    @activeGroup = true

+

   render: (contactHtml) ->

     if (contactHtml?)

       $(@el).find('ul').append(contactHtml)

@@ -29,6 +29,7 @@ class Xmpp.Views.Tabbar.TabView extends Backbone.View

   closeChat: ->

     App.Views.tabbar.removeTab(this)

     App.Collections.chats.removeChat(@model)

+    App.Collections.contacts.moveToInactiveList(@model.get('withWhom'))

     @remove()

   hasParticipants: (who, withWhom) ->

@@ -112,10 +112,14 @@

   }

   .active-group {

+    @extend .no-left-border;

+    @extend .left-border;

+    @extend .border;

+

     margin: 0 -16px 0 -5px;

     padding: 8px 10px;

     background: white;

-    border-right: 1px solid #fcfcfc;

+    border-right: 0 !important;

     &::before {

       content: '';

@@ -15,30 +15,31 @@

     .roster.border.no-top-border.top-border#height-setter-1

       .my-info#js-me

       .friends

-        %h1.group-header.active Chat group

-        %ul.active-group.border.no-left-border.left-border#js-active-friends

-          %li.clear.user

-            .avatar

-              %img{src: 'assets/avatar.png', alt: t("chat.avatar_alt")}

-            %h1

-              Adam Wolsky

-              %span.status.online.icon-record

-            %h2 co-founder

-            %span.action

-              %span.icon-x-full

-                %span kick

-          %li.clear.user

-            .avatar

-              %img{src: 'assets/avatar.png', alt: t("chat.avatar_alt")}

-            %h1

-              John Savage

-              %span.status.away.icon-record

-            %h2 web & ui designer

-            %span.action

-              %span.icon-x-full

-                %span kick

-              %span.icon-bubbles

-                %span invite

+        #js-active-friends

+        -#%h1.group-header.active Chat group

+        -#%ul.active-group

+        -#  %li.clear.user

+        -#    .avatar

+        -#      %img{src: 'assets/avatar.png', alt: t("chat.avatar_alt")}

+        -#    %h1

+        -#      Adam Wolsky

+        -#      %span.status.online.icon-record

+        -#    %h2 co-founder

+        -#    %span.action

+        -#      %span.icon-x-full

+        -#        %span kick

+        -#  %li.clear.user

+        -#    .avatar

+        -#      %img{src: 'assets/avatar.png', alt: t("chat.avatar_alt")}

+        -#    %h1

+        -#      John Savage

+        -#      %span.status.away.icon-record

+        -#    %h2 web & ui designer

+        -#    %span.action

+        -#      %span.icon-x-full

+        -#        %span kick

+        -#      %span.icon-bubbles

+        -#        %span invite

         #js-inactive-friends

       .toolbox

         %input{type: "search", placeholder: "Search contact"}