social_stream-base 0.9.16 → 0.9.18

data/app/views/profiles/edit.html.erb

@@ -37,7 +37,7 @@ end %>
   <% if !params[:section].present? or params[:section].eql?("tags") %>
   	<% content_for :javascript do %>
   	  $(function() {
-  	    $(".new_group").validate();
+  	    $(".new_group").validate({errorClass: "validation_error"});
   	  });
   	  $("#profile_actor_attributes_tag_list").fcbkcomplete({
   	    json_url: "<%= tags_path(:format => :json) %>",
@@ -95,7 +95,7 @@ end %>
 	    <div class="form_label">
 	      <%= f.label t('profile.' + current_subject.class.to_s.downcase + '.birthday')%>
 	    </div>
-	    <div class="form_field">
+	    <div class="form_field" id="form_select">
 	      <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year=> Date.today.year, 
 	         :start_year=> (Date.today.year - 100), :prompt => { :day => 'Day', :month => 'Month', :year => 'Year' } %>
 	    </div>
@@ -119,8 +119,10 @@ end %>
 	    </div>
 	  </div>
 
-	  <div class="form_row form_label">
-	    <%= f.label t('profile.' + current_subject.class.to_s.downcase + '.about') %>
+	  <div class="form_row">
+	    <div class="form_label">
+	     <%= f.label t('profile.' + current_subject.class.to_s.downcase + '.about') %>
+	    </div>
 	  </div>
 	  <div class="form_row">
 	    <%= f.text_area :description, :maxlength => 200, :rows => 10, :class => "form_tag_long" %>

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

@@ -8,8 +8,4 @@
 
 <% toolbar if user_signed_in? %>
 
-<% if user_signed_in? %>
 <%= render :partial => 'index' %>
-<% else %>
-<%= render :partial => 'index_frontpage' %>
-<% end %> 

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

@@ -1,6 +1 @@
-<% if user_signed_in? %>
 <%= render :partial => 'show' %>
-<% else %>
-<% toolbar :profile => @user %>
-<%= render :partial => 'show_frontpage' %>
-<% end %> 

data/config/locales/en.yml

@@ -15,16 +15,35 @@ en:
       new: "New password"
       retype: "Retype new password"
     privacy: "Privacy"
+  activerecord:
+    attributes:
+      user:
+        email: "Email"
+        name: "Name"
+        password: "Password"
+        password_confirmation: "Confirm password"
+        remember_me: "Remember me"
   activity:
     audience:
-      visible: "Shared with %{audience}"
-      hidden: "Shared with spheres of %{audience}"
+      hidden:
+        summary: "Restricted"
+        full: "Shared with contacts of %{audience}"
+      public:
+        summary: "Public"
+        full: "Shared with all the Internet"
+      visible:
+        summary: "Restricted"
+        full: "Shared with %{audience}"
     confirm_delete: "Delete activity?"
     delete: "Delete"
     last: "Last Activities"
     like: "I like"
     one: "Activity"
     other: "Activities"
+    privacy:
+      contacts:
+        user: "Contacts of %{receiver}"
+        group: "Members of %{receiver}"
     sending: "Sending"
     title: "Activities"
     to_comment: "Comment"
@@ -60,8 +79,6 @@ en:
     create: "Create"
     save: "Save"
     update: "Update"
-  cleditor:
-    controls: "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
@@ -108,6 +125,13 @@ en:
   delete:
     confirm: Delete %{element}}?
   devise:
+    links:
+      sign_in: "Sign in"
+      sign_up: "Sign up"
+      forgot_password: "Forgot you password?"
+      confirmation_instructions: "Didn't receive confirmation instructions?"
+      unlock_instructions: "Didn't receive unlock instructions?"
+      sign_in_with: "Sign in with %{provider}"
     passwords:
       confirm: "Confirm password"
       forgot: "Forgot your password?"
@@ -137,6 +161,7 @@ en:
       default: "Meet"
       sentence1: "Meet interesting people and groups"
       sentence2: "Find last activity of your contacts"
+    register: "Register now!"
     share:
       default: "Share"
       sentence1: "Your proyects and activities"
@@ -192,6 +217,10 @@ en:
     base: "You are here"
     separator: " > "
   mailboxer:
+    form:
+      body: "Body"
+      recipients: "Recipients"
+      subject: "Subject"
     message_mailer:
       subject_new: "%{subject}"
       subject_reply: "%{subject}"

data/config/locales/es.yml

@@ -15,16 +15,35 @@ es:
       new: "Nueva contraseña"
       retype: "Repetir nueva contraseña"
     privacy: "Privacidad"
+  activerecord:
+    attributes:
+      user:
+        email: "Correo"
+        name: "Nombre"
+        password: "Contraseña"
+        password_confirmation: "Confirmar contraseña"
+        remember_me: "Recuérdame"
   activity:
     audience:
-      visible: "Compartido con %{audience}"
-      hidden: "Compartido con esferas de %{audience}"
+      hidden:
+        summary: "Restringido"
+        full: "Compartido con contactos de %{audience}"
+      public:
+        summary: "Público"
+        full: "Accesible por toda Internet"
+      visible:
+        summary: "Restringido"
+        full: "Compartido con %{audience}"
     confirm_delete: "¿Borrar actividad?"
     delete: "Borrar"
     last: "Últimas actividades"
     like: "Me gusta"
     one: "Actividad"
     other: "Actividades"
+    privacy:
+      contacts:
+        user: "Contactos de %{receiver}"
+        group: "Integrantes de %{receiver}"
     sending: "Enviando"
     title: "Actividades"
     to_comment: "Comentar"
@@ -59,8 +78,6 @@ es:
     cancel: "Cancelar"
     save: "Guardar"
     update: "Actualizar"
-  cleditor:
-    controls: "negrita cursiva subrayado tachado subíndice superíndice | tamaño estilo | lista | imagen enlazar desenlazar"
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"
@@ -107,6 +124,13 @@ es:
   delete:
     confirm: "¿Borrar %{element}}?"
   devise:
+    links:
+      sign_in: "Entrar"
+      sign_up: "Registrarse"
+      forgot_password: "¿Olvidaste tu contraseña?"
+      confirmation_instructions: "¿No recibiste instrucciones de confirmación?"
+      unlock_instructions: "¿No recibiste instrucciones de desbloqueo?"
+      sign_in_with: "Entrar con %{provider}"
     passwords:
       confirm: "Confirmar contraseña"
       forgot: "¿Olvidaste tu contraseña?"
@@ -134,6 +158,7 @@ es:
       default: "Encuentra"
       sentence1: "Descubre grupos y gente interesante"
       sentence2: "Encuentra la última actividad de tus contactos"
+    register: "¡Inscríbete ahora!"
     share:
       default: "Comparte"
       sentence1: "Tus proyectos y actividades"
@@ -189,6 +214,10 @@ es:
     base: "Estás aquí"
     separator: " > "
   mailboxer:
+    form:
+      body: "Mensaje"
+      recipients: "Para"
+      subject: "Asunto"
     message_mailer:
       subject_new: "%{subject}"
       subject_reply: "%{subject}"

data/lib/generators/social_stream/base/templates/initializer.rb

@@ -26,4 +26,7 @@ SocialStream.setup do |config|
   # 
   # config.quick_search_models = [:user, :group]
   # config.extended_search_models = [:user, :group]
+
+  # Cleditor controls. It is used in new message editor, for example
+  # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
 end

data/lib/social_stream/base/version.rb

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

data/lib/social_stream/models/object.rb

@@ -73,8 +73,9 @@ module SocialStream
             if _contact_id.nil?
               nil
             else
+              # FIXME: repeated in Activity#fill_relations
               if _contact.reflexive?
-                Array.wrap(_contact.sender.relation_public.id)
+                _contact.sender.relation_customs.map(&:id)
               else
                  _contact.
                    receiver.

data/lib/social_stream-base.rb

@@ -84,7 +84,10 @@ module SocialStream
   
   mattr_accessor :extended_search_models
   @@extended_search_models = [ :user, :group, :post ]
-  
+
+  mattr_accessor :cleditor_controls
+  @@cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
+ 
   class << self
     def setup
       yield self

data/social_stream-base.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.3')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.4')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.5.3')
+  s.add_runtime_dependency('mailboxer','~> 0.5.4')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
   # HTML Forms
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   # Modernizr.js javascript library
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine
-  s.add_runtime_dependency('thinking-sphinx', '~> 2.0.7')
+  s.add_runtime_dependency('thinking-sphinx', '~> 2.0.8')
   #Syntactically Awesome Stylesheets
   s.add_runtime_dependency('sass-rails', '~> 3.1.0')
 

