From 9931f39ce0e462357f572bbd87968dbc9a21fbe2 Mon Sep 17 00:00:00 2001
From: movilla <moviglez@gmail.com>
Date: Sun, 12 Aug 2012 05:01:42 +0200
Subject: [PATCH] add mobile conversation

---
 app/assets/stylesheets/mobile.css.scss    | 46 +++++++++++++++++++----
 app/views/conversations/index.mobile.haml | 24 ++++++++++++
 2 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 app/views/conversations/index.mobile.haml

diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
index ee417414f..e011d20f0 100644
--- a/app/assets/stylesheets/mobile.css.scss
+++ b/app/assets/stylesheets/mobile.css.scss
@@ -648,19 +648,20 @@ display: inline-block;
     width: 28px;
 }
 
+#conversation_inbox {
+  margin: 10px 0 0 10px;
+}
 
-#conversation_inbox .message_count {
-  border-radius: 5px;
-
+.message_count {
+  border-radius: 2px 2px 2px 2px;
   float: right;
-  right: 0px;
-  margin: 5px 5px auto;
-  padding: 5px;
+  margin: 2px 2px 1px 5px;
+  padding: 0 2px 1px;
   position: relative;
   background-color: #999;
   color: #eee;
-  font-size: 25px;
-  font-weight: bold;
+  font-size: 10px;
+  line-height: 12px;
 }
 
 .conversation_participants img.avatar{
@@ -668,6 +669,35 @@ display: inline-block;
 	width:35px;
 	margin: 5px 0 5px 2px;
 }
+
+.unread_message_count {
+  border-radius: 2px 2px 2px 2px;
+  float: right;
+  margin: 2px 2px 1px 5px;
+  padding: 0 2px 1px;
+  position: relative;
+  background-color: #B11;
+  color: #EEE;
+  font-size: 10px;
+  line-height: 12px;
+}
+
+.last_author {
+  position: relative;
+  margin: 10px 5px 2px;
+  float: right;
+  font-size: 12px;
+  color: #777;
+}
+
+.timestamp {
+  position: relative;
+  float: right;
+  margin-left: 5px;
+  font-weight: normal;
+  color: #3F8FBA;
+}
+
 form#new_message.new_message input.button.creation{
 	float: right;
 	margin: 0 5px 5px;
diff --git a/app/views/conversations/index.mobile.haml b/app/views/conversations/index.mobile.haml
new file mode 100644
index 000000000..9f45d082c
--- /dev/null
+++ b/app/views/conversations/index.mobile.haml
@@ -0,0 +1,24 @@
+-#   Copyright (c) 2010-2012, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+.right
+  = link_to t('.new_message'), new_conversation_path, :class => 'btn'
+
+%h3
+  = t('.inbox')
+
+#conversation_inbox
+  .stream.conversations
+    - if @conversations.count > 0
+      = render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts}
+    - else
+      %br
+      %br
+      %br
+      %br
+      %div{:style => 'text-align:center;'}
+        %i
+          = t('.no_messages')
+
+  = will_paginate @conversations, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer