social_stream-base 0.9.15 → 0.9.16

data/app/assets/stylesheets/{ties.css → ties.css.scss}

@@ -1,10 +1,12 @@
+@import "colors";
+
 circle.node {
-	stroke: #fff;
+	stroke: $text-over-main;
 	stroke-width: 1.5px;
 }
 
 line.link {
-	stroke: #999;
+	stroke: $details-color;
 	stroke-opacity: .6;
 }
 

data/app/controllers/search_controller.rb

@@ -3,7 +3,7 @@ class SearchController < ApplicationController
   
   helper_method :get_search_query
 
-  RESULTS_SEARCH_PER_PAGE=15
+  RESULTS_SEARCH_PER_PAGE=12
   MIN_QUERY=2
   
   def index

data/app/helpers/search_helper.rb

@@ -1,9 +1,4 @@
 module SearchHelper  
-  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
     search_class = search_class.to_s if search_class.is_a? Class or search_class.is_a? Symbol
@@ -15,4 +10,29 @@ module SearchHelper
     bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
     return bare_query.strip.size < SearchController::MIN_QUERY
   end
+  
+  def render_global_search_for model
+    render_model_view model, "_global_search"    
+  end
+  
+  def render_focus_search_for model
+    render_model_view model, "_focus_search"    
+  end
+  
+  def model_with_details model
+    render_model_view model, "_with_details"
+  end
+  
+  def render_model_view model, type
+    model = model.model if model.is_a? Actor    
+    render :partial => model.class.to_s.pluralize.downcase + '/' + model.class.to_s.downcase + type,
+           :locals => {model.class.to_s.downcase.to_sym => model}
+    
+  end
+  
+  def get_search_query_words
+    search_query = ""
+    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    return bare_query.strip.split
+  end
 end

data/app/helpers/toolbar_helper.rb

@@ -61,7 +61,7 @@ module ToolbarHelper
     when Mime::JS
       response = <<-EOJ
 
-          $('#toolbar').html("#{ escape_javascript(content) }");
+          $('#toolbarContent').html("#{ escape_javascript(content) }");
           initMenu();
           expandSubMenu('#{ options[:option] }');
           EOJ

data/app/models/post.rb

@@ -2,11 +2,11 @@ class Post < ActiveRecord::Base
   include SocialStream::Models::Object
 
   validates_presence_of :text
-  
-    define_index do
+
+  define_index do
     indexes text
-    
+
     has created_at
   end
-  
+
 end

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

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

data/app/views/frontpage/_header.html.erb

@@ -21,10 +21,8 @@
         <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
         <span>|</span>
         <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
-        <span>|</span>
-        <%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
-     
-        <%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
+
+        <%= render :partial => 'frontpage/social_networks' %>
       </div>
     </div>
   <br class="clearfloat" />

data/app/views/frontpage/_social_networks.html.erb

@@ -0,0 +1,5 @@
+<span>|</span>
+<%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
+
+<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
+

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

@@ -31,7 +31,6 @@
     </div>
   </div>
   <div class="espacio"></div>
-
   <div id="meet">
     <div class="icon">
       <div id="icon_meet"></div>
@@ -45,7 +44,6 @@
     </div>
   </div>
   <div class="espacio"></div>
-
   <div id="collaborate">
     <div class="icon">
       <div id="icon_collaborate"></div>
@@ -59,7 +57,6 @@
     </div>
   </div>
   <div class="espacio"></div>
