social_stream 0.10.3 → 0.10.4

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

@@ -44,8 +44,8 @@ label.validation_error{color: #D8000C;background-color: #FFBABA;border: 1px soli
 .error, #error_explanation {color: #D8000C;background-color: #FFBABA;background-image: url('btn/error.png');}
 
 /************Forms SECTION **************/
-input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0em;  line-height:135%;
-  margin-right:4px;	color:white;	padding:1px;}
+input.other_blue{	background-color:#497FC1 !important;	border:0px;	cursor:pointer; line-height:135%;
+                  padding: 1px 5px !important; margin: 5px 0px !important;}
 textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .colum_field_title{ text-align: center; }
 .needed{color:#6C6D6F;font-weight: normal;}
@@ -203,3 +203,34 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
 	text-align: center;
 }
 
+/********************************* Menu list options ***********/
+.menu_plain_list {
+  list-style: none;
+}
+.menu_plain_list li {
+  line-height: 27px;
+  vertical-align: top;
+  display: inline;
+}
+.menu_plain_list li span:hover {
+  background: #CFDEFF;
+  color: #2A3890;
+}
+.menu_plain_list li a:hover {
+  text-decoration: none;
+}
+.menu_plain_list li span {
+  padding: 5px 10px;
+  background-color: #E1EEF5;
+}
+.menu_plain_list li span.selected {
+  border: solid 1px #2A3890;
+}
+
+.menu_plain_list img{
+  vertical-align: middle;
+  padding-bottom: 3px;
+  padding-right: 3px;
+  padding-left: 3px;
+  display: inline-block;
+}

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

@@ -16,8 +16,11 @@
 .div_login #username{	height:10px; }
 .div_login, .input_username{	position:relative;	padding: 0px;	border: 0px; }
 .div_login #login_button{	width:61px;	height:18px; }
+.div_login #login_data{display: block;}
+.div_login .login_data_block{ display: inline-block; padding-left: 10px;}
+.div_login .login_data_block input{ width: 250px;}
 .div_login a.login{	background-color:#497FC1;	padding-right:2px;	padding-left:2px;	color:white; }
-.div_login .subtexto{	padding-top: 8px;	height:12px;	font-size: 11px; }
+.div_login .subtexto{	padding-top: 8px;	height:20px;	font-size: 11px; }
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
 #header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 10px 6px 11px;}

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

@@ -144,27 +144,5 @@
 #search_form .error {
   display: none;
 }
-/********************************* Focus options ***********/
-#focus_options ul {
-  list-style: none;
-}
-#focus_options ul li {
-  line-height: 27px;
-  vertical-align: top;
-  display: inline;
-}
-#focus_options  li span:hover {
-  background: #CFDEFF;
-  color: #2A3890;
-}
-#focus_options ul li a:hover {
-  text-decoration: none;
-}
-#focus_options ul li span {
-  padding: 5px 10px;
-  background-color: #E1EEF5;
-}
-#focus_options ul li span.selected {
-  border: solid 1px #2A3890;
-}
+
 /******************** Search css END ***********************/

data/base/app/controllers/search_controller.rb

@@ -22,6 +22,10 @@ class SearchController < ApplicationController
         end
       end
     end
+    respond_to do |format|
+      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
+      format.js
+    end
   end
 
   private

data/base/app/controllers/settings_controller.rb

@@ -37,7 +37,7 @@ class SettingsController < ApplicationController
     else
       flash[:error] = t('settings.error')
     end
-    redirect_to :action => :index
+    render :action => :index
   end
 
 end

data/base/app/helpers/toolbar_helper.rb

@@ -16,7 +16,8 @@ module ToolbarHelper
   # For example, the messages menu when you are looking your inbox. This is done through :option element.
   #
   # To get it working, you should use the proper :option to be expanded, ":option => :messages" in the
-  # mentioned example. This will try, automatically, to expand the section of the menu where its root
+  # mentioned example. This will try
+      # Base toolbar items, automatically, to expand the section of the menu where its root
   # list link, the one expanding the section, has an id equal to "#messages_menu". If you use
   # ":options => :contacts" it will try to expand "#contacts_menu".
   #
@@ -49,6 +50,8 @@ module ToolbarHelper
     content = capture do
       if options[:profile]
         render :partial => 'toolbar/profile', :locals => { :subject => options[:profile] }
+      elsif options[:option].present? and options[:option].to_s.eql? 'messages'
+        render :partial => 'toolbar/messages'
       else
         render :partial => 'toolbar/home'
       end
@@ -88,10 +91,15 @@ module ToolbarHelper
     render_items home_toolbar_items
   end
 
-  #Prints the home profile menu.
+  #Prints the profile toolbar menu.
   def profile_toolbar_menu(subject=current_subject)
     render_items profile_toolbar_items(subject)
   end
+
+  #Prints the messages toolbar menu.
+  def messages_toolbar_menu
+    render_items messages_toolbar_items
+  end
  
   #Renders array of navigation items with simple_navigation
   def render_items(items)

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

