social_stream 1.1.12 → 2.0.0.beta1

data/base/app/views/activity_objects/_activity_object.html.erb

@@ -1,7 +1 @@
-<% if activity_object.acts_as_actor? %>
-  <div class="block">
-    <%= model_with_details activity_object.object %>
-  </div>
-<% else %>
-  <%= render activity_object.object %>
-<% end %>
+<%= render activity_object.object %>

data/base/app/views/activity_objects/_timeline.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: "#{ object.object.class.to_s.tableize }/timeline",
+           object: object.object,
+           as: object.object.class.to_s.underscore %>

data/base/app/views/audience/_list.html.erb

@@ -1,6 +1,6 @@
 <% @activity.audience.each do |a| %>
   <div class="audience_logo">
-    <%= link_to image_tag(a.logo.url(:contact),
+    <%= link_to image_tag(a.logo.url(:small),
                           :alt => a.name),
                  a.subject,
                  :title => a.name %>

data/base/app/views/comments/_comment.html.erb

@@ -1 +1,3 @@
-<%= simple_format auto_link(comment.text) %>
+<%= div_for comment do %>
+  <%= simple_format auto_link(comment.text) %>
+<% end %>

data/base/app/views/comments/_new.html.erb

@@ -1,33 +1,13 @@
 <% if user_signed_in? && current_subject.can_comment?(activity) %>
-  <div class="activity_new_comment">
-    <div class="actor_logo_new_comment">
-      <%= image_tag(current_subject.logo.url(:actor),
-                            :alt => current_subject.name)%>
+  <div class="new_comment">
+    <div class="avatar">
+      <%= image_tag(current_subject.logo.url("small")) %>
     </div>
-    <div class= "activity_content">
-      <div class="actor_name_new_comment">
-        <%= current_subject.name %>
-      </div>
-      <%= form_for Comment.new(:text => t('comment.input'),
-                               :owner_id => Actor.normalize_id(activity.receiver),
-                               :_activity_parent_id => activity.id
-                  ),
-                :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
-                :remote => true do |f| %>
 
-        <%= f.hidden_field :owner_id %>
-        <%= f.hidden_field :_activity_parent_id %>
-        
-        <div class="input_new_comments_container">
-          <%= f.text_area :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity), :rows => 1 %>
-          <div class="copy_new_comment" id="copy_comment_text_<%= dom_id(activity) %>"></div>
-        </div>
-        
-        <div class="activities_comment_btn">
-          <div class="activities_security"></div>
-          <%= f.submit t('share'), :class =>"myButtonBlue submitActivity", :id => "comment_submit_"+dom_id(activity) %>
-        </div>
-      <% end %>
-    </div>
+    <%= render partial: 'comments/new_form',
+               locals: {
+                 owner_id: Actor.normalize_id(activity.receiver),
+                 _activity_parent_id: activity.id
+               } %>
   </div>
 <% end %>

data/base/app/views/comments/_new_form.html.erb

@@ -0,0 +1,11 @@
+<%= form_for Comment.new(:owner_id => owner_id, :_activity_parent_id => _activity_parent_id),:remote => true do |f| %>
+
+  <%= f.hidden_field :owner_id %>
+  
+  <%= f.hidden_field :_activity_parent_id %>
+    
+  <%= f.text_area :text, :rows => 1, :paceholder => t('comment.input') %>
+  
+  <%= f.submit t('activity.to_comment'), :class => "btn" %>
+
+<% end %>

data/base/app/views/comments/_quick_search_result.html.erb

@@ -0,0 +1,3 @@
+<div class="post">
+  <%= link_to highlight(excerpt(comment.text, params[:q], radius: 100), params[:q]), comment %>
+</div>

data/base/app/views/comments/_search_result.html.erb

@@ -0,0 +1 @@
+<%= render comment %>

data/base/app/views/comments/create.js.erb

@@ -1,13 +1,11 @@
 <% if @comment.valid? %>
