social_stream 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfabcee1a01b8644ba290578de8c3cd5bf08453a
-  data.tar.gz: 3a7539a5184ebfd4db782a800d1c5b292070de6b
+  metadata.gz: 064288b5d926da666e5604b02cc650044f174e4e
+  data.tar.gz: c7afdf71eacf174be9da550d964187cb71ab688e
 SHA512:
-  metadata.gz: 4fa4247dbffa664bf451131a8f2c8fd9dae847ef0f206c58cf3524e3fb4da68702558eee4c7e62382eff8ac676029e8ff3366abd42911c3e173df555736af5af
-  data.tar.gz: fa690ea899119790924d5b16d740807e36ac74c55eea38c2e72973aba2b15ebc2de7b663deda2ed0f2e56a2958c42e66de4a4f605d0be1c20e3099d1c3a86f97
+  metadata.gz: 90516124743fdf1028a355169e1c034498131c93ffce27fc21ca64f57b6913421ff9d54785e1d1f5f0d98d17df3c29d53d0b24df5561f749efbde6a44e4ed26b
+  data.tar.gz: 3cbd69f236b568c55d6f410ceb72dc0dba07d35117609d9759d7e12f2328cc0c1da61fc33cb0c3989622b4e76980c454f4f1d7b685e01afff100ac4bdf57f6c5

data/Gemfile

@@ -8,6 +8,7 @@ source "http://rubygems.org"
 # gem 'avatars_for_rails', :path => '../avatars_for_rails'
 # gem 'rails-scheduler', path: '../rails-scheduler'
 # gem 'omniauth-socialstream', path: '../omniauth-socialstream'
+# gem 'paperclip_waveform', path: '../paperclip_waveform'
 # gem 'flashy', path: '../flashy'
 
 # social_stream gems

data/README.rdoc

