social_stream 0.10.4 → 0.11.0

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

@@ -36,7 +36,7 @@
   overflow: hidden;
   position: absolute;
   z-index: 2000;
-  background: whiteSmoke;
+  background: #f5f5f5;
   text-align: left;
 }
 #header_search_display a {
@@ -53,7 +53,7 @@
   border-top: solid 1px #B9B9B9;
   font-size: 10px;
   height: 35px;
-  background: whiteSmoke;
+  background: #f5f5f5;
   overflow: hidden;
   text-align: center;
 }
@@ -79,7 +79,7 @@
 #header_search_display  li .link {
   display: none;
 }
-#header_search_display  li.subject_result {
+#header_search_display  li.result {
   padding: 0px;
   height: 45px;
   text-align: left;
@@ -111,13 +111,23 @@
 .search_row {
   text-align: center;
 }
-.subject_with_details {
+.model_with_details {
   padding: 5px;
 }
 .subject_search_results {
-  width: 280px;
+  width: 186px;
   text-align: center;
 }
+.subject_search_results img {
+  width: 48px;
+  height: 48px;
+}
+.subject_search_results .sub-block {
+  width: 62%;
+  word-wrap: break-word;
+  height: 50px;
+  overflow: hidden;
+}
 #search_results {
   text-align: center;
 }
@@ -129,20 +139,8 @@
   float: right;
   padding: 0;
 }
-#search_results .title {
-  width: 540px;
-  margin: auto;
-  background-color: #E1EEF5;
-  padding: 5px;
-  font-weight: bold;
-  text-align: center;
-}
-#search_results .subject_search_results .title {
-  width: 260px;
-}
 /********************************* Form and errors *********/
 #search_form .error {
   display: none;
 }
-
 /******************** Search css END ***********************/

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

@@ -1,3 +1,10 @@
 /*
  *= require menu
  */
+
+#toolbar .model_with_details .sub-block{
+  width:62%;
+  word-wrap: break-word;
+  height: 50px;
+  overflow: hidden;
+}

data/base/app/controllers/invitations_controller.rb

@@ -1,4 +1,6 @@
 class InvitationsController < ApplicationController
+  before_filter :authenticate_user!
+
   def new
 
   end

data/base/app/controllers/search_controller.rb

@@ -1,24 +1,24 @@
 class SearchController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
+  
+  helper_method :get_search_query
 
-  #before_filter :authenticate_user! #??
-
-  FOCUS_SEARCH_PER_PAGE=16
+  RESULTS_SEARCH_PER_PAGE=15
   MIN_QUERY=2
+  
   def index
-    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
     if params[:search_query].blank? or too_short_query
-      @search_result = nil_search
+    @search_result = []
     else
       if params[:mode].eql? "header_search"
-        @search_result = header_search
-        render :partial => "header_search", :locals => {:search_result => @search_result}
+        @search_result = search :quick
+        render :partial => "header_search"
       return
       else
         if params[:focus].present?
           @search_result = focus_search
         else
-          @search_result = global_search
+          @search_result = search :extended
         end
       end
     end
@@ -30,6 +30,25 @@ class SearchController < ApplicationController
 
   private
 
+  def search mode
+    models = SocialStream.extended_search_models
+    models = SocialStream.quick_search_models if mode.to_s.eql? "quick"
+    models.map! {|model_sym| model_sym.to_s.classify.constantize}
+    result = ThinkingSphinx.search(get_search_query, :classes => models)
+    if mode.to_s.eql? "quick"
+      result.page(1).per(7)
+    else
+      result.page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+    end
+    return result
+  end
+
+  def focus_search
+    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
+    search_class = @search_class_sym.to_s.classify.constantize
+    ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+  end
+
   def too_short_query
     bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
     return bare_query.strip.size < MIN_QUERY
@@ -45,41 +64,4 @@ class SearchController < ApplicationController
     end
     return search_query.strip
   end
-
-  def global_search
-    return search 6
-  end
-
-  def header_search
-    return search 3
-  end
-
-  def search max_results
-    result = Hash.new
-    total_shown = 0
-    SocialStream.subjects.each do |subject_sym|
-      result.update({subject_sym => ThinkingSphinx.search(get_search_query, :classes => [subject_sym.to_s.classify.constantize]).page(1).per(max_results)})
-      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count(get_search_query, :classes => [subject_sym.to_s.classify.constantize])})
-    end
-    return result
-  end
-
-  def focus_search
-    string_class = params[:focus].singularize
-    search_class = string_class.classify.constantize
-    return ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(FOCUS_SEARCH_PER_PAGE)
-  end
-
-  def nil_search
-    if params[:focus].present?
-      result = []
-    else
-      result = Hash.new
-      SocialStream.subjects.each do |subject_sym|
-        result.update({subject_sym => []})
-        result.update({(subject_sym.to_s+"_total").to_sym => 0})
-      end
-    end
-    return result
-  end
 end