-  //Display the new comment
-  $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
-  $(".activities_comment_btn").hide();
-  $(".input_new_comments").each(function() {
-    $(this).focus().val("").blur();   
+  SocialStream.Comment.create({
+    id: <%= @comment.id %>,
+    parentActivityId: <%= @comment.post_activity.parent.id %>,
+    html: "<%= j render(@comment.post_activity) %>"
   });
 
   SocialStream.Timeline.create("<%= escape_javascript dom_id(@comment.post_activity) %>");
 <% else %>
-  SocialStream.Timeline.create();
-  alert('<%= j @comment.errors.full_messages.to_sentence %>');
+  SocialStream.Flash.error("<%= j @comment.errors.full_messages.to_sentence %>");
 <% end %>

data/base/app/views/contacts/_contact.html.erb

@@ -1,20 +1,25 @@
-<%= div_for contact, :class => 'row' do %>
-  <div class="logo">
-    <%= link_to(image_tag(contact.receiver.logo.url(:contact)),
-                contact.receiver_subject) %>
+<% destroy_params ||=  {} %>
+
+<section class="contact" id="<%= dom_id contact %>">
+  <div class="avatar">
+    <%= link_to(image_tag(contact.receiver.logo.url(:small)), contact.receiver_subject) %>
   </div>
-  <div class="sub-block">
+
+  <div class="data">
     <div class="name">
-      <%= link_to(truncate_name(contact.receiver_subject.name), contact.receiver_subject, :class => "contact_link") %>
+      <%= link_to(truncate_name(contact.receiver_subject.name), contact.receiver_subject)%>
     </div>
-    <div class="brief">
+
+    <div class="info">
       <%= contact_brief(contact.receiver_subject) %>
     </div>
-    <div class="link" id="contact_link<%= dom_id(contact.receiver_subject)%>">
-      <%= contact_link(contact) %>
-    </div>
   </div>
-  <div class="close"><%= link_to 'X', contact, :method => :delete, :remote => true %></div>
-  <div class="space_center">
-  </div>  
-<% end %>
+  <div class="add">
+    <%= contact_link(contact) %>
+  </div>
+  <div class="x">
+        <%= link_to 'X', contact_path(contact, destroy_params), method: :delete, remote: true, confirm: t('contact.confirm_delete') %>
+      </div>
+</section>
+
+

data/base/app/views/contacts/_form.html.erb

@@ -1,4 +1,5 @@
 <div id="contact-form">
+  <h3>adjudica roles</h3>
   <%= form_for @contact do |f| %>
     <%= hidden_field_tag "contact[relation_ids][]", "0" %>
 
@@ -20,19 +21,19 @@
       <%= check_box_tag "contact[relation_ids][]", relation.id, f.object.relation_ids.include?(relation.id), :id => "contact_relation_ids_#{ relation.id }" %><%= label_tag "contact_relation_ids_#{ relation.id }", relation.name %>
       </li>
     <% end %>
-    </ul>
 
     <div id="relation-new">
       <%= link_to t('contact.type.new'), relation_customs_path %>
     </div>
+    </ul>
 
     <div id="contact-message">
-      <%= f.label :message %>
+      <%= f.label :message,:class =>"name_text_area" %>
       <%= f.text_area :message, :class =>"new_contact_text_area" %>
     </div>
 
     <div id="contact-submit">
-      <%= submit_tag t("contact.#{ f.object.action }.submit"), :class => "button" %>
+      <%= submit_tag t("contact.#{ f.object.action }.submit"), :class => "btn" %>
     </div>
   <% end %>
 </div>

data/base/app/views/contacts/_link_custom.html.erb

@@ -1,9 +1,3 @@
-<%= link_to(contact.status, edit_contact_path(contact),
-            :title => t("contact.#{ contact.action }.title", :name => contact.receiver.name)) %>
-
-<% if controller.controller_name == "contacts" %>
-
-<br/>
-<%= link_to(t('contact.delete'), contact_path(contact), :method => :delete, :confirm => t('contact.confirm_delete'), :remote => true) %>
-
+<%= form_for contact, remote: true, html: { 'data-contact_id' => contact.id } do |f| %>
+  <%= f.select :relation_ids, contact.options_for_select, {}, { multiple: true } %>
 <% end %>

data/base/app/views/contacts/_pendings.html.erb

@@ -1,18 +1,10 @@
 <% if current_subject.pending_contacts? %>
-<div class="block">
-  <div class="header">
-    <%= image_tag('btn/btn_notifications.png', :class => "header_icon") %>
-    <div class="header_text">
+<section id="pendings" data-path="<%= pending_contacts_path %>">
+  <header>
+    <h4>
       <%= t 'contact.pending.other' %>
-    </div>
-  </div>
-  <div class="content">
-    <%= render :partial => 'contacts/contact', :collection => current_subject.pending_contacts.shuffle.first(2) %>
-    <div class="row more_pending">
-      <%= link_to t('contact.pending.all_n', :count => current_subject.pending_contacts_count), pending_contacts_path %>
-    </div>
-    <div class="space_center">
-    </div>
-  </div>
-</div>
+    </h4>
+  </header>
+  <%= render :partial => 'contacts/contact', :collection => current_subject.pending_contacts.shuffle.first(2), :locals => { destroy_params: { reject: true } } %>
+</section>
 <% end -%>

data/base/app/views/contacts/_suggestions.html.erb

@@ -1,15 +1,12 @@
 <% if (sgs = current_subject.suggestions(2)).present? %>
-  <div class="block">
-    <div class="header">
-      <%= image_tag('btn/notifications.png', :class => "header_icon") %>
-      <div class="header_text">
-        <%=t('contact.suggestion.one') %>
-      </div>
-    </div>
-    <div class="content">
-      <div class="suggestions">
-        <%= render :partial => "contacts/contact", :collection => sgs %>
-      </div>
-    </div>
-  </div>
+  <section id="suggestions" data-path="<%= suggestion_contacts_path %>">
+    <header>
+      <h4>
+        <%=t('contact.suggestion.other') %>
+      </h4>
+    </header>
+    <article class="contents">
+    <%= render :partial => "contacts/contact", :collection => sgs, :locals => { destroy_params: { reject: true } } %>
+    </article>
+  </section>
 <%end%>

data/base/app/views/contacts/destroy.js.erb

@@ -1,6 +1,7 @@
-<% 
-  new_contact = @contact.replied? ? current_subject.pending_contacts.last : current_subject.suggestions.first
-  render_string = new_contact.present? ? render(new_contact) : ""
-%>
-
-$('#<%= dom_id(@contact) %>').replaceWith("<%= escape_javascript render_string %>");
+<% if @contact.errors.blank? %>
+SocialStream.Contact.destroy({
+  id: "<%= @contact.id %>"
+});
+<% else %>
+SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
+<% end %>

data/base/app/views/contacts/index.html.erb

@@ -1,37 +1,44 @@
-<% content_for :title do%>
-  <%= t('contact.other')%>
-<%end%>
+<section id="contacts">
+  <%= render partial: 'toolbar/profile', locals: { :subject => profile_or_current_subject } %>
 
-<% sidebar %>
+  <div class="contacts tabbable">
+    <ul class="nav nav-tabs">
+      <% profile_or_current_subject.class.contact_index_models.each do |type| %>
+        <li class="<%= 'active' if current_contact_section?(type) %>">
+          <a data-toggle="tab" href="#<%= type %>" data-path="<%= contacts_path %>"<%= raw ' data-loaded="true"' if current_contact_section?(type) %>><%= t "#{ type }.title", count: :other %></a>
+        </li>
+      <% end %>
+    </ul>
 
-<% toolbar :home, :option => :contacts %>
+    <div class="tab-content">
 
-<div id="my_conferences">
-  <div id="contacts" class="block">
-    <div class="search_field_wrapper">
-      <input type="text" value="Search by name" id="search_field" class="search_input" />
-      <%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
-    </div>
-    <div class="space_center"></div>
-    <div class="row" >
-      <div class="center">
-        <%= link_to t('contact.all_n', :count => @total_contacts.count("DISTINCT contacts.id")), contacts_path %> -
-        <% Actor.distinct_initials.
-                 contacted_from(current_subject).
-                 merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).
-                 distinct_initials.
-                 each do |l| %>
-          <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>
-        <% end %>
+      <div id="contacts-loading">
+        <%= render partial: 'layouts/loading' %>
       </div>
+    
+      <% profile_or_current_subject.class.contact_index_models.each do |type| %>
+        <div id="<%= type %>" class="tab-pane <%= 'active' if current_contact_section?(type) %>">
+          <%= text_field_tag "contact-filter-#{ type }", (current_contact_section?(type) ? params[:q] : ""), class: "pull-right contact-filter", placeholder: "filter", autocomplete: "off" %>
+
+          <div class="contact-list">
+            <% if current_contact_section?(type) %>
+              <% if @contacts.any? %>
+                <%= render @contacts %>
+              <% else %>
+                <%= raw t("contact.empty", explore: explore_path) %>
+              <% end %>
+            <% else %>
+              <%= render partial: 'layouts/loading' %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
     </div>
-    <div class="space_center"></div>
-    <div id="list_contacts_ajax" class="tab_content block">
-      <%= render :partial => "contacts/index"%>
-    </div>
-    <div class="space_center"></div>
   </div>
-</div>
-
 
-<div class="space_center"></div>
+  <%= javascript_tag do %>
+    $(function() {
+      SocialStream.Contact.index();
+    });
+  <% end %>
+</section>

data/base/app/views/contacts/update.js.erb

@@ -0,0 +1,7 @@
+<% if @contact.errors.blank? %>
+SocialStream.Contact.update({
+  id: "<%= @contact.id %>"
+});
+<% else %>
+SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
+<% end %>

data/base/app/views/conversations/_conversation.html.erb

@@ -1,38 +1,46 @@
-<%= div_for(conversation, :class => read_class) do %>
-<div class="notification">
-</div>
-<div class="sender_photo">
-	<%= link_to image_tag(conversation.last_sender.logo.url(:actor),
-	:title => conversation.last_sender.name, :alt => conversation.last_sender.name),
-	conversation.last_sender.subject %>
-</div>
-<div class="content_left">
-	<div class="sender_name">
-		<%= link_to truncate_name(conversation.last_sender.name), conversation.last_sender.subject %>
-	</div>
-	<div class="date">
-		<%= t('time.ago', :time => time_ago_in_words(conversation.updated_at)) %>
-	</div>
-</div>
-<div class="content_right">
-	<div class="subject">
-		<%= link_to(truncate(conversation.subject, :length => 55), conversation_path(conversation.id,:box => @box,:page => params[:page])) %>
-	</div>
-	<div class="briefing">
-		<%= raw(truncate(strip_tags(conversation.last_message.body), :length => 50)) %>
-	</div>
-	<div class="clearfloat">
-	</div>
-</div>
-<% unless @box.eql?'trash' %>
-<div class="action">
-  <% link_to(image_tag('btn/btn_read.png', :alt => t('mailboxer.mark_as_read'), :title => t('mailboxer.mark_as_read'))) %>
-	<%= link_to(image_tag('btn/btn_delete.png', :alt => t('mailboxer.delete'), :title => t('mailboxer.delete')),
-	conversation_path(conversation, :location => @box, :box => @box, :page => params[:page]),
-	:confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
-	:method => :delete, :remote => true) %>
-</div>
-<% end %>
-<div class="clearfloat">
-</div>
+<%= div_for(conversation, :class =>"#{ 'unread ' if conversation.is_unread?(@actor) }") do %>
+
+  <div class="content_left">
+    <div class="avatar">
+      <%= link_to image_tag(conversation.last_sender.logo.url(:small),
+                            :title => conversation.last_sender.name,
+                            :alt => conversation.last_sender.name),
+                  conversation.last_sender.subject %>
+    </div>
+
+    <header>
+      <h5>
+        <%= link_to truncate_name(conversation.last_sender.name), conversation.last_sender.subject %>
+      </h5>
+      <div class="date">
+        <%= t('time.ago', :time => time_ago_in_words(conversation.updated_at)) %>
+      </div>
+    </header>
+
+  </div>
+
+  <div class="content_right">
+
+    <div class="subject">
+      <%= link_to(truncate(conversation.subject, :length => 55), conversation_path(conversation.id,:box => @box,:page => params[:page])) %>
+    </div>
+
+    <% unless @box.eql?'trash' %>
+      <div class="action">
+        <% link_to(image_tag('btn/btn_read.png', :alt => t('mailboxer.mark_as_read'), :title => t('mailboxer.mark_as_read'))) %>
+        <%= link_to(image_tag('cancel.png', :alt => t('mailboxer.delete'), :title => t('mailboxer.delete')),
+                    conversation_path(conversation, :location => @box,
+                                                    :box => @box,
+                                                    :page => params[:page]),
+                                                    :confirm => t('mailboxer.delete_confirm',
+                                                                  :object => conversation.subject),
+                                                    :method => :delete,
+                                                    :remote => true) %>
+      </div>
+    <% end %>
+
+    <div class="briefing">
+      <%= raw(truncate(strip_tags(conversation.last_message.body), :length => 50)) %>
+    </div>
+  </div>
 <% end %>

data/base/app/views/conversations/_conversation_full.html.erb

@@ -1,59 +1,62 @@
-<div class="title">
-  <h2><%= conversation.subject %></h2>
-</div>
+<h3>
+  <%= conversation.subject %>
+</h3>
+
 <div class="action">
-  <% unless @box.eql?'trash' %><%= link_to(image_tag('btn/btn_delete.png', :atl => t('mailboxer.delete'), :title => t('mailboxer.delete')),
-  conversation_path(conversation, :location => 'conversation', :box => @box),
-  :confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
-  :method => :delete, :remote => true) %><% end %>
+  <% unless @box.eql?'trash' %>
+    <%= link_to(image_tag('cancel.png', :alt => t('mailboxer.delete'), :title => t('mailboxer.delete')),
+      conversation_path(conversation, :location => 'conversation', :box => @box),
+           :confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
+           :method => :delete, :remote => true) %>
+  <% end %>
 </div>
-<div class="clearfloat"></div>
+
+<h4>
+  <%= t("message.participants") %>:
+</h4>
 <div class="participants">
-  <h3><%= t("message.participants") %>:</h3>
   <% conversation.recipients.each do |recp| %>
-  <%= link_to image_tag(recp.logo.url(:contact), :title=>recp.name, :alt => recp.name), recp.subject %>
+    <%= link_to image_tag(recp.logo.url(:small), :title=>recp.name, :alt => recp.name), recp.subject %>
   <% end %>
 </div>
+<hr class="soften">
 <div class="messages">
   <% @receipts.each do |receipt| %>
-  <% message = receipt.message %>
-  <% read_class = message.is_unread?(@actor) ? 'unread' : '' %>
-  <%= render :partial => "messages/message",:object => message, :locals => {:read_class => read_class} %>
+    <%= render receipt.message %>
   <% end %>
 
   <% unless @box.eql?'trash' %>
   <br>
   <%= form_tag conversation_path(conversation), :method => :put, :class => "cont_conversation" do %>
   <% if @receipt and @receipt.errors.any? %>
-  <div class="error">
-    <h2><%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:</h2>
-    <ul>
-      <% @receipt.errors.full_messages.each do |msg| %>
-      <li>
-        <%= msg %>
-      </li>
-      <% end %>
-    </ul>
-  </div>
-  <% end %>
-  <div class="block">
-    <div class="form_row">
-      <%= t("message.answer") %>
-    </div>
-    <div class="form_row">
-      <%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
-    </div>
-    <div class="actions center">
-      <%= submit_tag t('mailboxer.reply'), :name => :reply_all,:class => "button" %>
+    <div class="error">
+      <h2>
+        <%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:
+      </h2>
+      <ul>
+        <% @receipt.errors.full_messages.each do |msg| %>
+        <li>
+          <%= msg %>
+        </li>
+        <% end %>
+      </ul>
     </div>
+  <% end %>
+
+  <div class="editor">
+    <%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
+  </div>
+  <div class="actions">
+    <%= submit_tag t('mailboxer.reply'), :name => :reply_all,:class => "btn" %>
   </div>
   <% end %>
   <%end %>
 </div>
+
 <%= javascript_tag do %>
 $(document).ready(function(){  
   $(".message .body img").each(function(){
-    var link = '<a href=\"' + $(this).attr('src') + '\" class=\"img_link\"><img style=\"max-width:490px;max-height:490px;\"src=\"' + $(this).attr('src') + '\"></a>';
+    var link = '<a href=\"' + $(this).attr('src') + '\" class=\"img_link\"><img src=\"' + $(this).attr('src') + '\"></a>';
     $(this).after(link);
     $(this).remove();
     $(".message .body img").aeImageResize({ height: 490, width: 490 });
@@ -68,4 +71,4 @@ $(document).ready(function(){
     });
   })  
 });
-<% end %> 
+<% end %>