data/spec/dummy/config/initializers/social_stream.rb

@@ -26,4 +26,7 @@ SocialStream.setup do |config|
   # 
   # config.quick_search_models = [:user, :group]
   # config.extended_search_models = [:user, :group]
+
+  # Cleditor controls. It is used in new message editor, for example
+  # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
 end

data/vendor/assets/javascripts/jquery.tipsy.js

@@ -0,0 +1,104 @@
+(function($) {
+    $.fn.tipsy = function(options) {
+
+        options = $.extend({}, $.fn.tipsy.defaults, options);
+        
+        return this.each(function() {
+            
+            var opts = $.fn.tipsy.elementOptions(this, options);
+            
+            $(this).hover(function() {
+
+                $.data(this, 'cancel.tipsy', true);
+
+                var tip = $.data(this, 'active.tipsy');
+                if (!tip) {
+                    tip = $('<div class="tipsy"><div class="tipsy-inner"/></div>');
+                    tip.css({position: 'absolute', zIndex: 100000});
+                    $.data(this, 'active.tipsy', tip);
+                }
+
+                if ($(this).attr('title') || typeof($(this).attr('original-title')) != 'string') {
+                    $(this).attr('original-title', $(this).attr('title') || '').removeAttr('title');
+                }
+
+                var title;
+                if (typeof opts.title == 'string') {
+                    title = $(this).attr(opts.title == 'title' ? 'original-title' : opts.title);
+                } else if (typeof opts.title == 'function') {
+                    title = opts.title.call(this);
+                }
+
+                tip.find('.tipsy-inner')[opts.html ? 'html' : 'text'](title || opts.fallback);
+
+                var pos = $.extend({}, $(this).offset(), {width: this.offsetWidth, height: this.offsetHeight});
+                tip.get(0).className = 'tipsy'; // reset classname in case of dynamic gravity
+                tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body);
+                var actualWidth = tip[0].offsetWidth, actualHeight = tip[0].offsetHeight;
+                var gravity = (typeof opts.gravity == 'function') ? opts.gravity.call(this) : opts.gravity;
+
+                switch (gravity.charAt(0)) {
+                    case 'n':
+                        tip.css({top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-north');
+                        break;
+                    case 's':
+                        tip.css({top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-south');
+                        break;
+                    case 'e':
+                        tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}).addClass('tipsy-east');
+                        break;
+                    case 'w':
+                        tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}).addClass('tipsy-west');
+                        break;
+                }
+
+                if (opts.fade) {
+                    tip.css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: 0.8});
+                } else {
+                    tip.css({visibility: 'visible'});
+                }
+
+            }, function() {
+                $.data(this, 'cancel.tipsy', false);
+                var self = this;
+                setTimeout(function() {
+                    if ($.data(this, 'cancel.tipsy')) return;
+                    var tip = $.data(self, 'active.tipsy');
+                    if (opts.fade) {
+                        tip.stop().fadeOut(function() { $(this).remove(); });
+                    } else {
+                        tip.remove();
+                    }
+                }, 100);
+
+            });
+            
+        });
+        
+    };
+    
+    // Overwrite this method to provide options on a per-element basis.
+    // For example, you could store the gravity in a 'tipsy-gravity' attribute:
+    // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' });
+    // (remember - do not modify 'options' in place!)
+    $.fn.tipsy.elementOptions = function(ele, options) {
+        return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
+    };
+    
+    $.fn.tipsy.defaults = {
+        fade: false,
+        fallback: '',
+        gravity: 'n',
+        html: false,
+        title: 'title'
+    };
+    
+    $.fn.tipsy.autoNS = function() {
+        return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
+    };
+    
+    $.fn.tipsy.autoWE = function() {
+        return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
+    };
+    
+})(jQuery);