data/base/app/helpers/contacts_helper.rb

@@ -7,11 +7,7 @@ module ContactsHelper
     if c.reflexive?
       t('subject.this_is_you')
     else
-      link_to(c.status,
-              edit_contact_path(c),
-              :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)
+      render :partial => 'contacts/link', :locals => { :contact => c }
     end
 
   end

data/base/app/helpers/search_helper.rb

@@ -1,8 +1,8 @@
 module SearchHelper  
-  def subject_with_details subject
-    subject = subject.subject if subject.is_a? Actor    
-    render :partial => subject.class.to_s.pluralize.downcase + '/' + subject.class.to_s.downcase + '_with_details',
-           :locals => {subject.class.to_s.downcase.to_sym => subject}
+  def model_with_details model
+    model = model.model if model.is_a? Actor    
+    render :partial => model.class.to_s.pluralize.downcase + '/' + model.class.to_s.downcase + '_with_details',
+           :locals => {model.class.to_s.downcase.to_sym => model}
   end
   
   def focus_search_link text, search_class, query

data/base/app/models/actor.rb

@@ -15,8 +15,6 @@ class Actor < ActiveRecord::Base
   include SocialStream::Models::Supertype
   include SocialStream::Models::Object
   
-  delegate :tag_list, :tag_list=, :tagged_with, :tag_counts, :to => :activity_object
-  
   validates_presence_of :name, :subject_type
   
   acts_as_messageable
@@ -159,7 +157,7 @@ class Actor < ActiveRecord::Base
         when String
           emails << receiver_emails
         when Array
-          receveir_emails.each do |receveir_email|
+          receiver_emails.each do |receiver_email|
             emails << receiver_email
           end
         end

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

@@ -2,6 +2,6 @@
   <%= render activity_object.object %>
 <% else %>
   <div class="block">
-    <%= subject_with_details activity_object.object %>
+    <%= model_with_details activity_object.object %>
   </div>
 <% end %>

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

@@ -0,0 +1,9 @@
+<%= 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), :action => :destroy, :confirm => t('contact.confirm_delete'), :remote => true) %>
+
+<% end %>

data/base/app/views/frontpage/_caracteristics.html.erb

@@ -0,0 +1,23 @@
+<div id="caracteristics">
+  <ul>
+    <li class="participants">
+        <%= t('frontpage.elements.participants') %>
+    </li>
+    <li class="organizers">
+        <%= t('frontpage.elements.organizers') %>
+    </li>
+    <li class="spaces">
+        <%= t('frontpage.elements.groups') %>
+    </li>
+    <li class="comments">
+        <%= t('frontpage.elements.comments') %>
+    </li>
+    <li class="tags">
+        <%= t('frontpage.elements.tags') %>
+    </li>
+    <li class="networks">
+        <%= t('frontpage.elements.networks') %>
+    </li>
+  </ul>
+</div>
+

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

@@ -1,5 +1,5 @@
 <% content_for :title do%>
-  <%= t('welcome') %>
+  <%= t('welcome', :site => t('site.name')) %>
 <%end%>
 
 <div class="banner_busqueda">
@@ -40,6 +40,7 @@
     <div class="sentences">
       <ul>
         <li class="green"><%= t('frontpage.meet.sentence1') %></li>
+        <li class="green"><%= t('frontpage.meet.sentence2') %></li>
       </ul>
     </div>
   </div>
@@ -65,30 +66,7 @@
 </div>
 
 <div id="wrapper_right">
-  <div id="caracteristics">
-    <ul>
-      <li class="participants">
-          <%= t('frontpage.elements.participants') %>
-      </li>
-      <li class="organizers">
-          <%= t('frontpage.elements.organizers') %>
-      </li>
-      <li class="spaces">
-          <%= t('frontpage.elements.groups') %>
-      </li>
-      <li class="comments">
-          <%= t('frontpage.elements.comments') %>
-      </li>
-      <li class="tags">
-          <%= t('frontpage.elements.tags') %>
-      </li>
-      <li class="networks">
-          <%= t('frontpage.elements.networks') %>
-      </li>
-    </ul>
-  </div>
+  <%= render :partial => 'frontpage/caracteristics' %>
 </div>
 
 <div id="espacio_body_bottom"></div>
