social_stream 0.23.1 → 0.23.2

data/base/app/assets/javascripts/social_stream.activity.js

@@ -0,0 +1,16 @@
+//= require social_stream.objects
+
+SocialStream.Activity = (function(SS, $, undefined){
+	var scrollToActivity = function(){
+		var activity_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
+		if (activity_hash && activity_hash > 0){
+			$.scrollTo('#activity_' + activity_hash[1] ,1500,{axis:'y'});
+		}
+
+	}
+
+	SS.Objects.addInitCallback(scrollToActivity);
+
+	return {
+	}
+})(SocialStream, jQuery);

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

@@ -20,7 +20,7 @@
 #wrapper_activities_header {	padding-top: 5px;  padding-bottom: 5px;	background-color: $secondary-color;}
 #activities_title {	vertical-align: top;	margin-left: 10px;	font-weight: bold;}
 #activities_header {	width: 100%;	margin-bottom: 5px;	text-align: center;	padding-top: 5px;min-height: 35px;}
-#activities_header input[type="text"] {	color: $main-color;	padding: 5px 5px 5px 5px; width:95%;
+#activities_header input[type="text"], #activities_header textarea {	color: $main-color;	padding: 5px; width:95%;
   border:1px solid $input-border-color;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}

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

@@ -1,7 +1,5 @@
 <% toolbar :profile => object.owner_subject %>
 
-<%= render object.post_activity %>
-
 <%= javascript_tag do %>
   $(function() {
     SocialStream.Objects.init();

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

@@ -1,10 +1,4 @@
-<% content_for :javascript do %>
-    var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
-    if (message_hash && message_hash > 0){
-      $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
-    }
-<% end %>
-
 <%= render :partial => 'objects/show',
            :locals  => { :object => @post } %>
 
+<%= render @post.post_activity %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.17.0".freeze
+    VERSION = "0.17.1".freeze
   end
 end

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

@@ -1,6 +1,8 @@
 //= require jquery.jplayer
 //= require jquery.ae.image.resize
 //
+//= require social_stream-base
+//
 //= require_self
 //= require_tree .
 

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

@@ -1,3 +1,6 @@
+<%= render :partial => 'objects/show',
+           :locals  => { :object => document } %>
+
 <% profile_subject ||= document.owner_subject %>
 
 <% content_for :title do %>
@@ -17,8 +20,6 @@
   ) %>
 <%end%>
 
-<% toolbar :profile => profile_subject %>
-
 <br class="clearfloat" />
 <div class="space_center"></div>
 <h2><%= document.title.nil? ? document.file_file_name : document.title %></h2>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.11.3".freeze
+    VERSION = "0.11.4".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.17.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/app/assets/stylesheets/events.css.scss

@@ -130,6 +130,18 @@ div.event_date {
   padding: 3px 0;
 }
 
+#new_event label {
+	float: left;
+	min-width: 60px;
+	text-align: right;
+	padding-right: 10px;
+}
+
+#new_event textarea {
+	height: 30px;
+	width: 200px;
+}
+
 #scheduler-options {
   padding: 2px 10px;
 }

data/events/app/views/events/_new.html.erb

@@ -21,6 +21,12 @@
     <%= f.text_field :title %>
   </div>
 
+  <div class="form_row">
+    <%= f.label :description %>
+    <%= f.text_area :description %>
+  </div>
+
+
   <% if profile_subject.rooms.any? %>
   <div class="form_row">
     <%= f.label :room %>

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.9.0".freeze
+    VERSION = "0.9.1".freeze
   end
 end

data/events/social_stream-events.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.17.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.23.1".freeze
+  VERSION = "0.23.2".freeze
 end

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

