social_stream-base 0.9.3 → 0.9.4

data/README.rdoc

@@ -45,7 +45,7 @@ Do not forget to migrate your database
 
 == Actors and Activity Objects
 
-{Social Stream Base}[https://github.com/ging/social_stream-base] relies in
+{Social Stream Base}[https://github.com/ging/social_stream/tree/master/base] relies in
 Devise[https://github.com/plataformatec/devise].
 You have authenticated users support in your application by default.
 
@@ -60,9 +60,9 @@ initializer.
 
 = Documentation
 
-{Social Stream Base documentation is available at rdoc.info}[http://rubydoc.info/gems/social_stream-base/frames]
+{Social Stream Base documentation is available at rdoc.info}[http://rubydoc.info/gems/social_stream/frames]
 
 = Discussion
 
 We are reaching beta phase of development.
-Feel free to add an issue or send a message at github[https://github.com/ging/social_stream-base].
+Feel free to add an issue or send a message at github[https://github.com/ging/social_stream].

data/Rakefile

@@ -26,3 +26,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 Bundler::GemHelper.install_tasks
+
+# Modify this gem tags
+class Bundler::GemHelper
+  def version_tag
+    "base#{version}"
+  end
+end

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

@@ -8,6 +8,7 @@ $(function() {
   $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
   $('#security').chosen();
   $("#input_activities").Watermark("<%= I18n.t('activity.input') %>","#666");
+  $("#event_name").Watermark("<%= I18n.t('event.input') %>","#666");
 });
 
 

data/app/assets/javascripts/search.js.erb

@@ -0,0 +1,6 @@
+// index
+//= require ajax.paginate
+
+$(document).ready(function(){  
+  $("#global_search_input").Watermark("<%= I18n.t('search.write') %>");
+});

data/app/assets/stylesheets/0_devise_sign.css

@@ -0,0 +1,20 @@
+#center_body{
+  border: none;
+  width:100%;
+}
+
+#sidebar{
+  display:none;  
+}
+
+#toolbar{
+  padding: 0;
+}
+
+#wrapper_body{
+  background-color: inherit;
+  background-image: url("/assets/big-logo.png");
+  background-repeat: no-repeat;
+  background-position: bottom left;
+  width:100%;
+}

data/app/assets/stylesheets/base.css

@@ -18,7 +18,7 @@ h2{padding-left:10px;}
 body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; overflow-y: scroll;}
 #wrapper { 	background-color: #f5f5f5;	width: 100%; margin: 0px auto;	  }
 #wrapper_body{min-height: 552px; width: 960px; margin:0px auto;	margin-left: auto;	margin-right: auto;
-margin-top: auto; margin-bottom:auto;}
+margin-top: auto; margin-bottom:auto; background-image:none;}
 
 
  /*********** Notices SECTION *********************/
@@ -52,16 +52,6 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 
 
 /************ Forms - Buttons  SECTION ***************************/