-
   <div id="join_form">
       <%= link_to image_tag("frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
   </div>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject_with_details',
+           :locals => {:subject => group} %>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject_with_details',
+           :locals => {:subject => group} %>

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

@@ -0,0 +1,33 @@
+<% content_for :title do %>
+  <%= @group.name%>
+<% end %>
+
+<% if @group.profile.description? %>
+  <% content_for :description do %>
+    <%= @group.profile.description%>
+  <% end %>
+<% end %>
+
+<% content_for :keywords do %>
+  <%= @group.profile.subject.tag_list%>
+<% end %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar_show' %>
+<% end %>
+
+<%= location(link_to(image_tag("btn/btn_group.png", :class => "btn_config")+t('group.one')+": "+
+                      content_tag(:span, ( truncate_name sanitize @group.name), :class=>"name_group")))%>
+                      
+<% toolbar :profile => @group %>
+
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+
+<div class="space_center">
+</div>
+
+<%= render :partial => "activities/index",
+           :locals  => { :activities => @group.wall(:profile, :for => current_subject).
+                                               page(params[:page]),
+                         :owner => @group } %>

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

@@ -0,0 +1,11 @@
+<nav id="toolbar">
+  <div id="toolbarContent" class="block">
+    <div class="space_center"></div>
+    <%= yield :toolbar %>
+  </div>
+</nav>
+<div id= "center_body" class="frontpage_view">
+  <section id="content">
+    <%= render :partial => 'show' %>
+  </section>
+</div>

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

@@ -1,33 +1,6 @@
-<% content_for :title do %>
-  <%= @group.name%>
-<% end %>
-
-<% if @group.profile.description? %>
-  <% content_for :description do %>
-    <%= @group.profile.description%>
-  <% end %>
-<% end %>
-
-<% content_for :keywords do %>
-  <%= @group.profile.subject.tag_list%>
-<% end %>
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar_show' %>
-<% end %>
-
-<%= location(link_to(image_tag("btn/btn_group.png", :class => "btn_config")+t('group.one')+": "+
-                      content_tag(:span, ( truncate_name sanitize @group.name), :class=>"name_group")))%>
-                      
+<% if user_signed_in? %>
+<%= render :partial => 'show' %>
+<% else %>
 <% toolbar :profile => @group %>
-
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-
-<div class="space_center">
-</div>
-
-<%= render :partial => "activities/index",
-           :locals  => { :activities => @group.wall(:profile, :for => current_subject).
-                                               page(params[:page]),
-                         :owner => @group } %>
+<%= render :partial => 'show_frontpage' %>
+<% end %> 

data/app/views/layouts/application.html.erb

@@ -32,7 +32,7 @@
           <div id="toolbarContent" class="block">
             <div class="space_center">
             </div>
-              <%= yield :toolbar %>
+            <%= yield :toolbar %>
           </div>
         </nav>
         <div id= "center_body">
@@ -48,7 +48,7 @@
         </div>
         <aside id="sidebar">
           <div id="sidebarContent">
-              <%= yield :sidebar %>
+            <%= yield :sidebar %>
           </div>
         </aside>
       </div>

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

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

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

@@ -0,0 +1,16 @@
+<% author = post.post_activity.sender_subject %>
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to (image_tag(author.logo.url , :size => "50x50", :alt => author.name )), author  %>
+  </div>
+  <div class="sub-block">
+    <div class="brief">
+      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 25) %>
+      <% if text.length < 60 %>
+        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <br>
+    </div>
+  </div>
+</div>

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

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

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

@@ -3,11 +3,16 @@
   <%= I18n.t('search.nothing') %>
 </div>
 <% else %>
-<% total = 0 %>
 <% @search_result.each do |model|%>
+<% if @search_class_sym.nil? %>
 <div class="subject_search_results block left">
-  <%= model_with_details model %>
+  <%= render_global_search_for model %>
 </div>
+<% else %>
+<div class="subject_search_results block left <%= model.class.name.downcase %>">
+  <%= render_focus_search_for model %>
+</div>
+<% end %>
 <% end %>
 <br class="clearfloat">
 <%= paginate @search_result %>

data/app/views/search/_header_search.html.erb

@@ -3,7 +3,7 @@
     <% unless @search_result.empty? %>
       <% @search_result.each do |model|%>
         <% total+=1 %>
-        <li class="result"><%= model_with_details model %></li>
+        <li class="result"><%= render_global_search_for model %></li>
       <% end %>
     <% end %>    
   </li>

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

@@ -0,0 +1,33 @@
+<% content_for :title do %>
+  <%= @user.name%>
+<% end %>
+
+<% if @user.profile.description? %>
+  <% content_for :description do %>
+    <%= @user.profile.description%>
+  <% end %>
+<% end %>
+
+<% content_for :keywords do %>
+  <%= @user.profile.subject.tag_list%>
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar_index' %>
+<% end %>
+
+<%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
+              
+<% toolbar :profile => @user %>
+
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+
+<%= render :partial => "users/groups",
+           :locals  => { :user => @user } %>
+
+<%= render :partial => "activities/index",
+           :locals  => { :activities => @user.wall(:profile, :for => current_subject).
+                                              page(params[:page]),
+                         :owner => @user } %>

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

