social_stream 0.14.1 → 0.15.0

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

@@ -94,7 +94,9 @@
 	color: $main-color;
 	padding: 5px 5px 5px 5px;
 	width:549px;
-	height:40px;
+	min-height:40px;
+	max-height:60px;
+	overflow: hidden;
 	border-bottom:1px solid $text-over-main;
 }
 .conversations .conversation .content_left {
@@ -131,7 +133,7 @@
 .conversations .conversation .notification {
 	float:left;
 	width:5px;
-	height:100%;
+	height: 45px;
 	margin: 0px 5px 0px 0px;
 }
 .conversations .unread .notification {

data/base/app/models/activity_object.rb

@@ -56,4 +56,9 @@ class ActivityObject < ActiveRecord::Base
   def post_activity
     activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first
   end
+
+  # Does this {ActivityObject} has {Actor}?
+  def acts_as_actor?
+    object_type == "Actor"
+  end
 end

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

@@ -1,4 +1,4 @@
-<% if activity_object.object.is_a?(Actor) || activity_object.object.class.ancestors.include?(SocialStream::Models::Subject) %>
+<% if activity_object.acts_as_actor? %>
   <div class="block">
     <%= model_with_details activity_object.object %>
   </div>

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

@@ -1,10 +1,12 @@
 <% content_for :title do %>
-  <%= @group.name%>
+  <%= @group.name+" | "+t('site.name') %>
 <% end %>
 
-<% if @group.profile.description? %>
-  <% content_for :description do %>
+<% content_for :description do %>
+  <% if @group.profile.description? %>
     <%= @group.profile.description%>
+  <% else %>
+    <%= @group.name+" "+t('profile.is_on') + " "+ t('site.name') %>
   <% end %>
 <% end %>
 

data/base/app/views/notifications/activities/_like.html.erb

@@ -1,4 +1,4 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+<% if activity.direct_object.acts_as_actor? %>
   <div class="subject">
     <%= raw t('notification.fan', 
           :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),

data/base/app/views/notifications/activities/_like.text.erb

@@ -1,4 +1,4 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+<% if activity.direct_object.acts_as_actor? %>
   <%= raw t('notification.fan', 
         :sender => truncate_name(activity.sender.name),
         :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,

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

@@ -1,4 +1,4 @@
-<% author = post.post_activity.sender_subject %>
+<% author = post.author_subject %>
 <div class="model_with_details">
   <div class="logo">
     <%= link_to (image_tag(author.logo.url , :size => "50x50", :alt => author.name )), author  %>
@@ -15,4 +15,4 @@
       <br>
     </div>
   </div>
-</div>
+</div>

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

@@ -1,10 +1,13 @@
 <% content_for :title do %>
-  <%= @user.name%>
+  <%= @user.name+" | "+t('site.name') %>
 <% end %>
 
-<% if @user.profile.description? %>
-  <% content_for :description do %>
+
+<% content_for :description do %>
+  <% if @user.profile.description? %>
     <%= @user.profile.description%>
+  <% else %>
+    <%= @user.name+" "+t('profile.is_on') + " "+ t('site.name') %>
   <% end %>
 <% end %>
 

data/base/config/locales/en.yml

@@ -318,12 +318,14 @@ en:
     input: "What are you doing?"
     name: "post"
     one: "a post"
-    title: "Posts"  
+    title: "Posts"
   preposition:
     and: "and"
+    on: "on"
   profile:
     one: "Profile"
     age: "Age"
+    is_on: "is on"
     must_be_signed_id: "You must be signed in"
     group:
       about: "About us"

data/base/config/locales/es.yml

@@ -324,6 +324,7 @@ es:
   profile:
     one: "Perfil"
     age: "Edad"
+    is_on: "esta en"
     must_be_signed_id: "Debes identificarte"
     group:
       about: "Sobre nosotros/as"

data/base/lib/generators/social_stream/base/templates/relations.yml

@@ -37,16 +37,3 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
-
-event:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.5".freeze
+    VERSION = "0.10.6".freeze
   end
 end

data/base/social_stream-base.gemspec

@@ -35,8 +35,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('kaminari', '~> 0.12.4')
   # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.6')
-  # OAuth provider
-  s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
   s.add_runtime_dependency('mailboxer','~> 0.5.4')
   # Tagging

data/base/spec/dummy/config/relations.yml

@@ -37,16 +37,3 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
-
-event:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

data/documents/app/views/common_documents/_show.html.erb

@@ -1,4 +1,4 @@
-<% profile_subject ||= document.post_activity.receiver_subject %>
+<% profile_subject ||= document.owner_subject %>
 
 <% content_for :title do %>
 <%= profile_subject.name + ": " + t('repository.title') %>

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.5.0".freeze
+    VERSION = "0.5.1".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.6')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/events/README.rdoc

@@ -1,6 +1,3 @@
 = Social Stream Events
 
-Events and Video conferences capabilities to
-{Social Stream}[http://social-stream.dit.upm.es/], the core for building social
-network websites. This gem allow you  to add events and videoconferences as new social stream activity.
-
+This gem will change to support scheduled events

data/events/app/assets/javascripts/social_stream-events.js

@@ -1,5 +1 @@
-//= require fullcalendar
-//= require gcal
-//= require jquery.ad-gallery
-//= require jquery.ad-gallery.pack
 //= require_tree .

data/events/app/assets/stylesheets/social_stream-events.css

@@ -1,276 +1,3 @@
 /*
  *= require_tree .
  */
- 
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require social_stream-base
- *= require social_stream-documents
- *= require fullcalendar.print
- *= require fullcalendar
- *= require jquery.ad-gallery
- *= require_tree . 
-*/
-#filter_div
-{
-    float: right;
-    height: 10px;
-    padding-top: 5px;
-    width: 76px;
-    z-index: 2000;
-}
-#calendar{margin-top:-9px;}
-#fc-btn-agenda{ padding-left: 1px;}
-
-#founder{ padding: 1px; padding-top: 5px; text-align: center; }
-#founder #created{display: inline-block;}
-#founder #thumb{display: inline-block;}
-
-.sb_wrapper input[type="text"],
-ul.sb_dropdown{
-	border:1px solid #fff;
-	background: #fafafa; 
-	background: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#fafafa)); 
-	background: -moz-linear-gradient(top, #f2f2f2, #fafafa);
-	font-size:24px;
-	font-family:"Myriad Pro", "Trebuchet MS", sans-serif;
-	-moz-box-shadow:1px 1px 3px #555;
-	-webkit-box-shadow:1px 1px 3px #555;
-	-box-shadow:1px 1px 3px #555;
-	outline:none;
-	padding:6px 5px 6px 20px;
-	text-shadow:1px 1px 1px #fff;
-	width:295px;
-	float:left;
-	margin:3px 0px;
-}
-ul.sb_dropdown{
-	float:left;
-  margin-right:50px;
-	list-style:none;
-	width:295px;
-	padding:6px 5px;
-	-moz-border-radius:0px 0px 10px 10px;
-	-webkit-border-bottom-right-radius:10px;
-	-webkit-border-bottom-left-radius:10px;
-	border-bottom-right-radius:10px;
-	border-bottom-left-radius:10px;
-}
-ul.sb_dropdown li{
-	font-size:8px;
-	line-height:2px;
-	height:22px;
-	float:left;
-	width:30%;
-}
-ul.sb_dropdown li input[type="checkbox"]{
-	float:left;
-	margin:10px 4px 0 5px;
-}
-ul.sb_dropdown li.sb_filter{
-	width:148px;
-	border:1px solid #f9f9f9;
-	clear:both;
-	background: #ddd;
-	font-size:12px;
-	text-transform:uppercase;
-	letter-spacing:1px;
-	color:#444;
-	height:16px;
-	line-height:16px;
-	padding:5px;
-	-moz-box-shadow:0px 0px 2px #777;
-	-webkit-box-shadow:0px 0px 3px #555 inset;
-	-box-shadow:0px 0px 3px #555 inset;
-
-}
-span.sb_up,
-span.sb_down{
-  margin-top:10px;
-  padding:5px 25px 5px 25px;
-	width:14px;
-	height:41px;
-	background-color:#f2f2f2;
-	background-position:center center;
-	background-repeat: no-repeat;
-	z-index:10;
-	border:1px solid #fff;
-	-moz-box-shadow:1px 0px 1px #ddd;
-	-webkit-box-shadow:1px 0px 1px #ddd;
-	-box-shadow:1px 0px 1px #ddd;
-	
-}
-span.sb_up{
-	background-image:url(../icons/up.png);
-}
-span.sb_down{
-	background-image:url(../icons/down.png);
-}
-input.sb_search{
-	background:#f2f2f2 url(../icons/search.png) no-repeat center center;
-	height:43px;
-	width:50px;
-	float:left;
-	border:none;
-	margin:3px 0px;
-	border:1px solid #fff;
-	-moz-box-shadow:1px 1px 3px #555;
-	-webkit-box-shadow:1px 1px 3px #555;
-	-box-shadow:1px 1px 3px #555;
-	outline:none;
-	cursor:pointer;
-}
-input.sb_search:hover{
-	background-color:#fff;
-}
-
-.space_center_manage
-{
-  padding-right: 0;
-  padding-top: 9px;
-  text-align: left;
-}
-.tie_form {
-  display: inline;
-  height: 1%;
-  margin: 0 0;
-  overflow: hidden;
-}
-#contact_data{width: 250px;}
-
-
-.session_wrapper1,.session_wrapper2{float:left;display:block;}
-.session_wrapper1{
-	width:14%;
-	text-align:center;
-	margin:15px 0 15px 0;
-	color:#000;
-	}
-.session_wrapper2{width:86%;padding-top: 5px;}
-
-.event_date_image{margin: 0px 10px 0px 0px;width:100%;color:black;text-align:center;font-weight: bold;vertical-align: middle;}
-.event_day{font-size: 3.5em;line-height:90%;}
-.event_month{font-size: 2.5em;line-height:80%;}
-.event_year{font-size: 1.2em;line-height:110%;}
-.event_hour{font-size: 1.5em;line-height:80%;min-width: 30px; min-height: 20px;}
-.event_day_name{font-size: 1em;line-height:80%;}
-.event_time{font-size: 1em; line-height:50%;}
-
-.session_title{
-  border-bottom: 1px solid #ccc;
-  width: 100%;
-}
-
-.schedule{ height: 85px;}
-
-.block .session{height: 110px;}
-.block .session_title_black {color: black;}
-.block .session_content{font-size: 13px;}
-
-
-
-
-
-.sb_wrapper input[type="text"],
-ul.sb_dropdown{
-	border:1px solid #fff;
-	background: #fafafa; 
-	background: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#fafafa)); 
-	background: -moz-linear-gradient(top, #f2f2f2, #fafafa);
-	font-size:24px;
-	font-family:"Myriad Pro", "Trebuchet MS", sans-serif;
-	-moz-box-shadow:1px 1px 3px #555;
-	-webkit-box-shadow:1px 1px 3px #555;
-	-box-shadow:1px 1px 3px #555;
-	outline:none;
-	padding:6px 5px 6px 20px;
-	text-shadow:1px 1px 1px #fff;
-	width:100px;
-  float: right;
-	margin:3px 0px;
-  margin-right:0px;
-  z-index: 2000;
-}s
-ul.sb_dropdown{
-	float:right;
-	list-style:none;
-  z-index:2000;
-	width:150px;
-	padding:6px 5px;
-	-moz-border-radius:0px 0px 10px 10px;
-	-webkit-border-bottom-right-radius:10px;
-	-webkit-border-bottom-left-radius:10px;
-	border-bottom-right-radius:10px;
-	border-bottom-left-radius:10px;
-}
-ul.sb_dropdown li{
-    float: left;
-    font-size: 12px;
-    height: 25px;
-    line-height: 10px;
-    width: 100%;
-}
-ul.sb_dropdown li input[type="checkbox"]{
-	float:right;
-	margin:0px 3px 0 5px;
-}
-ul.sb_dropdown li.sb_filter{
-	width:295px;
-	border:1px solid #f9f9f9;
-	clear:both;
-	background: #ddd;
-	font-size:12px;
-	text-transform:uppercase;
-	letter-spacing:1px;
-	color:#444;
-	height:16px;
-	line-height:16px;
-	padding:5px;
-	-moz-box-shadow:0px 0px 2px #777;
-	-webkit-box-shadow:0px 0px 3px #555 inset;
-	-box-shadow:0px 0px 3px #555 inset;
-
-}
-span.sb_up,
-span.sb_down{
-  
-	width:14px;
-	height:41px;
-	background-color:#f2f2f2;
-	/*background-position:center center;*/
-  background-position: left center;
-	background-repeat: no-repeat;
-	z-index:10;
-	border:1px solid #fff;
-	-moz-box-shadow:1px 0px 1px #ddd;
-	-webkit-box-shadow:1px 0px 1px #ddd;
-	-box-shadow:1px 0px 1px #ddd;
-	
-}
-span.sb_up{
-	background-image:url("icons/up.png");
-}
-span.sb_down{
-	background-image:url("icons/down.png");
-}
-input.sb_search{
-	background:#f2f2f2 url("icons/search.png") no-repeat center center;
-	height:43px;
-	width:50px;
-	float:left;
-	border:none;
-	margin:3px 0px;
-	border:1px solid #fff;
-	-moz-box-shadow:1px 1px 3px #555;
-	-webkit-box-shadow:1px 1px 3px #555;
-	-box-shadow:1px 1px 3px #555;
-	outline:none;
-	cursor:pointer;
-}
-input.sb_search:hover{
-	background-color:#fff;
-}
-

data/events/config/locales/en.yml

@@ -2,119 +2,4 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  activity:
-    verb:
-      follow:
-        Event:
-          title: "%{subject} added %{contact} as contact."
-          message: "%{name} added you as contact."
-      like:
-        Event:
-          title: "%{subject} is a fan of %{contact}."
-          message: "%{name} is now your fan."
-      make-friend:
-        Event:
-          title: "%{subject} and %{contact} are now connected."
-          message: "%{name} also added you as contact."
-      post:
-        User:
-          title: "%{subject} add %{contact} like a new session."
-        Event:
-          title: "%{subject} created a new session."
-    view:
-      documents: "Documents"
-      audio: "Audio"
-      event: "Events"
-      photos: "Photos"
-      post: "Posts"
-      video: "videos"
-  actor:
-    created: "Created by"
-    delete: "Delete"
-    confirm_delete: "Confirm delete?"
-  agenda:
-    confirm_delete: "delete"
-  conference:
-    title: "Conferences"
-    list: "Contact's conferences"
-  date:
-    at: at
-    undefined: Undefined
-  event:
-    all: "All events"
-    all_n: "All events"
-    by: "By events"
-    cloud: "Events tag cloud"
-    confirm_delete: "Delete"
-    form:
-      title: "Event"
-    title: "Events"
-    input: "What is the name of event?"
-    list: "Contact's events"
-    live: "Live events"
-    most:
-      followed: "Most followed"
-      liked: "Most liked"
-    name: "event"
-    one: "an event"
-    other: "Events"
-    suscribed: "Last Suscribed"
-  frontpage:
-    elements:
-      conferences: "Conferences"
-    collaborate:
-      sentence1: "Organize your projects and activities"
-      sentence2: "Participate in conferences and events"
-      sentence3: "Create your own group and conferences"
-    meet:
-      sentence1: "Discover best online videoconferences"
-      sentence2: "Meet interesting people and groups"
-      sentence3: "Video chat with your colleagues"
-    share:
-      sentence1: "Videoconference recording and streaming"
-      sentence2: "Posts, comments, documents, photos, audios and videos"
-      sentence3: "Your contacts and relations"
-  menu:
-    outline: "Outline"
-  notification:
-    follow:
-      event: "%{sender} wants to take part in the event %{who}."
-    like:
-      event: "%{sender} likes %{whose} %{thing}."
-    makefriend:
-      event: "%{sender} accepted the invitation to join the event %{who}."
-    post:
-      event: "%{sender} added %{thing} in %{whose} wall."
-    update:
-      event: "%{sender} updated %{thing} in %{whose} wall."
-    who:
-      event: "%{name}"
-    whose:
-      event: "%{receiver}'s"
-  profile:
-    event:
-      about: "About us"
-      birthday: "Anniversary"
-      experience: "Area of expertise"
-      info: "Event information"
-      tags: "Event tags"
-    outline: "Outline"
-  session:
-    confirm_delete: "delete"
-    new: "New Session"
-    one: "session"
-    other: "sessions"
-    title: "title"
-    description: "description"
-    schedule: "schedule"
-  time:
-    am: am
-    end: End time
-    from: from
-    pm: pm
-    start: Start time
-    to: to
-  timezone:
-    one: Timezone
-    set_up: You have not set up your time zone. <a href="{{path}}">Set it up now</a>