social_stream 0.11.2 → 0.11.3

data/base/lib/mailboxer/notification_decoder.rb

@@ -13,10 +13,11 @@ module Mailboxer
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
       if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
-        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
+        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
       else
-        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others', 
+                                                    :receiver => truncate_name(activity.receiver.name)))
         notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
       end
 
@@ -49,10 +50,11 @@ module Mailboxer
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
       if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
-        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
+        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
       else
-        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others', 
+                                                  :receiver => truncate_name(activity.receiver.name)))
         notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
       end
 

data/base/lib/social_stream-base.rb

@@ -77,7 +77,7 @@ module SocialStream
   @@objects = [ :post, :comment ]
 
   mattr_accessor :activity_forms
-  @@activity_forms = [ :post, :group ]
+  @@activity_forms = [ :post ]
   
   mattr_accessor :quick_search_models
   @@quick_search_models = [ :user, :group, :post ]

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

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

data/base/lib/social_stream/migrations/components.rb

@@ -4,7 +4,7 @@ module SocialStream
   module Migrations
     class Components < Base
       def initialize
-        @component = find_migration("social_stream-#{ self.class.name.split('::').last.tableize }")
+        @component = find_migration("social_stream-#{ self.class.name.split('::').last.underscore }")
       end
 
       def up(options = {})

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

@@ -4,7 +4,7 @@ module SocialStream
       # Base toolbar items
       def home_toolbar_items
         Array.new.tap do |items|
-        #Contacts
+          #Contacts
           items << {
             :key => :contacts,
             :name => image_tag("btn/btn_friend.png")+t('contact.other'),
@@ -17,6 +17,17 @@ module SocialStream
               {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
             ]
           }
+
+          # Groups
+          items << {
+            :key  => :groups,
+            :name => image_tag("btn/btn_group.png") + t('group.other'),
+            :url  => '#',
+            :options => { :link => { :id => "groups_menu" } },
+            :items => [
+              {:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path}
+            ]
+          }
         end
       end
 

data/base/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.4')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.5')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization

data/base/spec/controllers/contacts_controller_spec.rb

@@ -28,7 +28,7 @@ describe ContactsController do
     sign_in @user
 
     put :update, :id => @tie.contact_id,
-                 :contact => { "relation_ids" => [ "gotcha", @user.relations.last.id ] }
+                 :contact => { "relation_ids" => [ @user.relations.last.id ] }
 
     response.should redirect_to(@tie.receiver_subject)
     @user.reload.
@@ -46,7 +46,7 @@ describe ContactsController do
     
 
     put :update, :id => contact.id,
-                 :contact => { :relation_ids => [ "gotcha", @user.relations.last.id ],
+                 :contact => { :relation_ids => [ @user.relations.last.id ],
                                :message => "Testing" }
 
     response.should redirect_to(contact.receiver_subject)
@@ -67,7 +67,7 @@ describe ContactsController do
     
 
     put :update, :id => contact.id,
-                 :contact => { :relation_ids => [ "gotcha", relations.map(&:id) ].flatten,
+                 :contact => { :relation_ids => relations.map(&:id),
                                :message => "Testing" }
 
     response.should redirect_to(contact.receiver_subject)
@@ -96,7 +96,7 @@ describe ContactsController do
       sign_in @user
 
       put :update, :id => @contact,
-                   :contact => { "relation_ids" => [ "gotcha", @user.relations.last.id ] }
+                   :contact => { "relation_ids" => [ @user.relations.last.id ] }
 
       response.should redirect_to(home_path)
     end

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

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

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

@@ -9,6 +9,9 @@
  *= require_self
  *= require social_stream-base
  *= require social_stream-documents
+ *= require fullcalendar.print
+ *= require fullcalendar
+ *= require jquery.ad-gallery
  *= require_tree . 
 */
 #filter_div

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

@@ -0,0 +1,273 @@
+/*
+ *= 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_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;
+}
+