@@ -0,0 +1,11 @@
+<nav id="toolbar">
+  <div id="toolbarContent" class="block">
+    <div class="space_center"></div>
+    <%= yield :toolbar %>
+  </div>
+</nav>
+<div id= "center_body" class="frontpage_view">
+  <section id="content">
+    <%= render :partial => 'show' %>
+  </section>
+</div>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject_with_details',
+           :locals => {:subject => user} %>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject_with_details',
+           :locals => {:subject => user} %>

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

@@ -1,33 +1,6 @@
-<% content_for :title do %>
-  <%= @user.name%>
-<% end %>
-
-<% if @user.profile.description? %>
-  <% content_for :description do %>
-    <%= @user.profile.description%>
-  <% end %>
-<% end %>
-
-<% content_for :keywords do %>
-  <%= @user.profile.subject.tag_list%>
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar_index' %>
-<% end %>
-
-<%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
-              
+<% if user_signed_in? %>
+<%= render :partial => 'show' %>
+<% else %>
 <% toolbar :profile => @user %>
-
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-
-<%= render :partial => "users/groups",
-           :locals  => { :user => @user } %>
-
-<%= render :partial => "activities/index",
-           :locals  => { :activities => @user.wall(:profile, :for => current_subject).
-                                              page(params[:page]),
-                         :owner => @user } %>
+<%= render :partial => 'show_frontpage' %>
+<% end %> 

data/config/locales/en.yml

@@ -122,12 +122,14 @@ en:
     collaborate:
       default: "Collaborate"
       sentence1: "Organize your projects and activities"
-      sentence2: "Create your own groups"
+      sentence2: "Participate in conferences and events"
+      sentence3: "Create your own group and conferences"
     elements:
       comments: "Comments"
+      conferences: "Conferences"
       networks: "Social Networks"
       organizers: "Organizers"
-      participants: "Video conferences"
+      participants: "Participants"
       groups: "Groups"
       tags: "Tags"
     main_title: "Social Stream is a core for building social network websites."
@@ -315,7 +317,7 @@ en:
     no_subject_found: "No %{subject} was found."
     nothing: "Nothing found"
     searching: "Searching: %{query}"
-    show_all: "Show all results"
+    show_all: "All"
     write: "Write your query ..."
     wrong: "There seems to be a problem with the search engine"
   settings:

data/config/locales/es.yml

@@ -120,7 +120,7 @@ es:
   frontpage:
     collaborate:
       default: "Colabora"
-      sentence1: "Organiza tus proyectos y actividades"
+      sentence1: "Organice sus proyectos y actividades"
       sentence2: "Crea tus propios grupos"
     elements:
       comments: "Comentarios"
@@ -312,7 +312,7 @@ es:
     no_subject_found: "No se encontró a %{subject}."
     nothing: "No se ha econtrado nada."
     searching: "Buscando: %{query}"
-    show_all: "Todos los resultados"
+    show_all: "Todos"
     write: "Escribe tu búsqueda..."
     wrong: "Parece que hay un problema con el motor de búsqueda"
   settings:

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.15".freeze
+    VERSION = "0.9.16".freeze
   end
 end

data/lib/social_stream-base.rb

@@ -80,10 +80,10 @@ module SocialStream
   @@activity_forms = [ :post, :group ]
   
   mattr_accessor :quick_search_models
-  @@quick_search_models = [ :user, :group ]
+  @@quick_search_models = [ :user, :group, :post ]
   
   mattr_accessor :extended_search_models
-  @@extended_search_models = [ :user, :group ]
+  @@extended_search_models = [ :user, :group, :post ]
   
   class << self
     def setup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +02:00
+date: 2011-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -597,6 +597,7 @@ files:
 - app/assets/images/frontpage/people.png
 - app/assets/images/frontpage/purple_sq.png
 - app/assets/images/frontpage/right_comments.gif
+- app/assets/images/frontpage/right_conference.png
 - app/assets/images/frontpage/right_organizers.gif
 - app/assets/images/frontpage/right_people.gif
 - app/assets/images/frontpage/right_social.gif
@@ -633,6 +634,8 @@ files:
 - app/assets/javascripts/conversations.js
 - app/assets/javascripts/groups.js
 - app/assets/javascripts/invitations.js
+- app/assets/javascripts/jquery.ad-gallery.js
+- app/assets/javascripts/jquery.ad-gallery.pack.js
 - app/assets/javascripts/layouts.js
 - app/assets/javascripts/messages.js
 - app/assets/javascripts/posts.js