@@ -7,7 +7,7 @@
     <h2><%= t('sign_in') %></h2>
     <div class="space_center"></div>
     <div class="space_center"></div>
-    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+    <%= form_for(resource, :as => resource_name, :url => user_session_path) do |f| %>
       <%= devise_error_messages! %>
       <div class="form_row">
         <div class="form_label"><%= f.label :email %></div>

data/base/app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_user_session_path %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

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

@@ -3,11 +3,19 @@
     <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %></div>
     <div class="div_login">
       <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
-        <span><%= f.label :email %></span>
-        <%= f.email_field :email, :class => "input_username" %>
-        <span><%= f.label :password %></span>
-        <%= f.password_field :password, :class => "input_username" %>
+        <div id="login_data">
+          <div class="login_data_block">
+            <span><%= f.label :email %></span>
+            <%= f.email_field :email, :class => "input_username" %>
+          </div>
+          <div class="login_data_block">
+            <span><%= f.label :password %></span>
+            <%= f.password_field :password, :class => "input_username" %>
+          </div>
+        </div>
+        <div>
         <%= f.submit t(:sign_in), :class => 'other_blue'%>
+        </div>
       <% end -%>
       <div class="subtexto">
         <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
@@ -22,4 +30,3 @@
   <br class="clearfloat" />
   </div>
 </div>
-

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

@@ -1,5 +1,5 @@
 <div id="header_search">      
-  <form action="<%=search_path%>" method="get">
+  <form action="<%=search_path%>" method="get" id="header_search_form">
     <%= text_field_tag :search_query, nil,:autocomplete => :off, :id => :header_search_input %>
   </form>
   <div id="header_search_display">
@@ -23,6 +23,10 @@ $(document).ready(function() {
     e.stopPropagation();
   });
   