@@ -1,25 +1,30 @@
-var SocialStream = SocialStream || {};
-SocialStream.Linkser = SocialStream.Linkser || {};
-SocialStream.Linkser.initiate = function() {
-  $.preloadImages("<%= asset_path('loading.gif') %>");
+//= require social_stream.wall
+
+SocialStream.Linkser.Wall = (function(SS, $) {
+  var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
+
   var urlDetect = function() {
     this.currentValue = $("#input_activities").val();
+
     if(this.lastValue == null)
       this.lastValue = "";
 
-    var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
     if(regexp.test($("#input_activities").val())) {
       $("#link_url").val($("#input_activities").val());
       $("#link_loaded").val(false);
       $("#new_post").attr("action", "/links");
+
       if(this.currentValue != this.lastValue) {
         $("#link_preview").html($('<img>').attr('src', '<%= asset_path('loading.gif') %>').addClass('loading'));
+
         this.lastValue = this.currentValue;
         var url = this.currentValue;
         var urlDetect = this;
+
         $.ajax({
           type : "GET",
           url : "/linkser_parse?url=" + url,
+          dataType: 'html',
           success : function(html) {
             if($("#input_activities").val() == url) {//Only show if input value is still the same
               $("#link_preview").html(html);
@@ -33,6 +38,7 @@ SocialStream.Linkser.initiate = function() {
           }
         });
       }
+
       $("#link_preview").show();
     } else {
       $("#new_post").attr("action", "/posts");
@@ -41,23 +47,36 @@ SocialStream.Linkser.initiate = function() {
       $("#link_url").val("");
     }
   }
-  if($("#new_post").length) {
-    $("#input_activities").change(urlDetect).keyup(urlDetect);
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[owner_id]').attr('id', 'link_owner_id').val($("#post_owner_id").val()));
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[url]').attr('id', 'link_url'));
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[loaded]').attr('id', 'link_loaded').val(false));
-    $("#new_post").append($('<div>').attr('id', 'link_preview').css('display', 'none'));
+
+  var init = function(){
+    $.preloadImages("<%= asset_path('loading.gif') %>");
+
+    if($("#new_post").length) {
+      $("#input_activities").change(urlDetect).keyup(urlDetect);
+
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[owner_id]').attr('id', 'link_owner_id').val($("#post_owner_id").val()));
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[url]').attr('id', 'link_url'));
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[loaded]').attr('id', 'link_loaded').val(false));
+      $("#new_post").append($('<div>').attr('id', 'link_preview').css('display', 'none'));
+    }
   }
-}
 
-SocialStream.Linkser.openCallback = function(id,url,w,h){
+  var openCallback = function(id,url,w,h){
       var height='353';
+
       if(w>0 && h>0) {
           height=470*h/w;
       }
+
       $("#" + id).html($('<iframe>').attr('src',url).attr('width','470').attr('height',height));
-}
+  }
+
+  SocialStream.Wall.addInitCallback(init);
+
+  return {
+    openCallback: openCallback
+  }
+
+})(SocialStream, jQuery);
+
 
-$(function(){
-  SocialStream.Linkser.initiate();
-});

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

@@ -1,2 +1,6 @@
+//= require social_stream-base
+//
+//= require_self
 //= require_tree .
 
+SocialStream.Linkser = SocialStream.Linkser || {};

data/linkser/app/assets/stylesheets/linkser.css.scss

@@ -47,7 +47,7 @@
 }
 .link .info{
   float: left;
-  width: 360px;
+  width: 350px;
   text-align: left;
 }
 .activity_objects .link .info{
@@ -61,7 +61,8 @@
   text-decoration: underline;
   margin-bottom: 5px;
 }
-.link .info .description{
+.link .info .description textarea {
+	height: 60px;
 }
 .link iframe{
   border: 0;

data/linkser/app/views/links/_link.html.erb

@@ -7,7 +7,7 @@
         <%= javascript_tag do %>
           $("#link_<%= link.id.to_s %> img").each(function(){
             $(this).click(function(){
-              SocialStream.Linkser.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
+              SocialStream.Linkser.Wall.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
             });
           });
           

data/linkser/app/views/links/_link_preview.html.erb

@@ -6,21 +6,14 @@
     </div>
   <% end %>
   <div class="info">
-    <% if link.title %>
-      <div class="title">
-        <%= link.title %>
-        <%= hidden_field_tag "link[title]", link.title %>
-      </div>
-    <% end %>
-    <div class="url">
-      <%= auto_link(link.url) %>
+    <div class="title">
+      <%= text_field_tag "link[title]", link.title %>
     </div>
-    <% if link.description %>
-      <div class="description">
-        <%= auto_link(link.description) %>
-        <%= hidden_field_tag "link[description]", link.description %>
-      </div>
-    <% end %>
+
+    <div class="description">
+      <%= text_area_tag "link[description]", link.description %>
+    </div>
+
     <% if link.callback_url %>
         <%= hidden_field_tag "link[callback_url]", link.callback_url %>
     <% end %>

data/linkser/app/views/links/show.html.erb

@@ -1,10 +1,4 @@
-<% content_for :javascript do %>
-    var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
-    if (message_hash && message_hash > 0){
-      $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
-    }
-<% end %>
-
 <%= render :partial => 'objects/show',
            :locals  => { :object => @link } %>
 
+<%= render @link.post_activity %>

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.1".freeze
   end
 end

data/linkser/social_stream-linkser.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.17.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/social_stream.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.11.3')
-  s.add_runtime_dependency('social_stream-events', '~> 0.9.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.7.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.11.4')
+  s.add_runtime_dependency('social_stream-events', '~> 0.9.1')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.7.1')
   s.add_runtime_dependency('social_stream-presence', '~> 0.10.0')
  
   # Development Gem dependencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,51 +14,51 @@ date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &72068930 !ruby/object:Gem::Requirement
+  requirement: &82119550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.1
   type: :runtime
   prerelease: false
-  version_requirements: *72068930
+  version_requirements: *82119550
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &72068670 !ruby/object:Gem::Requirement
+  requirement: &82118350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
-  version_requirements: *72068670
+  version_requirements: *82118350
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &72068430 !ruby/object:Gem::Requirement
+  requirement: &82117630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *72068430
+  version_requirements: *82117630
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &72068200 !ruby/object:Gem::Requirement
+  requirement: &82117320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *72068200
+  version_requirements: *82117320
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &72067970 !ruby/object:Gem::Requirement
+  requirement: &82115680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *72067970
+  version_requirements: *82115680
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72067730 !ruby/object:Gem::Requirement
+  requirement: &82112980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *72067730
+  version_requirements: *82112980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &72067440 !ruby/object:Gem::Requirement
+  requirement: &82111380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72067440
+  version_requirements: *82111380
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &72067070 !ruby/object:Gem::Requirement
+  requirement: &82108850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72067070
+  version_requirements: *82108850
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72066590 !ruby/object:Gem::Requirement
+  requirement: &82105950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *72066590
+  version_requirements: *82105950
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72066220 !ruby/object:Gem::Requirement
+  requirement: &82104260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *72066220
+  version_requirements: *82104260
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &72065320 !ruby/object:Gem::Requirement
+  requirement: &82094400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *72065320
+  version_requirements: *82094400
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &72064900 !ruby/object:Gem::Requirement
+  requirement: &82092900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *72064900
+  version_requirements: *82092900
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -339,6 +339,7 @@ files:
 - base/app/assets/javascripts/search.js.erb
 - base/app/assets/javascripts/settings.js
 - base/app/assets/javascripts/social_stream-base.js
+- base/app/assets/javascripts/social_stream.activity.js
 - base/app/assets/javascripts/social_stream.comments.js
 - base/app/assets/javascripts/social_stream.objects.js
 - base/app/assets/javascripts/social_stream.search.js.erb