From d0bde353bd630de188a1117cf0ac09d48bfc019c Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Wed, 12 Mar 2014 17:37:10 +0100
Subject: [PATCH] No longer show picture and names in 1to1 chats.

---
 src/styles/components/_chat.scss            |  8 ++++++--
 static/js/controllers/chatroomcontroller.js | 17 +++++++++--------
 static/partials/chatroom.html               |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index edf32ce5..a970b588 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -175,7 +175,7 @@ top:8px;
 right:8px;
 }
 
-.chat .output .message.is_self .timestamp {
+.chat.with_pictures .output .message.is_self .timestamp {
 right:58px;
 }
 
@@ -260,7 +260,7 @@ top:0px;
 display:block;
 }
 
-.chat .output .message.is_remote {
+.chat.with_pictures .output .message.is_remote {
 padding-left: 58px;
 }
 
@@ -307,8 +307,12 @@ border-color: transparent #fff;
 background: #fff;
 margin-right:20px;
 margin-left:4px;
+padding-right:0px;
+}
+.chat.with_pictures .output .message.is_self {
 padding-right:54px;
 }
+
 .chat .output .message strong {
 display:block;
 padding-bottom:2px;
diff --git a/static/js/controllers/chatroomcontroller.js b/static/js/controllers/chatroomcontroller.js
index 7b3f8251..254645f2 100644
--- a/static/js/controllers/chatroomcontroller.js
+++ b/static/js/controllers/chatroomcontroller.js
@@ -289,16 +289,17 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
             var picture = null;
 
             if (is_new_message) {
-                var buddyScope;
-                title = $("<strong>");
-                title.html(displayName(from, true));
                 lastSender = from;
-                extra_css += "with_name ";
                 $scope.showdate(timestamp);
-                var imgSrc = buddyImageSrc(from);
-                picture = $('<div class="buddyimage"><i class="fa fa-user fa-3x"/><img/></div>');
-                if (imgSrc) {
-                    picture.find("img").attr("src", imgSrc);
+                if ($scope.isgroupchat) {
+                    title = $("<strong>");
+                    title.html(displayName(from, true));
+                    extra_css += "with_name ";
+                    var imgSrc = buddyImageSrc(from);
+                    picture = $('<div class="buddyimage"><i class="fa fa-user fa-3x"/><img/></div>');
+                    if (imgSrc) {
+                        picture.find("img").attr("src", imgSrc);
+                    }
                 }
             }
 
diff --git a/static/partials/chatroom.html b/static/partials/chatroom.html
index 5c5baa7e..84f7ada1 100644
--- a/static/partials/chatroom.html
+++ b/static/partials/chatroom.html
@@ -1,4 +1,4 @@
-<div ng-controller="ChatroomController" class="chat room-{{index}}" ng-class="{'minimized': minimized, 'maximized': maximized, 'newmessage':newmessage, 'visible':visible, 'chat-p2p': 'p2pstate'}">
+<div ng-controller="ChatroomController" class="chat room-{{index}}" ng-class="{'minimized': minimized, 'maximized': maximized, 'newmessage': newmessage, 'visible': visible, 'chat-p2p': 'p2pstate', 'with_pictures': isgroupchat}">
     <div class="chatheader"><span ng-show="p2pstate" class="fa fa-exchange" title="{{_('Peer to peer')}}"/><span>{{settings.title}} {{id|displayName}}</span> <div class="ctrl"><i ng-hide="maximized" title="{{_('Maximize')}}" ng-click="toggleMax()" class="fa fa-expand"></i><i title="{{_('Normal size')}}" ng-click="toggleMax()" ng-show="maximized" class="fa fa-compress"></i><i title="{{_('Minimize')}}" ng-hide="minimized" ng-click="toggleMin()" class="fa fa-chevron-down"></i><i title="{{_('Normal size')}}" ng-click="toggleMin()" ng-show="minimized" class="fa fa-chevron-up"></i><i title="{{_('Close chat')}}" ng-show="id" ng-click="hide()" class="fa fa-times"></i></div></div>
     <div class="outputbox">
         <div class="output nicescroll"></div>