+  $("#header_search_form").submit(function(){
+  	$("#header_search_display").hide();
+  });
+  
   $("#header_search_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
 
   $("#header_search_input").keyup(function() {

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

@@ -1,22 +1,17 @@
 <div class="title">
-  <%= @search_class_sym.to_s.capitalize.pluralize %>
+	<%= @search_class_sym.to_s.capitalize.pluralize %>
 </div>
 <br class="clearfloat" />
 <% if @search_result.empty? %>
 <div class="subject_with_details">
-  <%= I18n.t('search.no_subject_found', :subject => @search_class_sym.to_s) %>
+	<%= I18n.t('search.no_subject_found', :subject => @search_class_sym.to_s) %>
 </div>
 <% else %>
 <% total = 0 %>
+<% @search_result.each do |subject|%>
 <div class="subject_search_results block left">
-  <% @search_result.each do |subject|%>
-  <%= subject_with_details subject %>
-  <% total+=1 %>
-  <% if (total%(SearchController::FOCUS_SEARCH_PER_PAGE/2)==0) %>
-</div>
-<div class="subject_search_results block left">
-  <% end %>
-  <% end %>
+	<%= subject_with_details subject %>
 </div>
+<% end %>
 <%= paginate @search_result %>
 <% end %> 

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

@@ -6,7 +6,7 @@
         <%= text_field_tag :search_query, params[:search_query].present? ? params[:search_query] : nil ,:autocomplete => :off, :id => :global_search_input %>
       </div>
       <div  id="focus_options" class="form_row search_row">
-        <ul>
+        <ul class="menu_plain_list">
           <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
           <% SocialStream.subjects.each do |subject| %>
             <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(subject.to_s.pluralize.downcase)) ? 'selected' : ''%>

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

@@ -0,0 +1,29 @@
+<nav id="toolbar">
+	<div id="toolbarContent" class="block">
+		<div class="space_center"></div>
+	</div>
+</nav>
+<div id= "center_body">
+	<section id="content">
+		<%= location(link_to(t('search.global.name')))%>
+		<br class="clearfloat" />
+		<div class="space_center"></div>
+		<h2><%= t('search.name') %></h2>
+		<div class="space_center"></div>
+		<div id="search_form_div">
+			<%= render :partial => 'form' %>
+		</div>
+		<div class="space_center"></div>
+		<div class="space_center"></div>
+		<div id="search_results" class="block">
+			<% unless params[:focus].present? %>
+			<%= render :partial => 'global_search' %>
+			<% else %>
+			<%= render :partial => 'focus_search' %>
+			<% end %>
+		</div>
+	</section>
+</div>
+<aside id="sidebar">
+	<div id="sidebarContent"></div>
+</aside>

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

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

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

@@ -0,0 +1,11 @@
+<%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
+
+<div class="block space_center">
+</div>
+
+<div id="menu_lateral" class="toolbar_menu">
+    <%= messages_toolbar_menu %>
+</div>
+
+<div class="block space_center">
+</div>

data/base/config/locales/en.yml

@@ -104,7 +104,6 @@ en:
     type:
       new: "+ New type"
   copyright: "2010 Copyright - All rights reserved"
-  days: Days
   delete:
     confirm: Delete %{element}}?
   devise:

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.13".freeze
+    VERSION = "0.9.14".freeze
   end
 end

data/base/lib/social_stream/toolbar_config/base.rb

@@ -4,32 +4,7 @@ module SocialStream
       # Base toolbar items
       def home_toolbar_items
         Array.new.tap do |items|
-          # Messages
-          items << {
-            :key => :messages,
-            :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-            :url => "#",
-            :options => {:link => {:id => "messages_menu"}},
-            :items => [
-              { :key => :message_new,
-                :name => image_tag("btn/message_new.png")+ t('message.new'),
-                :url => new_message_path,
-                :options => {:link =>{:remote=> false}}},
-              { :key => :message_inbox,
-                :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-                :url => conversations_path,
-                :options => {:link =>{:remote=> false}}},
-              { :key => :message_sentbox,
-                :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'),
-                :url => conversations_path(:box => :sentbox),
-                :options => {:link =>{:remote=> false}}},
-              { :key => :message_trash,
-                :name => image_tag("btn/message_trash.png")+t('message.trash'),
-                :url => conversations_path(:box => :trash)}
-            ]
-          }
-
-          #Contacts
+        #Contacts
           items << {
             :key => :contacts,
             :name => image_tag("btn/btn_friend.png")+t('contact.other'),
@@ -48,7 +23,7 @@ module SocialStream
       # Builds the default profile toolbar items
       def profile_toolbar_items(subject = current_subject)
         Array.new.tap do |items|
-          #Information button
+        #Information button
           items << {
             :key => :subject_info,
             :name => image_tag("btn/btn_edit.png")+t('menu.information'),
@@ -81,6 +56,27 @@ module SocialStream
           end
         end
       end
+
+      def messages_toolbar_items
+        Array.new.tap do |items|
+        # Messages
+          items << { :key => :message_new,
+            :name => image_tag("btn/message_new.png")+ t('message.new'),
+            :url => new_message_path,
+            :options => {:link =>{:remote=> false}}}
+          items << { :key => :message_inbox,
+            :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+            :url => conversations_path,
+            :options => {:link =>{:remote=> false}}}
+          items << { :key => :message_sentbox,
+            :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'),
+            :url => conversations_path(:box => :sentbox),
+            :options => {:link =>{:remote=> false}}}
+          items << { :key => :message_trash,
+            :name => image_tag("btn/message_trash.png")+t('message.trash'),
+            :url => conversations_path(:box => :trash)}
+        end
+      end
     end
   end
 end

data/base/spec/controllers/settings_controller_spec.rb

@@ -17,7 +17,7 @@ describe SettingsController do
 
   it "should render index after update_all" do
     put :update_all
-    response.should redirect_to settings_path
+    assert_response :success
   end
 
   describe "Notification settings" do

data/events/app/models/event.rb

@@ -1,5 +1,6 @@
 class Event < ActiveRecord::Base
   include SocialStream::Models::Subject
+  acts_as_conference_manager_event
 
   has_one :agenda, :dependent => :destroy
   has_many :sessions, :through => :agenda

data/events/app/models/session.rb

@@ -1,5 +1,6 @@
 class Session < ActiveRecord::Base
   include SocialStream::Models::Object
+  acts_as_conference_manager_session
 
   belongs_to :agenda
   has_one :event, :through => :agenda

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.10.3".freeze
+  VERSION = "0.10.4".freeze
 end

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.13')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.14')
   s.add_runtime_dependency('social_stream-documents', '~> 0.2.8')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.7')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 39
         segments: 
         - 0
         - 9
-        - 13
-        version: 0.9.13
+        - 14
+        version: 0.9.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -509,6 +509,7 @@ files:
 - base/app/views/devise/registrations/edit.html.erb
 - base/app/views/devise/registrations/new.html.erb
 - base/app/views/devise/sessions/new.html.erb
+- base/app/views/devise/shared/_links.erb
 - base/app/views/frontpage/_header.html.erb
 - base/app/views/frontpage/_sponsor.html.erb
 - base/app/views/frontpage/host_meta.xml.builder
@@ -605,6 +606,7 @@ files:
 - base/app/views/search/_global_search.html.erb
 - base/app/views/search/_header_search.html.erb
 - base/app/views/search/_index.html.erb
+- base/app/views/search/_index_frontpage.html.erb
 - base/app/views/search/index.html.erb
 - base/app/views/search/index.js.erb
 - base/app/views/settings/_api_key.html.erb
@@ -620,6 +622,7 @@ files:
 - base/app/views/ties/index.html.erb
 - base/app/views/toolbar/_home.html.erb
 - base/app/views/toolbar/_logo.html.erb
+- base/app/views/toolbar/_messages.html.erb
 - base/app/views/toolbar/_profile.html.erb
 - base/app/views/users/_groups.html.erb
 - base/app/views/users/_index.html.erb