@@ -9,20 +9,21 @@ with {social networking}[http://en.wikipedia.org/wiki/Social_network] features a
 = Social Stream components
 
 Social Stream is divided into components. Developers can customize their social
-network with the functionalities they need for each case. Current Social Stream distribution include the following components:
+network with the functionalities they need for each case. Current Social Stream distribution includes the following components:
 
 * {Base}[https://github.com/ging/social_stream/tree/master/base], basic functionalities of contacts, streams and walls,
-  along with users, group, post and comments
+  along with users, groups, post and comments
 * {Documents}[https://github.com/ging/social_stream/tree/master/documents], support for
-  activities on files: pictures, audio and video with a HTML5 player
+  activities on files: pictures, audios and videos with a HTML5 player
 * {Events}[https://github.com/ging/social_stream/tree/master/events], sheduled events with calendar
 * {Linkser}[https://github.com/ging/social_stream/tree/master/linkser], advanced management of links to other webpages
 * {Presence}[https://github.com/ging/social_stream/tree/master/presence], XMPP based chat support 
 * {Ostatus}[https://github.com/ging/social_stream/tree/master/ostatus], support for social network federation
+* {Oauth2Server}[https://github.com/ging/social_stream/tree/master/oauth2_server], authentication and authorization service based on {OAuth2}[http://oauth.net/2/]
  
 = Installation
 
-Add the following to the Gemfile of the your Rails application:
+Add the following to the Gemfile of your Rails application:
 
   gem 'social_stream', '>= 1.0.0'
 

data/Rakefile

@@ -25,4 +25,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb', 'app/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
+import 'lib/tasks/i18n.rake'

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

@@ -1,45 +1,9 @@
 // require jquery.ba-url
+//
+//= require social_stream/callback
 
 SocialStream.Contact = (function($, SS, undefined) {
-  var indexCallbacks = [];
-
-  var addIndexCallback = function(callback){
-    indexCallbacks.push(callback);
-  };
-
-  var index = function(){
-    $.each(indexCallbacks, function(i, callback){ callback(); });
-  };
-
-  var showCallbacks = [];
-
-  var addShowCallback = function(callback){
-    showCallbacks.push(callback);
-  };
-
-  var show = function(){
-    $.each(showCallbacks, function(i, callback){ callback(); });
-  };
-
-  var updateCallbacks = [];
-
-  var addUpdateCallback = function(callback){
-    updateCallbacks.push(callback);
-  };
-
-  var update = function(options){
-    $.each(updateCallbacks, function(i, callback){ callback(options); });
-  };
-
-  var destroyCallbacks = [];
-
-  var addDestroyCallback = function(callback){
-    destroyCallbacks.push(callback);
-  };
-
-  var destroy = function(options){
-    $.each(destroyCallbacks, function(i, callback){ callback(options); });
-  };
+  var callback = new SS.Callback();
 
   var getForms = function(id) {
     return $('[data-contact_id="' + id + '"]');
@@ -66,7 +30,7 @@ SocialStream.Contact = (function($, SS, undefined) {
       success: function(data) {
         $(tab.attr('href')).find('.contact-list').html(data);
         tab.attr('data-loaded', 'true');
-        index();
+        callback.handlers.index();
       }
     });
   };
@@ -190,7 +154,7 @@ SocialStream.Contact = (function($, SS, undefined) {
       success: function(data) {
         $('#contacts-loading').hide();
          currentTab.find('.contact-list').html(data);
-        index();
+        callback.handlers.index();
       }
     });
   };
@@ -199,6 +163,10 @@ SocialStream.Contact = (function($, SS, undefined) {
     $('#contacts-loading').hide();
   };
 
+  var initNewGroupModal = function() {
+    $('.new_group-modal-link').attr('href', '#new_group-modal');
+  };
+
   var initContactFormsHtmlListener = function() {
     $('html').on('click.dropdown.data-api', saveForms);
   };
@@ -297,16 +265,19 @@ SocialStream.Contact = (function($, SS, undefined) {
     callback([ { id: element.val(), name: element.attr('data-recipient-name') } ]);
   };
 
-  addIndexCallback(initTabs);
-  addIndexCallback(initContactButtons);
-  addIndexCallback(initFilter);
-  addIndexCallback(hideLoading);
+  callback.register('index',
+                    initTabs,
+                    initContactButtons,
+                    initFilter,
+                    initNewGroupModal,
+                    hideLoading);
 
-  addUpdateCallback(updateForms);
-  addUpdateCallback(replaceContact);
-  addUpdateCallback(checkAndHideContact);
+  callback.register('update',
+                    updateForms,
+                    replaceContact,
+                    checkAndHideContact);
 
-  addDestroyCallback(hideContact);
+  callback.register('destroy', hideContact);
 
   // FIXME There is probably a more efficient way to do this..
   $(function() {
@@ -314,11 +285,7 @@ SocialStream.Contact = (function($, SS, undefined) {
     initContactFormsHtmlListener();
   });
 
-  return {
-    index: index,
-    show: show,
-    update: update,
-    select2: select2,
-    destroy: destroy
-  };
+  return callback.extend({
+    select2: select2
+  });
 })(jQuery, SocialStream);

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

@@ -70,6 +70,10 @@ SocialStream.Object = (function(SS, $, undefined){
     $('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
   };
 
+  var changeOwner = function(type) {
+    $('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
+  };
+
   callback.register('show',
                     SS.Comment.index,
                     SS.Audience.index);
@@ -78,6 +82,7 @@ SocialStream.Object = (function(SS, $, undefined){
                     initRelationSelect);
 
   return callback.extend({
+    changeOwner: changeOwner,
     changeRelationSelect: changeRelationSelect
   });
 

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

@@ -50,7 +50,7 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
   };
 
   var editFormsListener = function(event) {
-    if (event && $(event.srcElement).closest('.relation_custom').length > 0) {
+    if (event && $(event.target).closest('.relation_custom').length) {
       return;
     }
 

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

@@ -39,6 +39,7 @@ SocialStream.Wall = (function(SS, $, undefined){
 
   return callback.extend({
     changeAction: changeAction,
+    changeOwner: SS.Object.changeOwner, 
     changeRelationSelect: SS.Object.changeRelationSelect 
   });
 }) (SocialStream, jQuery);

data/base/app/assets/stylesheets/social_stream-base.css.sass

@@ -38,7 +38,8 @@
 
 @import "social_stream/base/search/header"
 
-@import "social_stream/base/adjust"
+@import "social_stream/base/adjust/adjust"
+@import "social_stream/base/adjust/layout/adjust"
 
 @import "social_stream/base/buttons"
 
@@ -145,7 +146,7 @@
 
 
 
-@import "social_stream/base/groups"
+@import "social_stream/base/groups/groups"
 
 
 
@@ -182,11 +183,89 @@
 
 
 @import "social_stream/base/timeline/timeline"
+
 @import "social_stream/base/timeline/wrapper_activities"
+
 @import "social_stream/base/timeline/layout/timeline"
+
 @import "social_stream/base/timeline/layout/wrapper_activities"
 
+@import "social_stream/base/timeline/responsive/responsive-768px-979px"
+@import "social_stream/base/timeline/responsive/responsive-1200px-min"
+@import "social_stream/base/timeline/responsive/responsive-767px-max"
+
 
 @import "social_stream/base/responsive/responsive-768px-979px"
 @import "social_stream/base/responsive/responsive-1200px-min"
 @import "social_stream/base/responsive/responsive-767px-max"
+
+
+
+/*@import "social_stream/bootstrap-rewrite/variables"
+/****************************** Bootstrap
+/*@import "bootstrap"
+
+/*@import "bootstrap-responsive"
+
+
+/****************************** Base
+/*@import "social_stream/base/mixins"
+
+
+
+/****************************** Bootstrap-rewrite
+/*@import "social_stream/bootstrap-rewrite/alerts"
+
+/*@import "social_stream/bootstrap-rewrite/forms"
+
+/*@import "social_stream/bootstrap-rewrite/modal"
+
+/*@import "social_stream/bootstrap-rewrite/navbar"
+
+/*@import "social_stream/bootstrap-rewrite/nav"
+
+/*@import "social_stream/bootstrap-rewrite/dropdowns"
+
+
+/****************************** Fonts
+/*@import "social_stream/fonts/fonts"
+
+/*@import "social_stream/fonts/colorfont"
+
+
+
+/****************************** Base
+
+/*@import "social_stream/base/logo"
+
+/*@import "social_stream/base/search"
+
+/*@import "social_stream/base/icons"
+
+/*@import "social_stream/base/layouts"
+
+/*@import "social_stream/base/footer"
+
+/*@import "social_stream/base/settings"
+
+/*@import "social_stream/base/notifications"
+
+/*@import "social_stream/base/conversation"
+
+/*@import "social_stream/base/contacts"
+
+/*@import "social_stream/base/explore"
+
+/*@import "social_stream/base/select2"
+
+/*@import "social_stream/base/frontpage_devise"
+
+/*@import "social_stream/base/profile"
+
+/*@import "social_stream/base/sidebar"
+
+/*@import "social_stream/base/toolbar"
+
+/*@import "social_stream/base/timeline"
+
+/*@import "social_stream/base/responsive"

data/base/app/assets/stylesheets/social_stream/base/adjust.css.sass

@@ -0,0 +1,5 @@
+/****************************** Style
+@import "social_stream/base/adjust/adjust"
+
+/****************************** layouta
+@import "social_stream/base/adjust/layouts/adjust"

data/base/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass}

@@ -2,14 +2,10 @@
   h2
     font-weight: bold
     color: #8e8e8e
-    margin-top: 0px
 
 textarea
   resize: none
 
-.loading
-  width: auto
-
 .avatar_profile
   @include border-radius(8px)
 .avatar
@@ -27,5 +23,5 @@ textarea
     img
       @include border-radius(4px)
 
-a#fbdk_tab
+#fdbk_tab
   background-color: $blue !important

data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass

@@ -0,0 +1,10 @@
+#content
+  h2
+    margin-top: 0px
+    
+.loading
+  width: auto
+
+input
+  &[type="file"]
+    line-height: 17px

data/base/app/assets/stylesheets/social_stream/base/buttons.css.sass

@@ -0,0 +1,2 @@
+/****************************** Style
+@import "social_stream/base/buttons/buttons"

data/base/app/assets/stylesheets/social_stream/base/contacts.css.sass

@@ -0,0 +1,10 @@
+/****************************** Style
+@import "social_stream/base/contacts/contacts"
+
+/****************************** Layout
+@import "social_stream/base/contacts/layouts/contacts"
+
+/****************************** Responsive
+@import "social_stream/base/contacts/responsive/responsive-768px-979px"
+@import "social_stream/base/contacts/responsive/responsive-1200px-min"
+@import "social_stream/base/contacts/responsive/responsive-767px-max"

data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass

@@ -1,15 +1,20 @@
 #contacts
   .contacts
+    .new_group-modal-link
+      @include btn-primary
+      @include border-radius(5px)
     .add
       @include btn-add
 
 
-      .tab-content
-        .contact-list
-          .contact
-            .x
-              font-size: 12px
-              color: $black
+    .tab-content
+      .add-goup
+        float: right
+      .contact-list
+        .contact
+          .x
+            font-size: 12px
+            color: $black
 
 
 #contact-form
@@ -35,7 +40,7 @@
 #new_relation
   .new_relation_custom
     .btn
-      @include buttonBackground($blueDark, $blue, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) 
+
     
 
 #permissions

data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass

@@ -15,8 +15,11 @@
       &[type="text"]
         margin-left: 0px
         width: 20% !important
-        float: right
+        float: left
         margin-botom: 0 !important
+    .new_group-modal-link
+      float: right
+
     .tab-content
       .contact-list
         clear: both
@@ -90,32 +93,37 @@
 ///////////// 
 
 
-#relation_customs
-  .relation_customs
-    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    float: left
-  .relation_list
-    @include makeColumn(3, 0)
-    padding-right: 5px
-    input
-      margin-right: 10px
-    label
-      display: inline-block
 
-    .actions
-      display: inline-block
-      float: right
-      margin-right: 10px
+.relation_customs
+  width: 80%
+  float: left
+  margin-left: 2.5%
+.relation_list
+  @include makeColumn(3, 0)
+  padding-right: 5px
+  input
+    margin-right: 10px
+  label
+    display: inline-block
+
+  .actions
+    display: inline-block
+    float: right
+    margin-right: 10px
 
-    .edit_name
-      margin-top: -22px
-      .edit_relation_custom
-        margin-bottom: 0px
-        .icon_tool16-ok
-          margin-top: -6px
+  .edit_name
+    margin-top: -22px
+    .edit_relation_custom
+      margin-bottom: 0px
+      #relation_custom_name
+        width: 69% !important
+        margin-left: 23px
+        margin-top: -3px
+      .icon_tool16-ok
+        margin-top: -3px
 
-    .btn
-      margin-left: 32px
+  .btn
+    margin-left: 32px
 
 #relation_custom_name
   width: 215px
@@ -130,9 +138,9 @@
     margin-right: 10px
   .new_relation_custom
     .btn
-      @include buttonBackground($blueDark, $blue, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) 
+      @include btn-secundary 
       float: right
-      margin: 7px 13px 0 0
+      margin: 7px 0px 0 0
     
 
 #new_relation_input_block
@@ -141,7 +149,7 @@
 
 
 #permissions
-  @include makeColumn(5, 0)
+  @include makeColumn(4, 0)
   h4
     text-align: left
   li