social_stream 0.1.7 → 0.2.0

data/app/views/activities/_jquery.html.erb

@@ -1,5 +1,4 @@
 //javascript for main activities input
-
 title = "<%= t('activity.input') %>";
 $("#input_activities").click(function(){
   if(this.value == title){
@@ -9,8 +8,6 @@ $("#input_activities").click(function(){
 });
 
 
-
-
 //javascript for comments
 $(".input_new_comments").val("<%= t('comment.input') %>");
 $(".activities_comment_btn").hide();
@@ -41,6 +38,7 @@ $(".input_new_comments").click(function(){
 //javascript for tocomment option
 $(".to_comment").livequery("click", function(){
   $(this).parents(".activity_content").find(".input_new_comments").click();
+  $(this).parents(".activity_content").find(".input_new_comments").focus();
 	return false;
 });
 $(".to_comment").livequery("blur", function(){
@@ -55,6 +53,7 @@ $(".to_comment").livequery("blur", function(){
 
 
 
+
 //move he last list item before the first item. The purpose of this is if the user clicks to slide left he will be able to see the last item.
 $('#carousel_ul li:first').before($('#carousel_ul li:last'));
 

data/app/views/activities/_options.html.erb

@@ -1,7 +1,7 @@
 <div class="activity_options">
   <ul class="activity_options" >
     <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
-    <% if activity.is_root? %>
+    <% if activity.is_root? && current_user.active_ties_to(activity.receiver).any? %>
     <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
     <% end %>
     <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div></li>

data/app/views/activities/_root.html.erb

@@ -1,7 +1,6 @@
 <%= div_for activity do %>
   <div class="actor_logo">
-    <%= link_to image_tag(activity.sender_subject.logo.url,
-                          :size => "35x35",
+    <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
                           :alt => activity.sender_subject.name),
                  activity.sender_subject %>
   </div>

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

@@ -1,15 +1,18 @@
-<div class="activity_new_comment">
-   <%= form_for Comment.new(:text => t('comment.input'),
-                            :_activity_tie_id =>
-                              current_user.active_ties_to(activity.receiver).first.id,
-                            :_activity_parent_id => activity.id),
-                :remote => true do |f| %>
-     <%= f.hidden_field :_activity_tie_id %>
-     <%= f.hidden_field :_activity_parent_id %>
-     <%= f.text_field :text,   :class =>"input_new_comments" %>
-     <div class="activities_comment_btn">
-       <div class="activities_security"></div>
-       <%= image_submit_tag "btn/btn_share.png" %>
-     </div>
-   <% end %>
-</div>
+<% if current_user.active_ties_to(activity.receiver).any? %>
+  <div class="activity_new_comment">
+ <%= form_for Comment.new(:text => t('comment.input'),
+                          :_activity_tie_id =>
+                            current_user.active_ties_to(activity.receiver).first.id,
+                          :_activity_parent_id => activity.id),
+              :remote => true do |f| %>
+   <%= f.hidden_field :_activity_tie_id %>
+   <%= f.hidden_field :_activity_parent_id %>
+   <%= f.text_field :text,   :class =>"input_new_comments" %>
+   <div class="activities_comment_btn">
+     <div class="activities_security"></div>
+     <%= image_submit_tag "btn/btn_share.png" %>
+   </div>
+ <% end %>
+    </div>
+<% end %>
+

data/app/views/groups/_followers.html.erb

@@ -1,14 +1,16 @@
-		<div id="follower">
-				<div id="title_follower">
-                                  <%=image_tag("btn/btn_follower.png", :alt => "Follower")%><%=@group.followers.count%> <%=t('follower', :count => @group.followers.count)%>
-				</div>
-				<div class="follower_line">
-          <% @group.followers.all.each do |follower| %>
-					    <%=link_to((image_tag(follower.logo.url, :alt => follower.name , :size => "40x40")) , follower)%>
-          <%end%>
-				</div>
-				<div class="future_footer">
-					<%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , group_path)%>
-				</div>
-		</div>
-
+<%if @group.followers.count > 0%>
+<div id="follower">
+    <div id="title_follower">
+      <%=image_tag("btn/btn_group.png", :alt => "Follower")%><%=@group.followers.count%>
+      <%=t('follower', :count => @group.followers.count)%>
+    </div>
+    <div class="follower_line">
+      <% @group.followers.all.each do |follower| %>
+          <%=link_to((image_tag(follower.logo.url, :alt => follower.name , :size => "40x40")) , follower)%>
+      <%end%>
+    </div>
+    <div class="future_footer">
+      <%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , group_path)%>
+    </div>
+</div>
+<%end%>

data/app/views/groups/_group.html.erb

@@ -3,7 +3,7 @@
 <% end %>
   <%= div_for group do %>
     <div class="group_content">
-      <%=link_to(image_tag(group.logo.url, :class => 'btn_group', :alt => group.name, :title => group.name), group) %>
+      <%=link_to(image_tag(group.logo.url(:actor), :class => 'btn_group', :alt => group.name, :title => group.name), group) %>
     </div>
     <div class="group_title">
       <%=link_to(group.name, group)%>

data/app/views/groups/_location.html.erb

@@ -0,0 +1,3 @@
+<div id="map_location" class="content_size">
+  <%= t('location.message', :location => "#{ image_tag('btn/btn_group.png' , :class => 'btn_config') } #{ t('group.one') }: <span class=\"name_group\">#{ sanitize @group.name }</span>").html_safe %>
+</div>

data/app/views/groups/show.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 
-<%= render :partial => 'home/location' %>
+<%= render :partial => 'location' %>
 
 <br class="clearfloat" />
 <div class="space_center">
@@ -17,5 +17,5 @@
 </div>
 
 <%= render :partial => "activities/activities",
-           :locals => { :activities => @group.wall_profile,
+           :locals => { :activities => @group.wall_profile(current_user).paginate,
                         :owner => @group } %>

data/app/views/home/_contacts.html.erb

@@ -1,13 +1,13 @@
 <div class="contacts_header">
     <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
     <div class="contacts_text_header">
-      <%= current_user.friends.count %> <%= t('friend', :count => current_user.friends.count) %>
+      <%= current_user.friends.count %> <%=t('friend', :count => current_user.friends.count) %>
     </div>
 </div>
 <div class ="contacts">
     <div class="contact">
       <%current_user.friends.all.each do |friend|%>
-          <%=link_to((image_tag (friend.logo.url, :alt => friend.name , :size => "40x40")) , friend)%>
+        <%= link_to((image_tag(friend.logo.url, :title => friend.name , :size => "40x40")) , friend)%>
       <%end%>
     </div>
 </div>

data/app/views/home/_groups.html.erb

@@ -0,0 +1,23 @@
+<% if current_user.recent_groups.any? %>
+  <div id="groups_title" class="content_size">
+      <%=t('group.last') %> (<span id="group_count"><%=current_user.recent_groups.count%></span>)
+  </div>
+  <div id="groups_list" class="content_size">
+  <% if (current_user.recent_groups.count) > 10 %>
+    <div id='carousel_container'>
+      <div id='left_scroll'><%=image_tag("btn/group_left.png")%></div>
+      <div id='carousel_inner'>
+        <ul id='carousel_ul'>
+    <% else %>
+     <div class="space_center"></div>
+    <%end%>
+
+          <%= render current_user.recent_groups %>
+    <% if (current_user.recent_groups.count) > 10 %>
+        </ul>
+     </div>
+     <div id='right_scroll'><%=image_tag("btn/group_right.png")%></div>
+    </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/home/_options.html.erb

@@ -1,10 +1,4 @@
 <ul class="menu noaccordion">
-  <li>
-    <%= link_to(image_tag("btn/btn_activities.png", :class => "menu_icon")+t('activity.last'),current_user) %>
-    <ul class="acitem">
-      <li><a href="http://www.pivotx.net/">PivotX</a></li>
-    </ul>
-  </li>
   <li>
     <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), current_user) %>
   </li>

data/app/views/home/_right.html.erb

@@ -1,6 +1,6 @@
   <div id="logo">
     <b><%= link_to(current_user.name, current_user)%></b><br/>
-    <%= link_to(image_tag(current_user.logo.url , :size => "94x65", :alt => current_user.name ), current_user ) %>
+    <%= link_to(image_tag(current_user.logo.url(:profile) ,  :alt => current_user.name ), current_user ) %>
   </div>
   <div class="space_center">
   </div>
@@ -13,10 +13,5 @@
   </div>
   <div class="space_center">
   </div>
-  <% if current_user.friends.count>0 %>
-    <%= render :partial => "contacts" %>
-  <%end%>
-  <div class="space_center">
-  </div>
   <div class="space_center">
   </div>  

data/app/views/home/index.html.erb

@@ -6,14 +6,14 @@
   <%= render :partial => "right" %>
 <% end %>
 
-<%= render :partial => 'home/location' %>
+<%= render :partial => 'location' %>
 
 <br class="clearfloat" />
 <div class="space_center">
 </div>
 <div id="my_groups">
-  <%= render :partial => "users/groups" %>
+  <%= render :partial => "groups" %>
 </div>
 <%= render :partial => "activities/activities",
-           :locals => { :activities => current_user.wall,
+           :locals => { :activities => current_user.wall.paginate,
                         :owner => current_user } %>

data/app/views/posts/_post.html.erb

@@ -1,3 +1,3 @@
 <%= div_for post, :class => 'content_size' do %>
-  <%= post.text %>
+  <%= simple_format post.text %>
 <% end %>

data/app/views/ties/_suggestions.html.erb

@@ -1,11 +1,17 @@
 <% if current_user.suggestion.present? %>
   <% content_for :javascript do %>
+
     $(".suggestions .tie_close").livequery("click",function(){
-      $(this).parents(".tie").replaceWith("<%= escape_javascript(render(current_user.suggestion))%>");
+    temp = $(this);
+    $.get("<%=suggestion_ties_path%>", function(data) {
+    temp.parents(".tie").replaceWith(data);
+    });
+
     });
   <% end %>
 
 
+
 <div class="tie_header">
   <%= image_tag('btn/notifications.png', :class => "tie_icon") %>
   <div class="tie_text_header">

data/app/views/ties/_tie.html.erb

@@ -1,6 +1,6 @@
 <div id="tie_<%=dom_id(tie.receiver_subject)%>" class="tie">
   <div class="tie_actor_logo">
-    <%= link_to(image_tag(tie.receiver_subject.logo.url(:tie), :size =>"30x30"),
+    <%= link_to(image_tag(tie.receiver_subject.logo.url(:tie)),
                 tie.receiver_subject) %>
   </div>
   <div class="tie_content">

data/app/views/users/_contacts.html.erb

@@ -1,19 +1,17 @@
-		<div class="future_conference">
-				<div class="future_header">
-						<div class="future_text_header">
-							<%= image_tag("btn/btn_follower.png", :alt =>"follower") %>2.520 Contacts
-						</div>
-						<div class="title_righ">
-								<a href="#">Ver Todas</a>
-						</div>
-				</div>
-				<div class="post_future_conference">
-						<div class="future_content_center">
-							<%=link_to ( (image_tag ( "albums/1.png", :alt => @user.name , :size => "40x40")) , @user) %>
-							<%=link_to ( (image_tag ( "albums/2.png", :alt => @user.name , :size => "40x40")) , @user) %>
-							<%=link_to ( (image_tag ( "albums/3.png", :alt => @user.name , :size => "40x40")) , @user) %>
-							<%=link_to ( (image_tag ( "albums/4.png", :alt => @user.name , :size => "40x40")) , @user) %>
-						</div>
-				</div>
-		</div>
+<div class="contacts_header">
+    <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
+    <div class="contacts_text_header">
+      <%= @user.friends.count %> <%= t('friend', :count => @user.friends.count) %>
+    </div>
+</div>
+<div class ="contacts">
+    <div class="contact">
+      <%@user.friends.all.each do |friend|%>
+          <%=link_to((image_tag (friend.logo.url, :alt => friend.name , :size => "40x40")) , friend)%>
+      <%end%>
+    </div>
+</div>
+<div class="contacts_footer">
+  <%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , users_path) %>
+</div>
 

data/app/views/users/_groups.html.erb

@@ -1,6 +1,6 @@
 <% if current_user.recent_groups.any? %>
   <div id="groups_title" class="content_size">
-      <%=t('group.my') %> (<span id="group_count"><%=current_user.recent_groups.count%></span>)
+      <%=t('group.one', :count => current_user.recent_groups.count) %> (<span id="group_count"><%=current_user.recent_groups.count%></span>)
   </div>
   <div id="groups_list" class="content_size">
   <% if (current_user.recent_groups.count) > 10 %>
@@ -11,7 +11,6 @@
     <% else %>
      <div class="space_center"></div>
     <%end%>
-
           <%= render current_user.recent_groups %>
     <% if (current_user.recent_groups.count) > 10 %>
         </ul>

data/app/views/users/_location.html.erb

@@ -0,0 +1,3 @@
+<div id="map_location" class="content_size">
+  <%= t('location.message', :location => "#{ image_tag('btn/btn_profile.png' , :class => 'btn_config') } #{ t('profile.one') }: <span class=\"name_group\">#{ sanitize @user.name }</span>").html_safe %>
+</div>

data/app/views/users/_logo.html.erb

@@ -1,6 +1,4 @@
 <div id="logo">
-  <%=link_to(image_tag(@user.logo.url, :size => "120x196"), @user) %>
-  <br/>
-  <%= @user.name %>
-  <br/>
+  <b><%= @user.name %></b><br/>
+  <%=image_tag(@user.logo.url(:profile)) %>
 </div>

data/app/views/users/_menu.html.erb

@@ -1,30 +1,7 @@
-<div class="menu_lateral">
-  <div class="option_menu">
-    <div class="text_menu">
-      &nbsp;&nbsp;<a href="#">Write a Message to <%=@user.name%></a>
-    </div>
-  </div>
+<div class="menu_header"><b><%=t('menu.options')%></b>
 </div>
-<div class="space_center">
-</div>
-<div class="menu_lateral">
-  <div class="option_menu">
-    <%= image_tag("btn/btn_inbox.png") %>
-    <div class="text_menu">
-      <a href="#">Inbox(2)</a>
-    </div>
-  </div>
-</div>
-<div id="space_center_border">
+<div id="menu_lateral">
+  <%= render :partial => "options" %>
 </div>
 <div class="space_center">
 </div>
-<div id="sub_menu_lateral">
-  <div class="option_menu">
-    <%= image_tag("btn/btn_video.png") %>
-    <div class="text_menu">
-      <a href="#">Groups</a>
-    </div>
-  </div>
-</div>
-

data/app/views/users/_middle_show.html.erb

@@ -1,2 +1 @@
 <%= render :partial => 'profile' %>
-<%= render :partial => 'contacts' %>

data/app/views/users/_options.html.erb

@@ -0,0 +1,5 @@
+<ul class="menu noaccordion">
+  <li>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), current_user) %>
+  </li>
+</ul>

data/app/views/users/_right_show.html.erb

@@ -2,4 +2,13 @@
 <div class="space_center">
 </div>
 <%= render :partial => 'menu' %>
+<div class="space_center">
+</div>
+<% if @user.friends.count>0 %>
+  <%= render :partial => "contacts" %>
+<%end%>
+<div class="space_center">
+</div>
+<div class="space_center">
+</div>
 

data/app/views/users/show.html.erb

@@ -6,7 +6,7 @@
   <%= render :partial => 'right_show' %>
 <% end %>
 
-<%= render :partial => 'home/location' %>
+<%= render :partial => 'location' %>
 
 <br class="clearfloat" />
 <div class="space_center">
@@ -14,5 +14,5 @@
 
 <%= render :partial => "users/groups" %>
 <%= render :partial => "activities/activities",
-           :locals => { :activities => @user.wall_profile,
+           :locals => { :activities => @user.wall_profile(current_user).paginate,
                         :owner => @user } %>

data/config/locales/en.yml

@@ -56,11 +56,12 @@ en:
       sentence2: "Posts, comments and activities"
     stats: "%{users} users and %{groups} groups registered"
   group:
+    one: "Group"
+    other: "Groups"
     all: "All Groups"
     by: "By Groups"
     my: "My Groups"
-    one: "Group"
-    other: "Groups"
+    last: "Last Groups"
     popular:
       most: "Most popular"
     voted: