From ff42a0090ed6189fc14b78428e25e384b7c2dfc1 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 14 May 2014 20:59:49 +0400
Subject: [PATCH] Improved grouping messages

Now displaying unread icon for grouped messages
Increase group timeout to 5 minutes:
https://github.com/zhukov/webogram/issues/177#issuecomment-42838841
---
 app/css/app.css       | 15 ++++-----------
 app/js/controllers.js |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index 93dd8b10..97d0e528 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1317,7 +1317,6 @@ a.im_dialog:hover .im_dialog_date {
   margin-top: 4px;
 }
 .im_message_grouped .icon-message-status {
-  display: none;
   margin-top: 5px;
   margin-left: 24px;
 }
@@ -2915,12 +2914,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
 }
 
 @media (max-width: 900px) {
-  /*.icon-message-status {
-    margin-left: 0;
-    margin-top: 18px;
-    right: -1px;
-  }*/
-
   .icon-message-status {
     z-index: 10;
     margin-left: -5px;
@@ -2931,10 +2924,10 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
     margin-top: 1px;
     border: 0;
   }
-  /*.icon-message-status {
-    z-index: 10;
-    margin-left: -15px;
-  }*/
+  .im_message_grouped .icon-message-status {
+    margin-top: -8px;
+    margin-left: 32px;
+  }
 }
 
 @media (max-width: 480px) {
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 02d0b978..0d0eddcc 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -544,7 +544,7 @@ angular.module('myApp.controllers', [])
         curMessage = $scope.history[i];
         if (prevMessage &&
             curMessage.from_id == prevMessage.from_id &&
-            curMessage.date < prevMessage.date + 30 &&
+            curMessage.date < prevMessage.date + 300 &&
             !prevMessage.action &&
             !curMessage.action &&
             !prevMessage.fwd_from_id &&