@@ -648,6 +651,10 @@ files:
 - app/assets/stylesheets/0_devise_sign.css
 - app/assets/stylesheets/_colors.scss
 - app/assets/stylesheets/activities.css.scss
+- app/assets/stylesheets/ad_next.png
+- app/assets/stylesheets/ad_prev.png
+- app/assets/stylesheets/ad_scroll_back.png
+- app/assets/stylesheets/ad_scroll_forward.png
 - app/assets/stylesheets/base.css.scss
 - app/assets/stylesheets/contacts.css.scss
 - app/assets/stylesheets/conversations.css
@@ -655,7 +662,7 @@ files:
 - app/assets/stylesheets/frontpage.css.scss
 - app/assets/stylesheets/groups.css
 - app/assets/stylesheets/header.css.scss
-- app/assets/stylesheets/home.css
+- app/assets/stylesheets/home.css.scss
 - app/assets/stylesheets/images/add-policy.png
 - app/assets/stylesheets/images/fcbkcomplete/close.gif
 - app/assets/stylesheets/images/loading.gif
@@ -673,15 +680,18 @@ files:
 - app/assets/stylesheets/images/ui-icons_888888_256x240.png
 - app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
 - app/assets/stylesheets/invitations.css
-- app/assets/stylesheets/location.css
-- app/assets/stylesheets/menu.css
-- app/assets/stylesheets/messages.css
+- app/assets/stylesheets/jquery.ad-gallery.css
+- app/assets/stylesheets/loader.gif
+- app/assets/stylesheets/location.css.scss
+- app/assets/stylesheets/menu.css.scss
+- app/assets/stylesheets/messages.css.scss
+- app/assets/stylesheets/opa75.png
 - app/assets/stylesheets/profiles.css
-- app/assets/stylesheets/relation_customs.css
-- app/assets/stylesheets/search.css
+- app/assets/stylesheets/relation_customs.css.scss
+- app/assets/stylesheets/search.css.scss
 - app/assets/stylesheets/settings.css
 - app/assets/stylesheets/social_stream-base.css
-- app/assets/stylesheets/ties.css
+- app/assets/stylesheets/ties.css.scss
 - app/assets/stylesheets/toolbar.css
 - app/assets/stylesheets/users.css
 - app/controllers/activities_controller.rb
@@ -795,15 +805,20 @@ files:
 - app/views/devise/shared/_links.erb
 - app/views/frontpage/_caracteristics.html.erb
 - app/views/frontpage/_header.html.erb
+- app/views/frontpage/_social_networks.html.erb
 - app/views/frontpage/_sponsor.html.erb
 - app/views/frontpage/host_meta.xml.builder
 - app/views/frontpage/index.html.erb
 - app/views/groups/_group.html.erb
+- app/views/groups/_group_focus_search.html.erb
+- app/views/groups/_group_global_search.html.erb
 - app/views/groups/_group_with_details.html.erb
 - app/views/groups/_index.html.erb
 - app/views/groups/_new.html.erb
 - app/views/groups/_new_activity.html.erb
 - app/views/groups/_new_activity_fields.html.erb
+- app/views/groups/_show.html.erb
+- app/views/groups/_show_frontpage.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb
 - app/views/groups/index.html.erb
@@ -868,6 +883,9 @@ files:
 - app/views/posts/_new_activity.html.erb
 - app/views/posts/_new_activity_fields.erb
 - app/views/posts/_post.html.erb
+- app/views/posts/_post_focus_search.html.erb
+- app/views/posts/_post_global_search.html.erb
+- app/views/posts/_post_with_details.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
 - app/views/posts/show.html.erb
@@ -910,8 +928,12 @@ files:
 - app/views/toolbar/_subject.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
+- app/views/users/_show.html.erb
+- app/views/users/_show_frontpage.html.erb
 - app/views/users/_sidebar_index.html.erb
 - app/views/users/_user.html.erb
+- app/views/users/_user_focus_search.html.erb
+- app/views/users/_user_global_search.html.erb
 - app/views/users/_user_with_details.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
@@ -1032,7 +1054,6 @@ files:
 - spec/support/db.rb
 - spec/support/devise.rb
 - spec/support/mock.rb
-- spec/support/thinking-sphinx.rb
 - vendor/assets/javascripts/ajax.paginate.js
 - vendor/assets/javascripts/chosen.jquery.js
 - vendor/assets/javascripts/d3.geom.js