data/vendor/assets/stylesheets/tipsy.css

@@ -0,0 +1,7 @@
+.tipsy { padding: 5px; font-size: 10px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat;  background-image: url(../images/tipsy.gif); }
+  .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
+  .tipsy-inner { -moz-border-radius:3px; -webkit-border-radius:3px; }
+  .tipsy-north { background-position: top center; }
+  .tipsy-south { background-position: bottom center; }
+  .tipsy-east { background-position: right center; }
+  .tipsy-west { background-position: left center; }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 9
-  - 16
-  version: 0.9.16
+  - 18
+  version: 0.9.18
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 +02:00
+date: 2011-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,12 +123,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -221,12 +221,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -315,12 +315,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 2
         - 0
-        - 7
-        version: 2.0.7
+        - 8
+        version: 2.0.8
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
@@ -592,7 +592,6 @@ files:
 - app/assets/images/frontpage/collaborate.png
 - app/assets/images/frontpage/comments.png
 - app/assets/images/frontpage/green_sq.png
-- app/assets/images/frontpage/join.gif
 - app/assets/images/frontpage/meet.png
 - app/assets/images/frontpage/people.png
 - app/assets/images/frontpage/purple_sq.png
@@ -628,6 +627,7 @@ files:
 - app/assets/images/logos/representation/user.png
 - app/assets/images/mini-loading.gif
 - app/assets/images/right.png