-.myButton{ cursor:pointer;
-  background-image: -webkit-gradient(linear,left bottom,left top, color-stop(0.01, rgb(116,191,67)),
-      color-stop(0.51, rgb(117,189,68)),color-stop(0.76, rgb(195,222,171)));
-  background-image: -moz-linear-gradient(center bottom,rgb(116,191,67) 1%,rgb(117,189,68) 51%,
-      rgb(195,222,171) 76%);
-  border-radius: 0.2em;  color: #fff; width: 88px;  height: 26px;  border: none;}
-.myButton span {  display: block;  line-height: 14px;  padding: 5px 0 5px 18px;}
-.myButton:active {  background-position: bottom right;  color: #000;  outline: none;}
-.myButton:active span {  background-position: bottom left;  padding: 6px 0 4px 18px;}
-
 .myButtonBlue{ cursor:pointer;
   background-image: -webkit-gradient( linear, left bottom, left top,
       color-stop(0.16, rgb(0,122,193)), color-stop(0.58, rgb(56,148,209)), color-stop(0.79, rgb(168,222,249)) );
@@ -83,7 +73,9 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .myButtonLarge:active {  background-position: bottom right;  color: #000;  outline: none;}
 .myButtonLarge:active span {  background-position: bottom left;  padding: 6px 0 4px 18px;}
 
-.button{margin: 10px 0 10px 10px;padding: 3px 3px 3px 3px;color:#FFFFFF;background-color: #1F4A75;}
+.button{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;color:#FFFFFF;background-color: #1F4A75;
+        -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px;
+        font-size: 13px;}
 .optionHeader {
 	color: #fff;
 	overflow: hidden;

data/app/assets/stylesheets/frontpage.css

@@ -18,8 +18,9 @@ span.find{  padding-right:5px;}
 #devise_links a{font-weight: bold;line-height: 15px; }
 #login{  padding-top: 5px;}
 .instructions{text-align: left; padding-bottom: 5px;}
-#welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: thin solid #2A3890;
-  text-align:center;}
+#welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: 3px solid #BDC7D8;
+  text-align:center; background-color: white;-moz-border-radius: 20px; 
+  -webkit-border-radius: 20px; border-radius: 20px;}
 #wrapper_left{  vertical-align:top;  width:49%;  display:inline-block;    padding-left: 20px;}
 #wrapper_right{ vertical-align:top;  width:48%;  display:inline-block;}
 

data/app/assets/stylesheets/header.css

@@ -20,6 +20,9 @@
 .div_login .subtexto{	padding-top: 8px;	height:12px;	font-size: 11px; }
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
+#header_notifications{padding: 0px 5px 0px 5px !important;}
+#header_notifications a{ color: white; background-color: #879eb5;-moz-border-radius: 6px; -webkit-border-radius: 6px;
+                border-radius: 6px; padding: 4px 9px 4px 9px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
 .txt_config {color: #fff;	vertical-align: top;	display: inline;	padding-top: 2px;	border-right: thin solid;
 	padding-right: 3px;}

data/app/assets/stylesheets/search.css

@@ -1,21 +1,28 @@
-/******************** Search box css ***********************/
+/******************** Search css ***********************/
+/********************************* Header **************/
 #header_search {
   float: left;
   padding: 1px 10px 0 10px;
-  z-index:2001;
+  z-index: 2001;
 }
-
-#global_search_input {
-  width: 150px;
-  height: 16px;
-  border: solid 1px #dedede;
-  padding:0 3px 0 22px;
+#header_search_input, #global_search_input {
+  padding: 0 3px 0 22px;
   background: url('btn/search_icon.png') 5px 50% no-repeat white;
   font-size: 11px;
   color: #2A3890;
 }
-#global_search_display {
-  width: 175px;
+#header_search_input {
+  border: solid 1px #dedede;
+  height: 16px;
+  width: 150px;
+}
+#global_search_input {
+  border: solid 1px #aeaeae;
+  height: 25px;
+  width: 300px;
+}
+#header_search_display {
+  width: 225px;
   display: none;
   float: right;
   margin-right: 35px;
@@ -26,50 +33,89 @@
   position: absolute;
   z-index: 2000;
   background: whiteSmoke;
-  text-align: center;
+  text-align: left;
 }
-
-#global_search_display a {  
+#header_search_display a {
   color: #2A3890;
   text-decoration: none;
 }
-#global_search_display a:hover {
+#header_search_display a:hover {
   color: #2A3890;
-  text-decoration: none;  
+  text-decoration: none;
   font-weight: bold;
 }
-
-#global_search_display  li {
+#header_search_display  li {
   padding: 4px;
   border-top: solid 1px #B9B9B9;
   font-size: 10px;
   height: 35px;
   background: whiteSmoke;
   overflow: hidden;
-  text-align: center;
 }
-#global_search_display  li .logo{
-  float:left;
-  margin-right: 5px;  
+#header_search_display  li:hover {
+  background: #CFDEFF;
+  color: #2A3890;
+}
+#header_search_display  li .logo {
+  float: left;
+  height: 35px;
+  width: 35px;
+  margin-right: 5px;
+}
+#header_search_display  li .logo img {
+  height: 100%;
+  width: 100%;
+}
+#header_search_display  li .name {
+  margin-top: 3px;
+  width: 175px;
+  overflow: hidden;
+}
+#header_search_display  li .link {
+  display: none;
+}
+#header_search_display  li.subject_result {
+  padding: 0px;
+  height: 45px;
 }
