From b34a7061322a6dc41dc8d7fc648fdd669f13e68a Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 13 Sep 2013 10:35:00 +0200 Subject: [PATCH] We didn't have an icon for unavailable state. Also, the status description was not translation aware --- converse.js | 9 +++++---- fonticons/style.css | 3 ++- spec/MainSpec.js | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/converse.js b/converse.js index b56ffce36..1f19c34c6 100644 --- a/converse.js +++ b/converse.js @@ -1883,10 +1883,11 @@ }, this); this.$el.addClass('current-xmpp-contact'); var status_desc = { - 'dnd': 'This contact is busy', - 'online': 'This contact is online', - 'offline': 'This contact is offline', - 'away': 'This contact is away' + 'dnd': __('This contact is busy'), + 'online': __('This contact is online'), + 'offline': __('This contact is offline'), + 'unavailable': __('This contact is unavailable'), + 'away': __('This contact is away') }[item.get('chat_status')||'offline']; this.$el.html(this.template( _.extend(item.toJSON(), {'status_desc': status_desc}) diff --git a/fonticons/style.css b/fonticons/style.css index c843bd83a..c6d69ad81 100644 --- a/fonticons/style.css +++ b/fonticons/style.css @@ -28,7 +28,7 @@ Instead of a list of all class selectors, you can use the generic selector below, but it's slower: [class*="icon-"] { */ -.icon-home, .icon-pencil, .icon-camera, .icon-camera-2, .icon-play, .icon-music, .icon-headphones, .icon-phone, .icon-phone-hang-up, .icon-address-book, .icon-notebook, .icon-envelop, .icon-pushpin, .icon-online, .icon-away, .icon-bubbles, .icon-bubbles-2, .icon-bubbles-3, .icon-user, .icon-users, .icon-quotes-left, .icon-spinner, .icon-search, .icon-cogs, .icon-wrench, .icon-unlocked, .icon-lock, .icon-lock-2, .icon-key, .icon-key-2, .icon-zoom-out, .icon-zoom-in, .icon-cog, .icon-remove, .icon-remove-2, .icon-eye, .icon-eye-blocked, .icon-attachment, .icon-globe, .icon-heart, .icon-happy, .icon-thumbs-up, .icon-smiley, .icon-tongue, .icon-sad, .icon-wink, .icon-wondering, .icon-confused, .icon-shocked, .icon-evil, .icon-angry, .icon-cool, .icon-grin, .icon-info, .icon-notification, .icon-warning, .icon-spell-check, .icon-volume-high, .icon-volume-medium, .icon-volume-low, .icon-volume-mute, .icon-volume-mute-2, .icon-volume-decrease, .icon-volume-increase, .icon-bold, .icon-underline, .icon-italic, .icon-strikethrough, .icon-new-tab, .icon-youtube, .icon-close, .icon-blocked, .icon-cancel-circle, .icon-minus, .icon-plus, .icon-checkbox-checked, .icon-checkbox-unchecked, .icon-checkbox-partial, .icon-radio-checked, .icon-radio-unchecked, .icon-room-info, .icon-newspaper, .icon-image, .icon-offline, .icon-dnd { +.icon-home, .icon-pencil, .icon-camera, .icon-camera-2, .icon-play, .icon-music, .icon-headphones, .icon-phone, .icon-phone-hang-up, .icon-address-book, .icon-notebook, .icon-envelop, .icon-pushpin, .icon-online, .icon-away, .icon-bubbles, .icon-bubbles-2, .icon-bubbles-3, .icon-user, .icon-users, .icon-quotes-left, .icon-spinner, .icon-search, .icon-cogs, .icon-wrench, .icon-unlocked, .icon-lock, .icon-lock-2, .icon-key, .icon-key-2, .icon-zoom-out, .icon-zoom-in, .icon-cog, .icon-remove, .icon-remove-2, .icon-eye, .icon-eye-blocked, .icon-attachment, .icon-globe, .icon-heart, .icon-happy, .icon-thumbs-up, .icon-smiley, .icon-tongue, .icon-sad, .icon-wink, .icon-wondering, .icon-confused, .icon-shocked, .icon-evil, .icon-angry, .icon-cool, .icon-grin, .icon-info, .icon-notification, .icon-warning, .icon-spell-check, .icon-volume-high, .icon-volume-medium, .icon-volume-low, .icon-volume-mute, .icon-volume-mute-2, .icon-volume-decrease, .icon-volume-increase, .icon-bold, .icon-underline, .icon-italic, .icon-strikethrough, .icon-new-tab, .icon-youtube, .icon-close, .icon-blocked, .icon-cancel-circle, .icon-minus, .icon-plus, .icon-checkbox-checked, .icon-checkbox-unchecked, .icon-checkbox-partial, .icon-radio-checked, .icon-radio-unchecked, .icon-room-info, .icon-newspaper, .icon-image, .icon-offline, .icon-unavailable, .icon-dnd { font-family: 'Converse-js'; speak: none; font-style: normal; @@ -287,6 +287,7 @@ you can use the generic selector below, but it's slower: .icon-image:before { content: "\2b14"; } +.icon-unavailable:before, .icon-offline:before { content: "\e002"; } diff --git a/spec/MainSpec.js b/spec/MainSpec.js index 52d0ae25f..2e70a50f3 100644 --- a/spec/MainSpec.js +++ b/spec/MainSpec.js @@ -197,6 +197,10 @@ }, converse)); describe("Existing Contacts", $.proxy(function () { + beforeEach($.proxy(function () { + openControlBox(); + }, converse)); + it("do not have a heading if there aren't any", $.proxy(function () { expect(this.rosterview.$el.find('dt#xmpp-contacts').css('display')).toEqual('none'); }, converse));