-
-

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

@@ -5,7 +5,7 @@
 <div class="row">
   <% end %>
   <div class="label">
-    <%= subject_with_details group %>
+    <%= model_with_details group %>
   </div>
   <% if ((cont%2) == 0) 	%>
 </div>

data/base/app/views/invitation_mailer/send_invitation.html.erb

@@ -7,11 +7,11 @@
     <div>
       <div>
         <div style="padding: 10px 5px 5px 5px;">
-          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('site.name'), new_user_registration_url)%>
+          <%= raw t('invitation.invited', :sender => "<span id=\"name\" style=\"font-weight: bold;\">#{ h @sender.name}</span>", :site => link_to(t('site.name'), new_user_registration_url)) %>
         </div>
         <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
           <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
-            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
+            <img src="<%= root_url + @sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
           </div>
           <div style=" margin: 5px 5px 5px 5px;">
             <p style="font-weight: bold; "><%= @sender.name %>
@@ -20,7 +20,7 @@
               <% end %>
             </p>       
             <% if @message.blank? %>
-              <p style="text-align: justify;"><%= t('invitation.join_me')%></p>         
+              <p style="text-align: justify;"><%= t('invitation.join_me', :site => t('site.name'))%></p>         
             <%else%>
               <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
             <%end%>

data/base/app/views/invitation_mailer/send_invitation.text.erb

@@ -1,7 +1,7 @@
-<%= @sender.name %> has invited you to <%= t('site.name')%>: <%= new_user_registration_url%>
+<%= t('invitation.invited', :sender => @sender.name, :site => t('site.name')) %>: <%= new_user_registration_url%>
 
 <% if @message.blank? %>
-  <%= t('invitation.join_me')%>         
+  <%= t('invitation.join_me', :site => t('site.name'))%>         
 <%else%>
   "<%= @message%>"
 <%end%>
@@ -14,6 +14,7 @@
 
 <%= t('frontpage.meet.default')%>:
 <%= t('frontpage.meet.sentence1') %>
+<%= t('frontpage.meet.sentence2') %>
 
 <%= t('frontpage.collaborate.default')%>:
 <%= t('frontpage.collaborate.sentence1') %>

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

@@ -10,7 +10,7 @@
 
 <%= form_tag invitations_path, :method=> :post, :class => "invitation_form", :remote => true  do %>
   <div class="block">   
-    <h3 class= "form_row"><%=t('invitation.join')%></h3>
+    <h3 class= "form_row"><%=t('invitation.join', :site => t('site.name'))%></h3>
     <div class="form_row form_label ">
       <%= label_tag t('invitation.e-mails')%>
       <span class= "form_comment">(Separated by commas)</span>
@@ -30,4 +30,4 @@
   <div class="form_row space_center">
     <%= submit_tag t('action.send'), :class => "button" %>
   </div>
-<%end%>
+<%end%>

data/base/app/views/layouts/_header_dropdown_menu.html.erb

@@ -1,7 +1,7 @@
 <div id="header_dropdown_menu">
   <ul class="sf-menu" >
     <li class="header_dropdown_li">
-      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name %><span class="sf-sub-indicator"> »</span></a>
+      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name, :length => 15 %><span class="sf-sub-indicator"> »</span></a>
       <ul>
         <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
         <li>

data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -5,7 +5,7 @@
   <ul>
     <% representations.each do |representation| %>
     <li>
-      <%= link_to truncate_name(representation.name), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+      <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
     </li>
     <% end %>
   </ul>

data/base/app/views/posts/_new_activity.html.erb

@@ -1 +1 @@
-<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Post.new(:text => t('activity.input')), :remote => true} %>
+<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Post.new, :remote => true} %>

data/base/app/views/posts/_new_activity_fields.erb

@@ -1 +1,7 @@
 <%= f.text_field :text, :id => "input_activities", :size => 85 %>
+
+<%= javascript_tag do %>
+  $(function() {
+    $("#input_activities").Watermark("<%= I18n.t('post.input') %>","#666");
+  });
+<% end %>

data/base/app/views/search/_extended_search.html.erb

@@ -0,0 +1,14 @@
+<% if @search_result.empty? %>
+<div class="model_with_details">
+  <%= I18n.t('search.nothing') %>
+</div>
+<% else %>
+<% total = 0 %>
+<% @search_result.each do |model|%>
+<div class="subject_search_results block left">
+  <%= model_with_details model %>
+</div>
+<% end %>
+<br class="clearfloat">
+<%= paginate @search_result %>
+<% end %>