-
-#global_search_display  li .name {
-  float:left;
-  width: 125px;
+#header_search_display  li.title {
   overflow: hidden;
-  height: 25px;
-  text-align: left;
+  text-align: center;
+  background: #879EB5;
+  height: 15px;
+  color: whiteSmoke;
+  font-weight: bold;
 }
-
-
-#global_search_display  li:hover {
-  background: #CFDEFF;
-  color: #2A3890;
+#header_search_display  li.loading {
+  text-align: center;
 }
-
-
-#global_search_display  .warning{
-  width:100%; 
+#header_search_display  li.more, #header_search_display  li.none {
+  height: 15px;
+  text-align: center;
+}
+#header_search_display  li.title:hover, #header_search_display  li.more:hover, #header_search_display  li.none:hover {
+}
+#header_search_display  .warning {
+  width: 100%;
+}
+/********************************* Global ******************/
+.search_row {
+  text-align: center;
+}
+.subject_with_details {
+  padding: 5px;
+}
+.subject_search_results {
+  width: 270px;
+  float: left;
+  text-align: center;
+  margin: 3px;
+}
+.subject_search_results .title {
+  width: 260px;
+  margin: auto;
+  background-color: #E1EEF5;
+  padding: 5px;
+  font-weight: bold;
 }
-
-/******************** Search box css END ***********************/
+/******************** Search css END ***********************/

data/app/controllers/search_controller.rb

@@ -4,12 +4,32 @@ class SearchController < ApplicationController
   
   def index
     if params[:mode].eql? "header_search"
-      @search_result = ThinkingSphinx.search "*#{params[:id]}*", :page => 1, :per_page => 10, :classes => [User, Group]
+      @search_result = header_search params[:search_query]
       render :partial => "header_search", :locals => {:search_result => @search_result}
       return
     else
-      @search_result = ThinkingSphinx.search "*#{params[:id]}*"      
+      @search_result = global_search params[:search_query]      
     end
   end
 
+
+
+  private
+  def global_search query
+    return search query, params[:page].present? ? params[:page] : 1, 10
+  end
+  
+  def header_search query
+    return search query, params[:page].present? ? params[:page] : 1, 3
+  end
+  
+  def search query, page, per_page
+    result = Hash.new
+    SocialStream.subjects.each do |subject_sym|
+      result.update({subject_sym => ThinkingSphinx.search("*#{query}*", :page => page, :per_page => per_page, :classes => [subject_sym.to_s.classify.constantize])})
+      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count("*#{query}*", :classes => [subject_sym.to_s.classify.constantize])})
+    end
+    return result
+    
+  end
 end

data/app/helpers/search_helper.rb

@@ -0,0 +1,7 @@
+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}
+  end
+end

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

@@ -1 +1,7 @@
-<%= render activity_object.object %>
+<% unless activity_object.object.is_a? Actor or activity_object.object.respond_to? :actor %>
+  <%= render activity_object.object %>
+<% else %>
+  <div class="block">
+    <%= subject_with_details activity_object.object %>
+  </div>
+<% end %>

data/app/views/devise/registrations/edit.html.erb

@@ -49,9 +49,6 @@
     </div>
     <div class="form_row space_center">
       <%= f.submit t('button.update'), :class => "button" %>
-      <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
-        <%= t('button.cancel')%>
-      </button>
     </div>
     <% end%>
   </div>
@@ -83,9 +80,6 @@
     </div>
     <div class="form_row space_center">
       <%= f.submit t('button.update'), :class => "button" %>
-      <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
-        <%= t('button.cancel')%>
-      </button>
     </div>
     <% end%>
   </div>

data/app/views/devise/sessions/new.html.erb

@@ -1,4 +1,6 @@
-
+<% content_for :headers do%>
+  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+<%end%>
 
 <div id="welcome">
   <div id="login" class="block">
@@ -26,7 +28,7 @@
       </div>
 
       <div class="btn_login">
