@@ -99,6 +99,9 @@ this.App =

     updateMyStatus: (message, state)->

       App.Com.trigger(event: 'app.roster.updateMyStatus', data: {message: message, state: state})

+    updateMyVcard: (name, avatar) ->

+      App.Com.trigger(event: 'app.roster.updateMyVcard', data: {name: name})

+

     removeContactRemote: (contact, client) ->

       App.Com.trigger(event: 'app.roster.removeContact', data: {jid: contact, client: client})

@@ -1,8 +1,9 @@

 .user

   .avatar.bigger{ title: "#{@jid}" }

     %img{ src: "#{@avatar || 'assets/avatar.png'}", alt: I18n.t('chat.roster.avatar_alt') }

-  %h1{ title: "#{@jid}"} #{@name }

-  %h2 #{@message || '<input type="text" class="js-click-edit empty" value="'+I18n.t('chat.roster.change_status_msg')+'">'}

+  %h1

+    %input{ type: 'text', title: "#{@jid}", class: 'js-edit-name', value: "#{@name}"}

+  %h2 #{@message || '<input type="text" class="js-edit-status empty" value="'+I18n.t('chat.roster.change_status_msg')+'">' }

   -#todo: nastylovat placeholder

   %h3

     .rolldown.js-change-state

@@ -5,8 +5,12 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

   el: $('#js-me')

   events:

-    'click .js-click-edit': (e) -> @editMyStatus(e)

-    'keypress .js-click-edit': (e) -> @confirmMyStatus(e)

+    'click .js-edit-status': (e) -> @editTextInput(e)

+    'keypress .js-edit-status': (e) -> @confirmMyStatus(e)

+

+    'click .js-edit-name': (e) -> @editTextInput(e)

+    'keypress .js-edit-name': (e) -> @confirmMyName(e)

+

     'click .js-change-state': (e) -> @openChangeState(e)

     'click .js-state-clickable': (e) -> @confirmChangeState(e)

@@ -24,7 +28,7 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

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

     this

-  editMyStatus: (e) ->

+  editTextInput: (e) ->

     $this = $(e.currentTarget)

     if ($this.hasClass('empty'))

@@ -50,6 +54,21 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

     $this.blur()

     App.Com.updateMyStatus(@_getStatusMessage(), @_getState())

+  confirmMyName: (e) ->

+    if (e.which != 13 && e.which != 10)

+      return

+

+    $this = $(e.currentTarget)

+

+    if ($this.val() == '')

+      $this.removeClass('editing')

+        .val(@model.get('jid'))

+    else

+      $this.removeClass('editing')

+

+    $this.blur()

+    App.Com.updateMyVcard(@_getName())

+

   openChangeState: (e) ->

     $this = $(e.currentTarget)

@@ -73,10 +92,13 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

     App.Com.updateMyStatus(@_getStatusMessage(), @_getState())

   _getStatusMessage: ->

-    if $('.js-click-edit').hasClass('empty')

+    if $('.js-edit-status').hasClass('empty')

       return ''

     else

-      $('.js-click-edit').val()

+      $('.js-edit-status').val()

   _getState: ->

     $('.js-state-clickable:not(.hidden)').data('state')

+

+  _getName: ->

+    $('.js-edit-name').val()

\ No newline at end of file

@@ -34,39 +34,20 @@

     margin: 0 0 1px;

   }

+  //.name {

+  //  font-size: 12px;

+  //  color: $black;

+  //  text-shadow: white 1px 1px;

+  //  margin: 0;

+  //  width: auto;

+  //}

+

   h1 {

     font-size: 12px;

     color: $black;

     text-shadow: white 1px 1px;

   }

-  h2 {

-    input {

-      border: 0;

-      background: transparent;

-      width: 151px;

-      padding: 0;

-      outline: none;

-      margin: 0;

-      font-style: italic;

-      font-size: 11px;

-      font-weight: normal;

-      color: #7e8b90;

-      text-shadow: white 1px 1px;

-      height: 18px;

-

-      &:focus {

-        border: none !important;

-      }

-

-      &.editing {

-        padding: 3px 0;

-        font-style: normal;

-        text-shadow: none;

-      }

-    }

-  }

-

   h3 {

     font-size: 12px;

     color: $status-color;

@@ -100,6 +81,40 @@

     }

   }

+  h1 input, h2 input {

+    border: 0;

+    background: transparent;

+    width: 151px;

+    padding: 0;

+    outline: none;

+    margin: 0;

+    font-weight: normal;

+    color: #7e8b90;

+    text-shadow: white 1px 1px;

+    height: 18px;

+

+    &:focus {

+      border: none !important;

+    }

+

+    &.editing {

+      padding: 3px 0;

+      font-style: normal;

+      text-shadow: none;

+    }

+  }

+

+  h1 input {

+    color: $black;

+    font-size: 12px;

+    font-weight: bold;

+  }

+

+  h2 input {

+    font-style: italic;

+    font-size: 11px;

+  }

+

   .avatar {

     float: left;

@@ -191,7 +191,11 @@ class WsRosterController < WsController

     end

     def me_update_vcard

-

+        connection_store[:clients].each do |client|

+            my_vcard = Jabber::Vcard::Helper.get(client)

+            my_vcard['FN'] = my_vcard['NICKNAME'] = message[:name]

+            Jabber::Vcard::Helper.set(client, my_vcard)

+        end

     end

     def disconnect