From 68f250599602d6d05c7b9af18a5c45fc98cf690b Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 3 Dec 2015 18:21:19 -0800
Subject: [PATCH] Display phone number in conversation header

Fixes #436

// FREEBIE
---
 background.html                | 7 ++++++-
 js/views/conversation_view.js  | 1 +
 stylesheets/_conversation.scss | 7 +++++++
 stylesheets/manifest.css       | 9 ++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/background.html b/background.html
index bf2dbb307..94fcf24a5 100644
--- a/background.html
+++ b/background.html
@@ -51,7 +51,12 @@
             </ul>
           </div>
           {{> avatar }}
-          <span class='conversation-title'>{{ title }}</span>
+          <span class='conversation-title'>
+            {{ title }}
+            {{ #number }}
+              <span class='conversation-number'>{{ number }}</span>
+            {{ /number }}
+          </span>
       </div>
 
       <div class='discussion-container'></div>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index f9d5c1120..b468b0226 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -18,6 +18,7 @@
             return {
                 group: this.model.get('type') === 'group',
                 title: this.model.getTitle(),
+                number: this.model.getNumber(),
                 avatar: this.model.getAvatar()
             };
         },
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index e54642f65..6b18dee43 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -19,6 +19,13 @@
   overflow: hidden;
   text-overflow: ellipsis;
   padding-left: 10px;
+  -webkit-user-select: text;
+}
+.conversation-number {
+  padding-left: 5px;
+  line-height: 1em;
+  font-size: small;
+  color: #999;
 }
 
 .conversation {
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 438f7ef93..d7cda29fe 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -583,7 +583,14 @@ input.search {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  padding-left: 10px; }
+  padding-left: 10px;
+  -webkit-user-select: text; }
+
+.conversation-number {
+  padding-left: 5px;
+  line-height: 1em;
+  font-size: small;
+  color: #999; }
 
 .conversation {
   height: calc(100% - 20px);