-        <%= f.submit t('action.send'), :class =>"myButton" %>
+        <%= f.submit t('action.send'), :class =>"button" %>
       </div>
     <% end %>
   </div>

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

@@ -3,11 +3,9 @@
 <%end%>
 
 <div class="banner_busqueda">
-  
-  <div id="espacio_busqueda">
-    
+  <div id="espacio_busqueda">    
   </div>
-  <%= render :partial => "search" %>
+    <%= render :partial => 'layouts/search' %>
 </div>
 
 <div id="wrapper_left">

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

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

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

@@ -1,34 +1,18 @@
 <% cont=0; %>
 <% @groups.each do |group| %>
-	<% if (cont%2) == 0 %>
-	  <% cont+=1; %>
- 	  <div class="row">
-	<% end %>
-    <div class="label">
-      <div class="logo">
-        <%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )), group  %>
-      </div>
-      <div class="sub-block">
-        <div class="name black" >
-          <%= link_to truncate_name(group.name), group %>
-        </div>
-        <div class="brief">
-          <%= t 'follower.n', :count => group.follower_count %>,
-          <%= t 'like.n',     :count => group.like_count %>
-        </div>
-        <div class="link">
-          <%= contact_to(group) %>
-        </div>
-      </div>
-    </div>
-	<% if ((cont%2) == 0) 	%>
-  	</div>
-	<% end %>
-<% end %>
-<% if ((cont%2) != 0) 	%>
+<% if (cont%2) == 0 %>
+<% cont+=1; %>
+<div class="row">
+  <% end %>
   <div class="label">
+    <%= subject_with_details group %>
   </div>
-		</div>
+  <% if ((cont%2) == 0) 	%>
+</div>
+<% end %>
+<% end %>
+<% if ((cont%2) != 0) 	%> <div class="label"></div>
+</div>
 <% end %>
 <div class="row">
   <%= paginate @groups %>

data/app/views/layouts/_header.erb

@@ -8,11 +8,16 @@
         <div class="menu_list menu_white" id="menu_home">
           <ul>
             <li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
+            <li id="header_notifications">
+              <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
+            </li>
           </ul>
         </div>
       <% end %>
     </div>
-    <%= render :partial => 'layouts/search' %>
+    <% if user_signed_in? %>
+      <%= render :partial => 'layouts/search' %>
+    <%end%>
     <div id="header_right">
        <% if user_signed_in? %>
         <%= render :partial => 'layouts/representation' %>

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

@@ -1,9 +1,9 @@
 <div id="header_search">      
-  <form action="#" method="post">
-    <input id="global_search_input" name="search" type="text" autocomplete="off" />
+  <form action="<%=search_path%>" method="get">
+    <%= text_field_tag :search_query, nil,:autocomplete => :off, :id => :header_search_input %>
   </form>
-  <div id="global_search_display">
-    <%= image_tag('loading.gif', :class => :loading) %>
+  <div id="header_search_display">
+    <ul><li class="loading"><%= image_tag('loading.gif', :class => :loading) %></li></ul>
   </div>
 </div>
 <%= javascript_tag do %>
