Fully port conversations to Backbone and drop inbox.js

8 files changed, 45 insertions, 55 deletions

diff --git a/app/views/conversations/_messages.haml b/app/views/conversations/_messages.haml
index 4b8f3f633..d41d0e574 100644
--- a/app/views/conversations/_messages.haml
+++ b/app/views/conversations/_messages.haml
@@ -6,17 +6,18 @@
       .media-left
         = owner_image_tag(:thumb_small)
       .media-body
-        = form_for [conversation, Message.new], html: {class: "control-group"} do |message|
+        = form_for [conversation, Message.new], html: {id: "response-message", class: "control-group"} do |message|
           .form-group
-            %label#messageLabel.sr-only{for: "message_text"}
-              = t("conversations.new.message")
+            %label.sr-only#message-label{for: "response-message-text"}= t("conversations.new.message")
             = message.text_area :text,
-                                rows:     5,
+                                rows: 5,
                                 tabindex: 1,
-                                class:    "form-control form-group",
-                                aria:     {labelledby: "messageLabel"}
+                                id: "response-message-text",
+                                class: "form-control form-group conversation-message-text",
+                                aria: {labelledby: "message-label"}
 
           = message.submit t("conversations.show.reply"),
-                            "data-disable-with" => t("conversations.show.replying"),
-                            class: "btn btn-primary pull-right", tabindex: 2
+                                "data-disable-with" => t("conversations.show.replying"),
+                                :class => "btn btn-primary pull-right",
+                                :tabindex => 2
           .clearfix
diff --git a/app/views/conversations/_new.haml b/app/views/conversations/_new.haml
index 2358b8b19..e8ab11d37 100644
--- a/app/views/conversations/_new.haml
+++ b/app/views/conversations/_new.haml
@@ -1,22 +1,25 @@
 .container-fluid
-  = form_for Conversation.new, html: {class: "form-horizontal form_do_not_clear"}, remote: true do |conversation|
+  = form_for Conversation.new, html: {id: "new-conversation",
+    class: "new-conversation form-horizontal form-do-not-clear"}, remote: true do |conversation|
     .form-group
       %label#toLabel{for: "contact_ids"}
         = t(".to")
-      = text_field_tag "contact_autocomplete", nil, class: "form-control"
+      = text_field_tag "contact_autocomplete", nil, id: "contact-autocomplete", class: "form-control"
     .form-group
-      %label#subjectLabel{for: "conversation_subject"}
+      %label#subject-label{for: "conversation-subject"}
         = t(".subject")
       = conversation.text_field :subject,
+                                id: "conversation-subject",
                                 class: "input-block-level form-control",
-                                aria:  {labelledby: "subjectLabel"}
+                                aria:  {labelledby: "subject-label"},
+                                value: "",
+                                placeholder: t("conversations.new.subject_default")
     .form-group
-      %label#messageLabel.sr-only{for: "conversation_text"}
-        = t(".message")
-      = text_area_tag "conversation[text]",
-                      "",
-                      rows:  5,
-                      class: "input-block-level form-control",
-                      aria:  {labelledby: "messageLabel"}
+      %label.sr-only#message-label{for: "new-message-text"} = t(".message")
+      = text_area_tag "conversation[text]", "",
+                                rows: 5,
+                                id: "new-message-text",
+                                class: "conversation-message-text input-block-level form-control",
+                                aria: {labelledby: "message-label"}
     .form-group
-      = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), class: 'btn btn-primary pull-right'
+      = conversation.submit t(".send"), "data-disable-with" => t(".sending"), :class => "btn btn-primary pull-right"
diff --git a/app/views/conversations/create.js.erb b/app/views/conversations/create.js.erb
index 92ae238e2..3310fcb5b 100644
--- a/app/views/conversations/create.js.erb
+++ b/app/views/conversations/create.js.erb
@@ -1,10 +1,12 @@
 var response = <%= raw @response.to_json %>;
 <% if session[:mobile_view] %>
