social_stream 0.11.0 → 0.11.1

data/base/app/assets/stylesheets/{relation_customs.css → relation_customs.css.scss}

@@ -1,19 +1,5 @@
-.ui-radio-state-disabled, .ui-radio-state-checked-disabled, .ui-radio-state-disabled-hover, .ui-radio-state-checked-disabled-hover {
-	color: #999;
-}
-
-span.ui-checkbox, span.ui-radio {
-	display: block;
-	float: left;
-	width: 16px;
-	height: 17px;
-	background: url(icon_checkbox.png) 0 -40px no-repeat;
-	cursor: pointer;
-}
+@import "colors";
 
-span.ui-helper-hidden {
-	display: none;
-}
 
 #relation_customs label, #permissions label {
 	display: block;
@@ -93,19 +79,15 @@ form {
 	margin-left: 10px;
 }
 
-.checked-option{
-	background-color: #dfecf1;
-}
-
 .pageTitle{
-	color: black;
+	color: $sentence-color;
 	padding: 0px 10px 0px 0px;
 	font-size: 15px;
 }
 
 .sectionTitle{
-	background-color: #dfecf1;
-	color: #4d539d;
+	background-color: $secondary-color;
+	color: $main-color;
 	padding: 15px 20px 15px 20px;
 }
 
@@ -120,9 +102,9 @@ form {
 }
 
 input.privacy_input_new{
-	background-color: #dfecf1;
-	border: 1px solid #1F4A75;
-	color: #1F4A75;
+	background-color: $secondary-color;
+	border: 1px solid $main-color;
+	color: $main-color;
 }
 
 span.privacy_span_new {
@@ -190,7 +172,7 @@ span.privacy_span_new {
 	float: right;
 	text-align: center;
 	display: block;
-	border:1px solid #1F4A75;
+	border:1px solid $main-color;
 }
 
 #columns_container{
@@ -240,6 +222,6 @@ span.privacy_span_new {
 
 #privacy-rule-arrow {
 	background: url('images/add-policy.png') no-repeat center center;
-	color: #FFFFFF;
+	color: $text-over-main;
 }
 

data/base/app/assets/stylesheets/{search.css → search.css.scss}

@@ -1,3 +1,5 @@
+@import "colors";
+
 /******************** Search css ***********************/
 /********************************* Header **************/
 #header_search {
@@ -9,19 +11,18 @@
   padding: 0 3px 0 22px;
   background: url('btn/search_icon.png') 5px 50% no-repeat white;
   font-size: 11px;
-  color: #2A3890;
+  color: $main-color;
 }
 #header_search_input {
-  border: solid 1px #dedede;
+  border: solid 1px $input-border-color;
   height: 16px;
   width: 200px;
 }
 .banner_busqueda #header_search_input {
-  border: solid 1px #aaa;
   height: 20px;
 }
 #global_search_input {
-  border: solid 1px #aeaeae;
+  border: solid 1px $input-border-color;
   height: 25px;
   width: 300px;
 }
@@ -30,36 +31,35 @@
   display: none;
   float: right;
   margin-right: 35px;
-  border-left: solid 1px #B9B9B9;
-  border-right: solid 1px #B9B9B9;
-  border-bottom: solid 1px #B9B9B9;
+  border: solid 1px $auxiliar-color;
+  border-top: none;
   overflow: hidden;
   position: absolute;
   z-index: 2000;
-  background: #f5f5f5;
+  background: $fill-color;
   text-align: left;
 }
 #header_search_display a {
-  color: #2A3890;
+  color: $main-color;
   text-decoration: none;
 }
 #header_search_display a:hover {
-  color: #2A3890;
+  color: $main-color;
   text-decoration: none;
   font-weight: bold;
 }
 #header_search_display  li {
   padding: 4px;
-  border-top: solid 1px #B9B9B9;
+  border-top: solid 1px $auxiliar-color;
   font-size: 10px;
   height: 35px;
-  background: #f5f5f5;
+  background: $fill-color;
   overflow: hidden;
   text-align: center;
 }
 #header_search_display  li:hover {
-  background: #CFDEFF;
-  color: #2A3890;
+  background: $secondary-color;
+  color: $main-color;
 }
 #header_search_display  li .logo {
   float: left;
@@ -84,14 +84,6 @@
   height: 45px;
   text-align: left;
 }
-#header_search_display  li.title {
-  overflow: hidden;
-  text-align: center;
-  background: #879EB5;
-  height: 15px;
-  color: whiteSmoke;
-  font-weight: bold;
-}
 #header_search_display  li.loading, #header_search_display  li.more, #header_search_display  li.none {
   text-align: center;
 }
@@ -116,6 +108,14 @@
 }
 .subject_search_results {
   width: 186px;
+  height: 81px;
+  overflow: hidden;
+  text-align: center;
+}
+.subject_search_results.post {
+  width: 560px;
+  height: 100%;
+  overflow: hidden;
   text-align: center;
 }
 .subject_search_results img {
@@ -123,7 +123,7 @@
   height: 48px;
 }
 .subject_search_results .sub-block {
-  width: 62%;
+  width: 69%;
   word-wrap: break-word;
   height: 50px;
   overflow: hidden;
@@ -139,6 +139,9 @@
   float: right;
   padding: 0;
 }
+#search_results .highlight{
+  background-color: $unread-color;
+}
 /********************************* Form and errors *********/
 #search_form .error {
   display: none;

data/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/app/views/groups/_group_focus_search.html.erb

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

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

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

data/base/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/base/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/base/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 %>