+- app/assets/images/tipsy.gif
 - app/assets/images/title_background.png
 - app/assets/javascripts/activities.js.erb
 - app/assets/javascripts/contacts.js
@@ -651,10 +651,6 @@ 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
@@ -680,8 +676,6 @@ 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/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
@@ -804,8 +798,6 @@ files:
 - app/views/devise/sessions/new.html.erb
 - 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
@@ -818,7 +810,6 @@ files:
 - 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
@@ -841,6 +832,8 @@ files:
 - app/views/layouts/_header.erb
 - app/views/layouts/_header_dropdown_menu.html.erb
 - app/views/layouts/_header_dropdown_menu_sessions.html.erb
+- app/views/layouts/_header_signed_in.erb
+- app/views/layouts/_header_signed_out.erb
 - app/views/layouts/_representation.html.erb
 - app/views/layouts/_search.html.erb
 - app/views/layouts/_settings.html.erb
@@ -907,7 +900,6 @@ files:
 - app/views/search/_form.html.erb
 - app/views/search/_header_search.html.erb
 - app/views/search/_index.html.erb
-- app/views/search/_index_frontpage.html.erb
 - app/views/search/index.html.erb
 - app/views/search/index.js.erb
 - app/views/settings/_api_key.html.erb
@@ -929,7 +921,6 @@ files:
 - 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
@@ -1066,6 +1057,7 @@ files:
 - vendor/assets/javascripts/jquery.fcbkcomplete.js
 - vendor/assets/javascripts/jquery.livequery.js
 - vendor/assets/javascripts/jquery.scrollTo.min.js
+- vendor/assets/javascripts/jquery.tipsy.js
 - vendor/assets/javascripts/jquery.validate.js
 - vendor/assets/javascripts/jquery.validate.old.js
 - vendor/assets/javascripts/jquery.watermarkinput.js
@@ -1094,6 +1086,7 @@ files:
 - vendor/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
 - vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
 - vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
+- vendor/assets/stylesheets/tipsy.css
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []