social_stream 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0db077c1e603d3899591dea35f043c8aa3d91df
-  data.tar.gz: 0c2b036ffe855298d2a8ebbdc75e6a5534f38459
+  metadata.gz: d3eb4537e10308e9a0ed535c6abaf0c1121eeded
+  data.tar.gz: eed0069d1cf71067c8601893a0966e1fefb1af56
 SHA512:
-  metadata.gz: efba25852f05c3076943c393eaffbae7891aff2db73f40c4c25a5cae8cb3d37d40373be95bb056437392e458ca1d293f91918d7bb519b3023c60aecb3a73b8bc
-  data.tar.gz: 06b33c37329c16de1d5fd01ad27516beb74a19f5ccf207db288503cf0b4f2dce2256db8708e68f779141fc1152ece372ab6d7c2f8072459ebaf3755048ad69cc
+  metadata.gz: 2be013846c7bea51673bfe725caf094fbb9e3c03c4ec05c1cc9d748a019ad8534b47093b2aaecfb72b26962387073269d43f977e30f20bf790b7288ec2d9dc54
+  data.tar.gz: 0c04503eea1f785382fc7e58854492054e190654df48a99f12ea948f06b9ec5ad537b1f95d6848509c4833bcf7f2846e73b24ae542fb68280ccfe7280e8877a1

data/Gemfile

@@ -18,6 +18,6 @@ gem 'paperclip_waveform'
   gem "social_stream-#{ g }", :path => g
 end
 
-# gem 'social2social', :path => '../social2social'
+gem 'pry'
 
 gemspec

data/README.rdoc