+if(response.success) {
   window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
+}
 <% else %>
   if(response.success){
     app.flashMessages.success(response.message);
-    $("#new_conversation").removeClass('form_do_not_clear').clearForm();
+    $("#new-conversation").removeClass('form-do-not-clear').clearForm();
     window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
   } else {
     app.flashMessages.error(response.message);
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 31297c79e..c60d0d22e 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -1,41 +1,35 @@
-- content_for :head do
-  = javascript_include_tag :inbox
-
 - content_for :page_title do
-  = t('.conversations_inbox')
+  = t(".conversations_inbox")
 
-.container-fluid#conversations_container
+.container-fluid#conversations-container
   .row
     .col-md-4
       .sidebar#left_pane
         .sidebar-header.clearfix#left_pane_header
           .pull-right
-            = link_to t(".new_conversation"), conversations_path, class: "btn btn-default"
+            = link_to t(".new_conversation"), conversations_path, class: "new-conversation-btn btn btn-default"
           %h3
             = t(".inbox")
 
-        .conversation-inbox#conversation_inbox
-          .stream.conversations
+        .conversation-inbox#conversation-inbox
+          .conversations-form-container.stream.conversations
             - if @visibilities.count > 0
               = render partial: "conversations/conversation", collection: @visibilities, as: :visibility
             - else
               .no-conversations
-                = t('.no_messages')
+                = t(".no_messages")
             .pagination-container
               = will_paginate @visibilities, previous_label: "&laquo;", next_label: "&raquo;", inner_window: 1,
                   renderer: WillPaginate::ActionView::BootstrapLinkRenderer
-
-
     .col-md-8
-      - if @conversation
-        .stream_container
-          #conversation_show
+      .conversations-form-container.stream_container
+        #conversation-show{class: @conversation ? "" : "hidden"}
+          - if @conversation
             = render 'conversations/show', conversation: @conversation
-      - else
-        .stream_container.hidden
-          #conversation_show
-        .framed-content.clearfix#conversation_new
+        #conversation-new{class: @conversation ? "framed-content clearfix hidden" : "framed-content clearfix"}
           .new-conversation
-            %h3.text-center
-              = t("conversations.index.new_conversation")
-            = render "conversations/new"
+            %h3.text-center= t("conversations.index.new_conversation")
+            - if no_contacts
+              .well.text-center= t("javascripts.conversation.new.no_contacts")
+            - else
+              = render "conversations/new"
diff --git a/app/views/conversations/index.mobile.haml b/app/views/conversations/index.mobile.haml
index 89dfd53d3..fe6eefa32 100644
--- a/app/views/conversations/index.mobile.haml
+++ b/app/views/conversations/index.mobile.haml
@@ -12,7 +12,7 @@
   .stream
     %p{ class: "conversation_#{name}" }= msg
 
-#conversation_inbox
+.conversation-inbox#conversation-inbox
   .stream.conversations
     - if @visibilities.count > 0
       = render partial: "conversations/conversation", collection: @visibilities, as: :visibility
diff --git a/app/views/conversations/new.mobile.haml b/app/views/conversations/new.mobile.haml
index 5bc187d0d..32d328b0f 100644
--- a/app/views/conversations/new.mobile.haml
+++ b/app/views/conversations/new.mobile.haml
@@ -5,7 +5,7 @@
 :javascript
   $(document).ready(function () {
     var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" ),
-        autocompleteInput = $("#contact_autocomplete");
+        autocompleteInput = $("#contact-autocomplete");
 
     autocompleteInput.autoSuggest(data, {
       selectedItemProp: "name",
diff --git a/app/views/conversations/show.js.erb b/app/views/conversations/show.js.erb
deleted file mode 100644
index ad87047bb..000000000
--- a/app/views/conversations/show.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-if($('.stream_container').hasClass('hidden')){
-  $('#conversation_new').hide();
-  $('.stream_container').removeClass('hidden');
-}
-
-$('#conversation_show').html("<%= escape_javascript(render('conversations/show', :conversation => @conversation)) %>");
-
-$(".stream-element", "#conversation_inbox").removeClass('selected');
-$(".stream-element[data-guid='<%= @conversation.id %>']", "#conversation_inbox").addClass('selected');
-$('#conversation_show').trigger("conversation:loaded");
diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml
index 489f0eb17..3eeddb083 100644
--- a/app/views/people/contacts.haml
+++ b/app/views/people/contacts.haml
@@ -27,7 +27,7 @@
       id: 'mentionModal'
 
   -if @contact
-    #new_conversation_pane
+    .conversations-form-container#new_conversation_pane
       = render 'shared/modal',
         path: new_conversation_path(:contact_id => @contact.id, name: @contact.person.name, modal: true),
         title: t('conversations.index.new_conversation'),