social_stream 0.9.7 → 0.10.0

data/.gitignore

@@ -11,3 +11,4 @@ nbproject
 lib/generators/social_stream/templates/public/images/tmp/
 **.*swp
 spec/dummy/documents/pictures/*
+.code_swarm

data/README.rdoc

@@ -54,6 +54,7 @@ Current Social Stream distribution includes:
   along with users, group, post and comments
 * {Social Stream Documents}[https://github.com/ging/social_stream/tree/master/documents], support for
   activities on files
+* {Social Stream Events}[https://github.com/ging/social_stream/tree/master/events], videoconference events with an agenda and several sessions
  
 = Documentation
 

data/base/app/assets/javascripts/activities.js.erb

@@ -91,11 +91,12 @@ $(function() {
   //show only the text fields for new comment if there are any comment to the post
   $(".activity_new_comment").each(function(){
   	if ($.trim($(this).siblings(".activity_comments").text()) != ""){
-  	  $(this).addClass("comment_shown");
   	  $(this).show();
   	}
   });
   $(".activities_comment_btn").hide();
+  $(".actor_name_new_comment").hide();
+  $(".actor_logo_new_comment").hide();
   
   //if there are 4 or more commments we only show the last 2 and a link to show the rest
   $(".activity_comments").each(function(){
@@ -117,9 +118,16 @@ showAllComments = function(id){
 };
 
 //usa livequery para usar el javascript luego de una accion con  AJAX
-$(".input_new_comments").live("click",function(){
+$(".input_new_comments").live("click", function(){
 	$(".activities_comment_btn").hide();
+	$(".new_comment").removeClass("new_comment_shown");
+	$(".actor_name_new_comment").hide();
+	$(".actor_logo_new_comment").hide();
 	$(this).parent(".new_comment").children(".activities_comment_btn").show();
+	$(this).parent(".new_comment").addClass("new_comment_shown");
+	$(this).parents(".activity_new_comment").find(".actor_name_new_comment").show();
+  $(this).parents(".activity_new_comment").find(".actor_logo_new_comment").show();
+  return false;
 });
 
 //javascript for tocomment option

data/base/app/assets/stylesheets/activities.css

@@ -23,14 +23,14 @@
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
 	display: inline-block;	color: #000; font-size: 13px;  color: #2A3890;border-bottom:1px solid #E9E9E9;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
-.activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 89%;}
+.activity_content {	padding: 0px;	display: inline-block;	color: #000;	width: 89%;}
 .actor_name {font-size: 13px;}
 .actor_name a{font-weight: bold;}
 .post a {	color: #2A3890;}
 
 /***************** ACTIVITY OPTIONS ***/
 .activity_options {	color: #2A3890;	font-size: 10px;  display: inline-block;}
-.actor_name-activity_objects{  font-weight: bold;	color: #2A3890;  font-size:12px;}
+.actor_name-activity_objects, .actor_name_new_comment{  font-weight: bold;	color: #2A3890;  font-size:12px; margin: 5px 0px;}
 .activity_objects{padding-bottom:5px;}
 .subactivity_objects{	color: #000;  font-weight:normal;  font-size:11px;}
 .post_time_ago {	color: #6c6d6f;}
@@ -42,6 +42,7 @@
 .activity_options .icon_blue{  padding-left:5px;  list-style-image:url("/images/point_blue.png");
   list-style-position:inside;}
 
+.security, .post_time_ago, .verb_comment, .verb_like, .verb_comment, .verb_delete{ display: inline-block;}
 
 
 /************* ACTIVITY - FOOTER *********/
@@ -58,7 +59,7 @@
 
 .activity_new_comment{  font-size: 11px;  padding-left: 5px;	background: #deeff8;
 	border: thin solid #D4E4E4; padding-top: 3px;  padding-bottom: 3px;display:none;}
-.actor_logo_subactivity {	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
+.actor_logo_subactivity, .actor_logo_new_comment{	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
 	vertical-align: top;}
 .input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px; color:#2A3890;}
 .subactivity{  font-size: 11px;  padding: 0px 5px 0px 5px;  background: #deeff8;
@@ -71,7 +72,8 @@
 
 .hide_show_comments{font-size: 11px;  padding-left: 5px;	background: #deeff8;
 	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;}
-.new_comment{ display: inline-block; padding-top: 19px; width: 410px;}
+.new_comment{ width: 465px;}
+.new_comment_shown{ width: 410px;}
 /*********** DROP DOWN**********/
 #security_chzn .chzn-choices {
 	padding-left: 20px;

data/base/app/helpers/contacts_helper.rb

@@ -7,9 +7,11 @@ module ContactsHelper
     if c.reflexive?
       t('subject.this_is_you')
     else
-      link_to c.status,
+      link_to(c.status,
               edit_contact_path(c),
-              :title => t("contact.#{ c.action }.title", :name => c.receiver.name)
+              :title => t("contact.#{ c.action }.title", :name => c.receiver.name)) +
+        "<br/>".html_safe +
+        link_to(t('actor.delete'), contact_path(c), :action => :destroy, :confirm => t('actor.confirm_delete'), :remote => true)
     end
 
   end

data/base/app/models/tie.rb

@@ -131,7 +131,7 @@ class Tie < ActiveRecord::Base
   end
 
   def relation_belongs_to_sender
-    errors.add(:relation, "Relation must belong to sender") unless
+    errors.add(:relation, "must belong to sender") unless
       contact.sender_id == relation.actor_id
   end
 end

data/{events/app/views/activities/_index.html.erb → base/app/views/activities/_filter.html.erb}

@@ -47,15 +47,7 @@
 				});
             });    
 <% end %>
-<div id="wrapper_activities">
-  <div id="wrapper_activities_header">
-    <div id="activities_title" class="content_size">
-      <div class="activities_title_header">
-        <%= image_tag("btn/activity.png") %><%= t 'activity.title' %>
-      </div>
-    </div>
-    <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
-  </div>
+
   <div id="filter_div">
         <%= form_tag "/activities/documents", :method => :post ,:id=> 'form_filter', :class => "tie_form",:remote=> true do %>
 						<span class="sb_down">Filter</span>
@@ -88,7 +80,4 @@
 					</ul>
         <% end %>
   </div>
-  <%= render :partial => 'activities/wall',
-             :locals  => { :activities => activities } %>
 
-</div>

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

@@ -1,15 +1,18 @@
 <div class="activity_options">
-  <ul class="activity_options" >
     <% if user_signed_in? %>
-    <li><div class="security"><%= image_tag('btn/btn_security.png', :title => activity.audience_in_words(current_subject)) %></div></li>
+      <div class="security"><%= image_tag('btn/btn_security.png', :title => activity.audience_in_words(current_subject)) %></div>
     <% end %>
-    <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
+    <div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div>
     <% if activity.is_root? && user_signed_in? %>
-    <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
+      <div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div>
     <% end %>
-    <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div></li>
+      <div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div>
     <% if activity.delete_object_by?(current_subject) %>
-      <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
+      <div class="verb_delete"> 
+        · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', 
+                      :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  
+                      :remote => true %> 
+      </div>
     <% end %>
   </ul>
 </div>

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

@@ -1,9 +1,13 @@
 <% if user_signed_in? && current_subject.can_comment?(activity) %>
   <div class="activity_new_comment">
-    <div class="actor_logo_subactivity">
+    <div class="actor_logo_new_comment">
       <%= image_tag(current_subject.logo.url(:actor),
                             :alt => current_subject.name)%>
     </div>
+    <div class= "activity_content">
+      <div class="actor_name_new_comment">
+        <%= current_subject.name %>
+      </div>
       <%= form_for Comment.new(:text => t('comment.input'),
                               :_contact_id =>
                                 current_subject.contact_to!(activity.receiver).id,
@@ -12,26 +16,23 @@
                 :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
                 :remote => true do |f| %>
 
-   <%= f.hidden_field :_contact_id %>
-   <%= f.hidden_field :_activity_parent_id %>
+        <%= f.hidden_field :_contact_id %>
+        <%= f.hidden_field :_activity_parent_id %>
+    
+        <%= f.text_field :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity) %>
 
-   <%= f.text_field :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity) %>
-
-   <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 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>
+  </div>
 <% end %>
 
 <%= javascript_tag do %>
   $(document).ready(function() {
     $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
-    activate_anti_rebounds();
-    $(".input_new_comments").blur(function(){
-        $(".activity_new_comment").hide();
-        $(".comment_shown").show();
-      });  
+    activate_anti_rebounds(); 
   });
 <% end %>

data/base/app/views/profiles/_profile.html.erb

@@ -6,6 +6,10 @@
   <%= render :partial=> "personal"%>
 <%end%>
 
+<%  if  @profile.subject.subject_type == 'Event' %>
+  <%= render :partial=> "outline", :locals => {:profile => @profile} %>
+<% end %>
+
 <% if (!is_contact_empty?) or(is_owner?)%>
   <%= render :partial=> "contact"%>
 <%end%>

data/base/app/views/settings/_contacts.html.erb

@@ -0,0 +1,16 @@
+<div class="block" id="manage_settings">
+  <div class="header">
+    <div class="header_text">
+      <%= t('settings.manage.name')%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to image_tag('btn/edit.png'), contacts_path %>
+    </div>
+  </div>
+  <div class="content" id="contact_settings_briefing">
+    <div class="form_row">
+      <%= t('settings.manage.briefing')%>
+    </div>
+  </div>
+</div>
+

data/base/app/views/settings/_index.html.erb

@@ -9,3 +9,4 @@
 <% if current_subject.respond_to? :authentication_token%>
 <%= render :partial => "api_key" %>
 <% end %>
+<%= render :partial => "contacts" %>

data/base/app/views/toolbar/_logo.html.erb

@@ -14,3 +14,10 @@
     <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119"), subject %>
   <% end %>
 </div>
+<% if subject.subject_type == 'Event' %>
+<%  @founder = Actor.normalize(subject.founder_id) %>
+<div id="founder">
+  <div id="created"><%=t('actor.created')%></div>
+  <div id="thumb"><%= link_to(image_tag(@founder.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon', :id=> 'current_user_avatar_img'), @founder.subject  ) %></div>
+</div>
+<% end %>

data/base/app/views/toolbar/_profile.html.erb

@@ -10,7 +10,14 @@
 <div class="block space_center">
 </div>
 
-<%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
+<%  if  subject.subject_type == 'Event' %>
+  <% subject.relation_customs.each do |temp| %>
+    <%= render :partial => 'toolbar/organizer', :locals => { :subject => subject,:tie=> temp } %>
+  <% end %>
+  <%= render :partial => 'toolbar/suscribed', :locals => { :subject => subject } %>
+<% else %>
+  <%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
+<% end %>
 
 <div class="block space_center">
 </div>

data/base/config/locales/en.yml

@@ -55,32 +55,10 @@ en:
       post:
         title:
           other_wall: "%{sender} → %{receiver}"
-  avatar:
-    crop_image: "Crop the uploaded image"
-    crop_submit: "Crop image"
-    destroy: "Delete"
-    destroy_sure: "Are you sure you wan't to delete the selected avatar?"
-    error:
-      no_file: "You have to select a file"
-      no_image_file: "The file you uploaded isn't valid, it must be an image file"
-    list: "You have these avatars"
-    new: "Create a new avatar"
-    new_short: "New avatar"
-    no_avatars: "You haven't got any avatar, plesase create a new one."
-    one: "Avatar"
-    other: "Avatars"
-    original: "Original image"
-    preview: "Preview"
-    profile_change: "Change your avatar"
-    set_default: "Set as default"
-    set_default_sure: "Are you sure you wan't to set this avatar as default?"
-    text:
-      new: "... or upload a new one"
-      use: "Use your saved avatars ..."
-    upload: "Upload"
   browse: "Browse"
   button:
     cancel: "Cancel"
+    create: "Create"
     save: "Save"
     update: "Update"
   cleditor:
@@ -246,6 +224,8 @@ en:
     form:
       title: "Post"
     title: "Posts"  
+  preposition:
+    and: "and"
   profile:
     one: "Profile"
     age: "Age"
@@ -351,6 +331,10 @@ en:
     error: "Some errors raised when saving your changes"
     for: "Settings for"
     main: "Main settings"
+    manage:
+      name: "Admin Contacs"
+      briefing: "Settings contacts preferences"
+      explanation: "Change contacts permissions"
     one: "Settings"
     success: "Your settings where correctly changed"
     api_key:

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.10".freeze
+    VERSION = "0.9.11".freeze
   end
 end

data/base/lib/tasks/db/populate.rake

@@ -40,7 +40,7 @@ namespace :db do
             dimensions = Avatar.get_image_dimensions(avatar)
             l = Avatar.new(:actor => i.actor,:logo => File.open(avatar), :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
             l.active = true
-            l.save
+            l.save!
           end
         end
       end

data/events/config/locales/en.yml

@@ -34,8 +34,6 @@ en:
     confirm_delete: "Confirm delete?"
   agenda:
     confirm_delete: "delete"
-  button:
-    create: "Create"
   conference:
     title: "Conferences"
     list: "Contact's conferences"
@@ -69,8 +67,6 @@ en:
       info: "Event information"
       tags: "Event tags"
     outline: "Outline"
-  preposition:
-    and: "and"
   session:
     confirm_delete: "delete"
     new: "New Session"
@@ -79,11 +75,6 @@ en:
     title: "title"
     description: "description"
     schedule: "schedule"
-  settings:
-    manage:
-      name: "Admin Contacs"
-      briefing: "Settings contacts preferences"
-      explanation: "Change contacts permissions"
   time:
     am: am
     end: End time

data/events/config/routes.rb

@@ -1,19 +1,6 @@
-
 Rails.application.routes.draw do
 
-  resource :settings
-  resource :tie
-  match "/settings/update_relation/:id" => "settings#update_relation"
-
-  resource :settings
-  resource :tie
-
-  resource :actor
-  match "/settings/update_relation/:id" => "settings#update_relation"
-  match "/settings/manage" => "settings#manage"
   match "/events/manage" => "events#manage"
-  match "/settings/delete_relation/:id" => "settings#delete_relation"
-  match "/activities/documents" => "activities#documents"
   match "/sessions/delete/:id" => "sessions#delete"
   # Social Stream subjects configured in config/initializers/social_stream.rb
 
@@ -27,7 +14,6 @@ Rails.application.routes.draw do
     end
   end
 
-
   match "events/:id/agenda" => "agendas#show"
   match "events/:id/sessions" => "sessions#show"
   match "events/:id/sessions/create" => "sessions#create"
@@ -41,6 +27,4 @@ Rails.application.routes.draw do
   match "sessions/:id/new" => "sessions#new"
   match "sessions/:id/create" => "sessions#create"
   match "sessions/:id/update" => "sessions#update"
-
-
 end

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.2".freeze
+    VERSION = "0.0.4".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.9.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.11')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.9.7".freeze
+  VERSION = "0.10.0".freeze
 end