@@ -11,40 +11,40 @@ $(document).ready(function() {
   var last_search = "";
   
   $(document).click(function() {
-    $("#global_search_display").hide();
+    $("#header_search_display").hide();
   });
-  $('#global_search_input').click(function(e) {
+  $('#header_search_input').click(function(e) {
     e.stopPropagation();
   });
-  $('#global_search_display').click(function(e) {
+  $('#header_search_display').click(function(e) {
     e.stopPropagation();
   });
   
-  $("#global_search_input").Watermark("Search");
+  $("#header_search_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
 
-  $("#global_search_input").keyup(function() {
+  $("#header_search_input").keyup(function() {
     var searchstring = $(this).val();
     if((searchstring=="")){
       if (last_search!=searchstring){last_search=searchstring;}
-      $("#global_search_display").hide();
+      $("#header_search_display").hide();
     }
     else if(searchstring.length < 2) {
       if (last_search!=searchstring){last_search=searchstring;}
-      $("#global_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.at_least'), :class => :warning)) %></li></ul>").show();
+      $("#header_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.at_least'), :class => :warning)) %></li></ul>").show();
     } else {
       if (last_search!=searchstring){
         last_search=searchstring;
-        $("#global_search_display").html("<ul><li><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></li></ul>").show();
+        $("#header_search_display").html("<ul><li class=\"loading\"><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></li></ul>").show();
         $.ajax({
           type : "GET",
-          url : "<%= search_url %>?id=" + searchstring + "&mode=header_search",
+          url : "<%= search_url %>?search_query=" + searchstring + "&mode=header_search",
           success : function(html) {      
-            if ($("#global_search_input").val()==searchstring){ //Only show if input value is still the same
-              $("#global_search_display").html(html);
+            if ($("#header_search_input").val()==searchstring){ //Only show if input value is still the same
+              $("#header_search_display").html(html);
             }          
           },
           error: function(){
-            $("#global_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.wrong'), :class => :warning)) %></li></ul>");
+            $("#header_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.wrong'), :class => :warning)) %></li></ul>");
          }
         });
       }

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

@@ -7,6 +7,7 @@
     <meta name="keywords" content="<%= yield(:keywords).empty? ? t('profile.tags.default') : yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? "Home" : yield(:description) %>" >
     <%= stylesheet_link_tag "application" %>
+    <%= javascript_include_tag "application" %>
     <%= favicon_link_tag "icons/favicon.ico" %>
 
     <% if protect_against_forgery? %>

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

@@ -7,7 +7,7 @@
 <% end %>
 
 <%= location(
-    link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true) +' ('+@mailbox.notifications.not_trashed.unread.count.to_s+')'
+    link_to(t('notification.other'), notifications_path,:remote => true) +' ('+@mailbox.notifications.not_trashed.unread.count.to_s+')'
 ) %>
 
 <% toolbar  %>

data/app/views/notifications/index.js.erb

@@ -1,7 +1,6 @@
 $("#content").html("<%=escape_javascript(render :partial => 'index') %>");
+$("header").html("<%=escape_javascript(render :partial => 'layouts/header') %>");
 
 <%= location(link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)) %>
 
-<%= toolbar  %>
-
 $('.pagination a').attr('data-remote', 'true');

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

@@ -1,16 +1,21 @@
-<% if search_result.empty? %>
-<ul><li><%= content_tag(:span,I18n.t('search.actor.none'), :class => :warning) %></li></ul>
-<% else %>
 <ul>
-<% search_result.each do |subject| %>
-  <%= link_to subject do %>
-    <li>
-      <%= image_tag(subject.actor.logo.url(:actor), :class => :logo) %> 
-      <%= content_tag(:span, truncate_name(subject.actor.name), :class => :name) %>         
+<% SocialStream.subjects.each do |subject_type| %>
+  
+    <li class="title">
+      <%= subject_type.to_s.capitalize.pluralize %>
     </li>
-    <% end %>
-<% end %>
+    <% if @search_result[subject_type].empty? %>
+      <li class="none">
+        <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
+      </li>
+    <% else %>
+      <% @search_result[subject_type].each do |subject|%>
+        <li class="subject_result"><%= subject_with_details subject %></li>
+      <% end %>
+      <li class="more">
+        <%= I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s) %>        
+      </li>
+    <% end %>    
+  </li>
+  <% end %>
 </ul>
-<% end %>
-
-

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

@@ -0,0 +1,35 @@
+<%= location(link_to(t('search.name')))%>
+<br class="clearfloat" />
+<div class="space_center"></div>
+<h2><%= t('search.name') %></h2>
+<div class="space_center"></div>
+<div id="search_form">
+  <form action="<%=search_path%>" method="get">
+    <div class="block">
+      <div class="form_row search_row">
+        <%= text_field_tag :search_query, params[:search_query].present? ? params[:search_query] : nil ,:autocomplete => :off, :id => :global_search_input %>
+      </div>
+    </div>
+  </form>
+</div>
+<div id="search_results" class="block">
+  <% SocialStream.subjects.each do |subject_type| %>
+  <div class="subject_search_results" class="block">
+    <div class="title">
+      <%= subject_type.to_s.capitalize.pluralize %>
+    </div>
+    <% if @search_result[subject_type].empty? %>
+      <div class="subject_with_details">
+        <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
+      </div>
+    <% else %>
+      <% @search_result[subject_type].each do |subject|%>
+        <%= subject_with_details subject %>
+      <% end %>
+      <div class="subject_with_details">
+        <%= I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s) %>        
+      </div>
+    <% end %>    
+  </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,15 @@
+<% content_for :title do %>
+  <%=t('search.name')%> <%= params[:search_query].present? ? ": #{params[:search_query]}" : ""%>
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<% toolbar %>
+
+<% content_for :javascript do %>
+    
+<% end %>
+
+<%= render :partial => 'index' %>

data/app/views/subjects/_subject_with_details.html.erb

@@ -0,0 +1,17 @@
+<div class="subject_with_details">
+  <div class="logo">
+    <%= link_to (image_tag(subject.logo.url , :size => "50x50", :alt => subject.name )), subject  %>
+  </div>
+  <div class="sub-block">
+    <div class="name black" >
+      <%= link_to truncate_name(subject.name), subject %>
+    </div>
+    <div class="brief">
+      <%= t 'follower.n', :count => subject.follower_count %>,
+      <%= t 'like.n',     :count => subject.like_count %>
+    </div>
+    <div class="link">
+      <%= contact_to(subject) %>
+    </div>
+  </div>
+</div>

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

@@ -2,32 +2,18 @@
 
 <% @users.each do |user| %>
 
-  <% if (cont%2) == 0 %>
-    <% cont+=1; %>
-     <div class="row">
+<% if (cont%2) == 0 %>
+<% cont+=1; %>
+<div class="row">
   <% end %>
-
   <div class="label">
-    <div class="logo">
-      <%= link_to (image_tag(user.logo.url , :size => "50x50", :alt => user.name )),user  %>
-    </div>
-    <div class="sub-block">
-      <div class="name black" >
-        <%=link_to(truncate_name(user.name), user)%>
-      </div>
-      <div class="link">
-        <%= contact_to(user) %>
-      </div>
-    </div>
+    <%= subject_with_details user %>
   </div>
-<% end %>
+  <% end %>
 
-<% if ((cont%2) != 0) 	%>
-  <div class="label">
-  </div>
-		</div>
+  <% if ((cont%2) != 0) 	%> <div class="label"></div>
+</div>
 <% end %>
-
 <div class="row">
   <%= paginate @users %>
 </div>

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

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

data/config/locales/en.yml

@@ -328,6 +328,10 @@ en:
     actor:
       none: "Nothing found"
     at_least: "Write at least two characters"
+    name: "Search"
+    no_subject_found: "No %{subject} was found."
+    all_subject_results: "Search all %{subject} (%{count})"
+    write: "Write your query ..."
     wrong: "There seems to be a problem with the search engine"
   settings:
     error: "Some errors raised when saving your changes"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.3".freeze
+    VERSION = "0.9.4".freeze
   end
 end

data/lib/social_stream/toolbar_config.rb

@@ -3,11 +3,6 @@ module SocialStream
     #Prints the default home toolbar menu
     def default_home_toolbar_menu
       items = Array.new
-      #Notifications
-      items << {:key => :notifications,
-        :name => image_tag("btn/btn_notification.png")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
-        :url => notifications_path,
-        :options => {:link => {:id => "notifications_menu"}}}
 
       #Messages
       items << {:key => :messages,

data/spec/dummy/script/rails

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +02:00
+date: 2011-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -471,6 +471,7 @@ files:
 - app/assets/images/HTML5_Semantics.png
 - app/assets/images/HTML5_Styling.png
 - app/assets/images/Jcrop.gif
+- app/assets/images/big-logo.png
 - app/assets/images/boxy/boxy-ne.png
 - app/assets/images/boxy/boxy-nw.png
 - app/assets/images/boxy/boxy-se.png
@@ -616,11 +617,13 @@ files:
 - app/assets/javascripts/posts.js
 - app/assets/javascripts/profiles.js
 - app/assets/javascripts/relation_customs.js
+- app/assets/javascripts/search.js.erb
 - app/assets/javascripts/settings.js
 - app/assets/javascripts/social_stream-base.js
 - app/assets/javascripts/ties.js
 - app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
+- app/assets/stylesheets/0_devise_sign.css
 - app/assets/stylesheets/activities.css
 - app/assets/stylesheets/base.css
 - app/assets/stylesheets/contacts.css
@@ -688,6 +691,7 @@ files:
 - app/helpers/notifications_helper.rb
 - app/helpers/permissions_helper.rb
 - app/helpers/profiles_helper.rb
+- app/helpers/search_helper.rb
 - app/helpers/subjects_helper.rb
 - app/helpers/toolbar_helper.rb
 - app/helpers/users_helper.rb
@@ -764,11 +768,11 @@ files:
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
 - app/views/frontpage/_header.html.erb
-- app/views/frontpage/_search.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_with_details.html.erb
 - app/views/groups/_index.html.erb
 - app/views/groups/_new.html.erb
 - app/views/groups/_sidebar_index.html.erb
@@ -850,6 +854,8 @@ files:
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
 - app/views/search/_header_search.html.erb
+- app/views/search/_index.html.erb
+- app/views/search/index.html.erb
 - app/views/settings/_api_key.html.erb
 - app/views/settings/_index.html.erb
 - app/views/settings/_notifications.html.erb
@@ -858,6 +864,7 @@ files:
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_show.js.erb
 - app/views/subjects/_subject.html.erb
+- app/views/subjects/_subject_with_details.html.erb
 - app/views/ties/index.html.erb
 - app/views/toolbar/_home.html.erb
 - app/views/toolbar/_logo.html.erb
@@ -866,14 +873,13 @@ files:
 - app/views/users/_index.html.erb
 - app/views/users/_sidebar_index.html.erb
 - app/views/users/_user.html.erb
+- app/views/users/_user_with_details.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
 - app/views/users/info.html.erb
 - app/views/users/show.html.erb
 - app/views/users/show.js.erb
 - app/views/users/show.xml.builder
-- bin/social_stream
-- bin/social_stream_heroku
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20110610112023_create_social_stream.rb

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

@@ -1,13 +0,0 @@
-<div class="div_busqueda menu_list">
-  <ul>
-    <li>
-      <%= link_to t('browse'), users_path %>
-    </li>
-  </ul>
-  <div id="form_busqueda">
-  <%= form_tag(users_path, :method => "get") do -%>
-      <%=text_field_tag'search' %>
-      <%=submit_tag(t('find'), :class => 'other_blue')  %>
-  <% end %>
-  </div>
-</div>

data/bin/social_stream

@@ -1,57 +0,0 @@
-#!/bin/bash
-#Social_stream complete install
-#Arguments:
-#$1 --> Name of the folder to create the social_stream project
-EXPECTED_ARGS=1
-
-if [ $# -ne $EXPECTED_ARGS ]
-then
-  echo "Usage: `basename $0` path/to/your/application"
-  exit 1 
-fi
-
-
-#Linux packages
-echo 'Installing Linux packages'
-PACKAGES_COMMON='ruby ruby-dev rdoc irb libopenssl-ruby wget make curl aspell-es aspell-en libxml2-dev libxslt-dev libmagickcore-dev libmagickwand-dev libsqlite3-dev libmysqlclient-dev mysql-server rake'
-PACKAGES_PRODUCTION='awstats logrotate nfs-common'
-sudo apt-get install $PACKAGES_COMMON
-sudo apt-get install $PACKAGES_PRODUCTION
-echo 'Done'
-
-#Rubygems
-RUBY_GEMS_VERSION='1.3.7'
-RUBY_GEMS_PACKAGE="rubygems-"${RUBY_GEMS_VERSION}".tgz"
-RUBY_GEMS_DOWNLOAD="http://rubyforge.org/frs/download.php/70696/"${RUBY_GEMS_PACKAGE}
-
-echo 'Installing Rubygems $RUBY_GEMS_VERSION'
-
-cd /tmp && wget $RUBY_GEMS_DOWNLOAD
-cd /tmp && tar zxf $RUBY_GEMS_PACKAGE
-cd /tmp/rubygems-$RUBY_GEMS_VERSION && sudo /usr/bin/ruby setup.rb
-
-sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
-echo 'Done'
-
-#Gems
-echo 'Installing Initial Gems'
-sudo gem install rails 
-sudo gem install bundler 
-echo 'Done'
-
-#Social Stream 
-echo 'Creating and Setting up your Social Stream basic application'
-export PATH=$PATH:/var/lib/gems/1.8/bin
-echo 'Creating rails project'
-rails new $1 
-cd $1
-echo 'gem "social_stream"' >> Gemfile
-echo 'Updating bundle'
-bundle update
-echo 'Setting up the application'
-rails generate social_stream:install -y
-rake db:migrate
-rake db:seed
-echo 'Done'
-
-echo 'Instalation complete. Run "rails server" in the application folder to start the server'

data/bin/social_stream_heroku

@@ -1,76 +0,0 @@
-#!/bin/bash
-#Social_stream_heroku complete install
-#Arguments:
-#$1 --> Name of the folder to create the social_stream project
-EXPECTED_ARGS=1
-
-if [ $# -ne $EXPECTED_ARGS ]
-then
-  echo "Usage: `basename $0` path/to/your/application"
-  exit 1 
-fi
-
-
-#Linux packages
-echo 'Installing Linux packages'
-PACKAGES_COMMON='ruby ruby-dev rdoc irb libopenssl-ruby wget make curl aspell-es aspell-en libxml2-dev libxslt-dev libmagickcore-dev libmagickwand-dev libsqlite3-dev libmysqlclient-dev mysql-server rake git-core'
-PACKAGES_PRODUCTION='awstats logrotate nfs-common'
-sudo apt-get install $PACKAGES_COMMON
-sudo apt-get install $PACKAGES_PRODUCTION
-echo 'Done'
-
-#Rubygems
-RUBY_GEMS_VERSION='1.3.7'
-RUBY_GEMS_PACKAGE="rubygems-"${RUBY_GEMS_VERSION}".tgz"
-RUBY_GEMS_DOWNLOAD="http://rubyforge.org/frs/download.php/70696/"${RUBY_GEMS_PACKAGE}
-
-echo 'Installing Rubygems $RUBY_GEMS_VERSION'
-
-cd /tmp && wget $RUBY_GEMS_DOWNLOAD
-cd /tmp && tar zxf $RUBY_GEMS_PACKAGE
-cd /tmp/rubygems-$RUBY_GEMS_VERSION && sudo /usr/bin/ruby setup.rb
-
-sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
-echo 'Done'
-
-#Gems
-echo 'Installing Initial Gems'
-sudo gem install rails 
-sudo gem install bundler 
-sudo gem install heroku
-echo 'Done'
-
-#Social Stream 
-echo 'Creating and Setting up your Social Stream basic application'
-export PATH=$PATH:/var/lib/gems/1.8/bin
-echo 'Creating rails project'
-rails new $1 
-cd $1
-echo 'gem "social_stream"' >> Gemfile
-echo 'Updating bundle'
-bundle update
-echo 'Setting up the application'
-rails generate social_stream:install -y
-rake db:migrate
-rake db:seed
-echo 'Done'
-
-#Git repository
-echo 'Setting up your git repository'
-git init
-git add .
-git commit -m 'first commit'
-echo 'Done'
-
-#Heroku deployment
-echo '[!] Starting deploy to heroku, you will be asked your heroku username and password'
-echo '[!] If you do not have one visit http://www.heroku.com'
-echo '[!] You will also need properly configured SSH keys visit: '
-echo '[!] http://help.github.com/linux-key-setup/'
-read -p '[!] When both things are ready PRESS ANY KEY TO CONTINUE...'
-heroku create
-git push heroku master
-heroku rake db:migrate
-echo 'Done'
-
-echo 'Instalation & deployment are now complete. Visit https://api.heroku.com/myapps'