@@ -3,8 +3,9 @@
 Social Stream is an engine for Ruby on Rails. It provides a robust and flexible framework
 with {social networking}[http://en.wikipedia.org/wiki/Social_network] features and {activity streams}[http://activitystrea.ms/] for building websites.
 
-{<img src="https://secure.travis-ci.org/ging/social_stream.png" />}[http://travis-ci.org/ging/social_stream]
+{<img src="https://badge.fury.io/rb/social_stream.png" />}[http://rubygems.org/gems/social_stream]
 {<img src="https://codeclimate.com/github/ging/social_stream.png" />}[https://codeclimate.com/github/ging/social_stream]
+{<img src="https://secure.travis-ci.org/ging/social_stream.png" />}[http://travis-ci.org/ging/social_stream]
 
 = Social Stream components
 

data/base/README.rdoc

@@ -5,6 +5,8 @@ Social Stream Base provides the basic functionality for
 network websites. The features of this gem are limited, for a complete social
 network environment see https://github.com/ging/social_stream
 
+{<img src="https://badge.fury.io/rb/social_stream-base.png" />}[http://rubygems.org/gems/social_stream-base]
+
 == Features
 
 * Social network infrastructure

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

@@ -120,8 +120,6 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
     $('#new_relation').before(options.relation.html);
 
     initList($('#relation_custom_' + options.relation.id));
-
-    resetNewForm();
   };
 
   var resetNameForm = function(options) {
@@ -153,6 +151,10 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
     el.find('input[name="relation_custom[name]"]').val('');
   };
 
+  var selectNewItem = function(options) {
+    $('input[name^="relation"][value="' + options.relation.id + '"]').click();
+  };
+
   var hideElement = function(options) {
     $('#relation_custom_' + options.relation.id).hide();
     $('#relation_' + options.relation.id + '_permissions').hide();
@@ -162,7 +164,10 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
                     initList,
                     initPermission);
 
-  callback.register('create', addToList);
+  callback.register('create',
+                     addToList,
+                     resetNewForm,
+                     selectNewItem);
 
   callback.register('update',
                     resetNameForm,

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

@@ -60,8 +60,7 @@ SocialStream.Timeline = (function(SS, $, undefined){
 
   callback.register('create',
                     SS.Audience.index,
-                    SS.Comment.index,
-                    SS.Wall.new_);
+                    SS.Comment.index);
 
   callback.register('update',
                     SS.Audience.index,

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

@@ -11,8 +11,18 @@ SocialStream.Wall = (function(SS, $, undefined){
     $('.wall_input [name="post[text]"]').autosize();
   };
 
+  // Prevent sending the same post several times
+  var initShareButton = function() {
+    $('.wall_input input[type="submit"]').on('click', loadingShareButton);
+  };
+
+  var loadingShareButton = function() {
+    $(this).button('loading');
+  };
+
   var resetWallInput = function(){
     $('#post_text').val('');
+    $('.wall_input input[type="submit"]').button('reset');
   };
 
   var changeAction = function(path) {
@@ -37,6 +47,7 @@ SocialStream.Wall = (function(SS, $, undefined){
 
   callback.register('show',
                     initInputAutosize,
+                    initShareButton,
                     SS.Object.new_);
 
   callback.register('new_',

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

@@ -12,6 +12,7 @@
         float: right
       .contact-list
         .contact
+          @include contact-style
           .x
             font-size: 12px
             color: $black

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

@@ -30,48 +30,7 @@ input#group_name
         padding-bottom: 50px
 
         .contact
-          width: 240px
-          float: left
-          margin-left: 19px
-          min-height: 76px
-          margin-bottom: 14px
-
-        .avatar
-          float: left
-          margin-left: 0px
-          width: 50px
-          display: inline
-          margin-top: 10px
-          img
-            width: 45px 
-            vertical-align: top
-
-        .data
-          float: left
-          margin-left: 0px
-          width: 175px
-          display: inline-block
-          margin-top: 11px
-          .name
-            @include ellipsis
-        .info
-          @include ellipsis
-          z-index: 1
-          padding-left: 2%
-      
-        .add
-          z-index: 1
-          float: left
-          .edit_contact
-            margin-bottom: 0px
-          .dropdown-toggle
-            margin-left: 0 
-            widht: 100%
-        .x
-          display: inline-block
-          float: right
-          margin-top: -40px
-
+          @include contact-layout
         
 
 #contact-form

data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass

@@ -1,6 +1,4 @@
 footer
-  height: auto
-  line-height: 32px
   text-align: center
   clear: both
   padding-top: 30px
@@ -8,5 +6,8 @@ footer
     margin-left: 0
     li
       display: inline-block
+footer,
+.push
+  height: 32px
 
 

data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass

@@ -1,3 +1,6 @@
+html,
+body
+  height: 100%
 body
   background-color: #f9f9f9
   color: #555
@@ -6,7 +9,7 @@ body
 
 
 .wrapper
-  min-height: 100%
+  min-height: 95%
   height: auto !important
   margin: 0 auto -32px
 

data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass

@@ -33,3 +33,51 @@
 @mixin hidden-desktop
   @extend .hidden-desktop
 
+
+@mixin contact-style
+  .avatar
+    img
+      @include border-radius(5px)
+  .data
+    .name
+      color: $black
+      .x
+        font-size: 12px
+        color: $black
+        a
+          text-decoration: none
+    .info
+      font-size: 11px
+      color: #777
+      font-family: $sansFontFamilyLight
+  .add
+    @include btn-add
+
+@mixin contact-layout
+  margin: 4px 0 19px 14px
+  width: 240px
+  min-height: 76px
+  float: left
+  .avatar
+    width: 45px !important
+    float: left
+  .data
+    display: inline-block
+    margin: 2px 0 3px 3px
+    float: left
+    width: 65%
+    .info
+      z-index: 1
+    a
+      display: inline
+  .x
+    a
+      float: right
+      display: inline-block
+      margin-right: 16px
+      margin-top: -98px
+  .info
+    z-index: 1
+  .add
+    margin-top: 2px
+    width: auto

data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass

@@ -7,32 +7,28 @@
       margin-bottom: 10px
       .colorfont-overlay
       top: 20px !important
-    .tags,
-    .personal,
-    .comunication-info,
-    .experience,
-    .avatar
-      input,
-      textarea
-        background-color: $whiteSmoke
-      .briefing
-        background-color: $white
-        color: $gray
-        span
-          @include border-radius(5px)
-          background-color: #D9EDF7
-          border: 1px solid #BCE8F1
-          color: #3A87AD
-          text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
-        p
-          border-top: 5px solid $whiteSmoke
-          background-color: none
-      
+    input,
+    textarea
+      background-color: $whiteSmoke
+    .briefing
+      background-color: $white
+      color: $gray
+      span
+        @include border-radius(5px)
+        background-color: #D9EDF7
+        border: 1px solid #BCE8F1
+        color: #3A87AD
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
+      p
+        border-top: 5px solid $whiteSmoke
+        background-color: none
+    
 
-      form.edit_profile
-        input
-          &[type="submit"]
-            @include btn-secundary
+    form.edit_profile
+      input
+        &[type="submit"]
+          @include btn-secundary
+          
     .personal
       form.edit_profile
         h6 

data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass

@@ -3,31 +3,5 @@
   #pendings
     h4
       font-size: 33.5px
-    
     .contact
-      .avatar
-        img
-          @include border-radius(5px)
-     
-      .data
-        .name
-          color: $black
-          .x
-            font-size: 12px
-            color: $black
-            a
-              text-decoration: none
-        .info
-          font-size: 11px
-          color: #777
-          font-family: $sansFontFamilyLight
-
-      .add
-        @include btn-add
-
-    .see-more
-      font-size: 12px
-      line-height: 20px
-      a
-        text-decoration: none
-        color: $grayLight
+      @include contact-style

data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass

@@ -4,30 +4,7 @@
   width: 22.85714%
   float: right
   .contact
-    margin: 4px 0
-    .avatar
-      width: 45px !important
-      float: left
-    .data
-      display: inline-block
-      margin: 2px 0 3px 3px
-      float: left
-      width: 65%
-      .info
-        z-index: 1
-      a
-        display: inline
-    .x
-      a
-        float: right
-        display: inline-block
-        margin-right: 16px
-        margin-top: -98px
-    .info
-      z-index: 1
-    .add
-      margin-top: 2px
-      width: auto
+    @include contact-layout
 
 #suggestions
   margin-top: 30px

data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass

@@ -5,8 +5,6 @@
       li
         @include btn-primary
         @include border-radius(5px)
-        padding: 4px 7px
-        margin-bottom: 5px
         a
           @include ellipsis
         .icon_tool16-info
@@ -63,9 +61,6 @@
 
 #toolbar
   h5
-    position: relative
-    margin-top: 7px
-    margin-bottom: 16px
     font-size: 16px
     @include ellipsis
     a
@@ -80,11 +75,8 @@
 
   .contacts-toolbar,
   section.groups
-    @extend .hidden-phone
     h4
-      margin-bottom: 0px
       font-family: $sansFontFamilyLight
-      border-bottom: 1px solid #ddd
     ul
       border-right: 1px solid #ddd
       img
@@ -103,10 +95,9 @@
     @include ellipsis
     img
       @include border-radius(5px)
+    .subject-name
+      @include ellipsis
     .subject-name-phone
-      position: relative
-      margin-top: 7px
-      margin-bottom: 16px
       font-size: 16px
       @include ellipsis
       a

data/base/app/assets/stylesheets/social_stream/base/toolbar/layout/_toolbar.css.sass

@@ -1,4 +1,9 @@
-#toolbar 
+#toolbar
+  h5
+    position: relative
+    margin-top: 7px
+    margin-bottom: 16px
+
   .contact-button
     .btn-group
       width: 100%
@@ -9,7 +14,7 @@
         .caret 
           margin-left: 14px
 
-
+ 
   .icon_navbar-message-blue,
   .icon_tool16-info
     margin-right: 4px
@@ -61,11 +66,12 @@
   .logo_home
 
     .subject-name
-      @include ellipsis
       @extend .hidden-phone
     .subject-name-phone
-      @include ellipsis
       display: none
+      position: relative
+      margin-top: 7px
+      margin-bottom: 16px
       @extend .visible-phone
 
    
@@ -89,4 +95,11 @@
     img,
     .icon_navbar-message-blue,
     .icon_tool16-info
-      margin-right: 4px
+      margin-right: 4px
+
+.toolbar-profile
+  .toolbar_menu
+    ul
+      li
+        padding: 4px 7px
+        margin-bottom: 5px