social_stream-base 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd89df7e42fd7901d1d336d47e00ea72d41ef925
-  data.tar.gz: 6592c04a04bbe762b083916784660eb2c42ff851
+  metadata.gz: 2119bb019a0c4d4c11bf902e194e29e5f1274576
+  data.tar.gz: 76e260d1d53acbcf459fe95c1569b54ef9af4a3e
 SHA512:
-  metadata.gz: 3033534f08f9cd002c68034f78e3429a33a3fa9a58db059ba7a3b644d249cc4c627f741b483e85a0e12af657bf17de878500e012e1428d21eeef81207c62b750
-  data.tar.gz: 748c0a830f3fd30088dc402812b7fe38214e3836faec2177e253964554a25a25c593f998cf51feb2d4b05fce9eeda774d0def1dfcf2c6f93378a05e331ec9d86
+  metadata.gz: 68ae64af17f88595cad7ce80f1bc657a9d3b75750e38a63a55780efb1c4ff41e866471dd1dbbe635a29bf581c0bac7860d35adc49d2d5a01f1c8e95986057bb3
+  data.tar.gz: 9edc2c246fbc02b66f59926f878134d9da6900b97b1c13ec46d7c73db9a22dc3dd11323ce8835ff877e30b42cc9ebef916327ced09ed03d22e5066ef07fb5099

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

@@ -4,6 +4,7 @@
 //= require modernizr
 //= require bootstrap
 //= require bootstrap-multiselect
+//= require bootstrap-scroll-modal
 //= require i18n
 //= require i18n/translations
 //= require flashy

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

@@ -1,9 +1,10 @@
 //= require social_stream/callback
+
 SocialStream.RelationCustom = (function(SS, $, undefined){
   var callback = new SS.Callback();
 
   var getListEl = function() {
-    return $('#relation_customs .relation_list');
+    return $('.relation_list');
   };
 
   var getPermissionsPath = function() {

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

@@ -4,6 +4,7 @@
 
 @import "bootstrap"
 @import "bootstrap-responsive"
+@import "bootstrap-scroll-modal"
 
 
 

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

@@ -23,8 +23,5 @@ textarea
     img
       @include border-radius(4px)
 
-#fdbk_tab
-  background-color: $principalColor !important
 
-.jcrop-tracker
-  background-color: rgba(255, 255, 255, .2)
+  

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

@@ -52,6 +52,8 @@ input#group_name
           width: 175px
           display: inline-block
           margin-top: 11px
+          .name
+            @include ellipsis
         .info
           @include ellipsis
           z-index: 1

data/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass

@@ -1,5 +1,6 @@
 #frontpage,
 #new_session
+  clear: both
 
   .explanation
     background-color: rgba(255, 255, 255, 0.8)

data/app/assets/stylesheets/social_stream/base/logo/_logo-in.css

@@ -1,10 +1,11 @@
 .logo-header-in .cube {
   position:relative;
-  left: -38px;
+  left: -44px;
+  margin-top: 7px;
   z-index: 2;
   float: left;
-    -webkit-transform: rotate(10deg);
-    -moz-transform: rotate(10deg);
+    -webkit-transform: rotate(6deg);
+    -moz-transform: rotate(6deg);
 }
 
 .logo-header-in .cube:hover {
@@ -12,20 +13,20 @@
   -moz-animation: float 2s infinite ease-in-out;
   -o-animation: float 2s infinite ease-in-out;
   animation: float 2s infinite ease-in-out;
-  -webkit-transform: rotate(10deg);
-  -moz-transform: rotate(10deg);
+
+  margin-top: 4px;
 }
 
 @-webkit-keyframes float {
   0% {
-    -webkit-transform: translate(0px, 3px);
+    -webkit-transform: translate(0px, 2px);
   }
   50% {
     -webkit-transform: translate(0px, 0px);
     
   }
   100% {
-    -webkit-transform: translate(0px, 3px);
+    -webkit-transform: translate(0px, 2px);
   }
 }
 

data/app/assets/stylesheets/social_stream/base/modals/layout/_modals.css.sass

@@ -32,4 +32,7 @@
     padding-bottom: 50px
   .select2-container-multi 
     .select2-choices
-      @include gradient-directional($startColor: #f9f9f9, $endColor: #f1f1f1, $deg: 45deg)
+      @include gradient-directional($startColor: #f9f9f9, $endColor: #f1f1f1, $deg: 45deg)
+.modal-wrapper 
+  .modal
+    min-height: 600px

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

@@ -32,13 +32,15 @@
         @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
         background-color: $white
         margin-left: 0px
-        padding: 12px 0px 3px 0px !important
+        padding: 12px 0px 32px 0px !important
         form.edit_profile
           padding: 0 14px
           input
             &[type="submit"]
+              @include btn-primary
+              @include border-radius(5px)
               float: right
-              margin-top: -10px
+              margin-top: 10px
               margin-right: 9px
       
 
@@ -99,14 +101,13 @@
   .update
     .jcrop-holder
       width: 100% !important
+      background: $black 
       div 
         img
-          max-width: 90%
-          max-height: 90%
           margin: 0 auto
           position: relative
         div 
-          img
-            visibility: hidden !important
+          overflow: hidden
+          
 
 

data/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass

@@ -64,12 +64,20 @@
     .new_document
       display: inline
       padding: 1px 6px 4px 6px
-    .form-privacy
-      display: inline-block
-      @include btn-add
-      .btn-group
-        button
-          padding: 4px 12px 4px 8px
+
+.form-privacy
+  display: inline-block
+  @include btn-add
+  .btn-group
+    button
+      padding: 4px 12px 4px 8px
+    label
+      font-size: 14px
+      font-weight: bold
+      letter-spacing: 1px
+      line-height: 20px
+      color: #333
+
       
 
 #post_text

data/app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass

@@ -38,13 +38,10 @@
       display: inline-block
       .dropdown-menu
         li
-          margin-left: 0px
-          padding-left: 7px
           a
             padding: 0px !important
             label
-              margin-left: 0px
-              padding: 0px 16px 0px 0px!important
+              margin-left: 7px
               &:hover
                 background: $principalColor
                 color: $auxiliarColor

data/app/views/layouts/_header_dropdown_menu.html.erb

@@ -7,16 +7,16 @@
   <ul class="dropdown-menu">
     <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
 
-    <li>
+    <li class="notifications-menu">
       <%= link_to t('dropdown.notifications'), notifications_path, :id => "btn_menu_settings" %>
     </li>
 
-    <li>
+    <li class="settings-menu">
       <%= link_to t('dropdown.settings'), settings_path, :id => "btn_menu_settings" %>
     </li>
 
     <% if SocialStream.relation_model == :custom %>
-      <li>
+      <li  class="privacity-menu">
         <%= link_to t('dropdown.privacy'), relation_customs_path %>
       </li>
     <% end %>

data/app/views/layouts/application.html.erb

@@ -3,9 +3,9 @@
 <html lang="<%= I18n.locale.to_s %>">
   <head>
     <meta charset="utf-8">
-    <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
-    <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
-    <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
+    <title><%= content_for?(:title) ? yield(:title) : t('site.current.title') %></title>
+    <meta name="keywords" content="<%= content_for?(:keywords) ? yield(:keywords) : t('site.current.keywords') %>" >
+    <meta name="description" content= "<%= content_for?(:description) ? yield(:description) : t('site.current.description') %>" >
     <meta name="generator" content="Social Stream" />
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
 

data/app/views/profiles/_personal.html.erb

@@ -7,6 +7,15 @@
   </header>
   <div class="briefing">
     <% if @profile.personal_present? %>
+      <% if @profile.description? %>
+        <h5>
+          <%= t("profile.#{ @profile.subject.class.to_s.downcase }.about") %>:
+        </h5>
+
+        <%= simple_format @profile.description %>
+      <% end %>
+
+
       <% if @profile.organization? %>
         <h5>
           <%= t('profile.organization') %>
@@ -50,13 +59,7 @@
         </p>       
       <% end %>
 
-      <% if @profile.description? %>
-        <h5>
-          <%= t("profile.#{ @profile.subject.class.to_s.downcase }.about") %>:
-        </h5>
-
-        <%= simple_format @profile.description %>
-      <% end %>
+      
 
     <% else %>
       <%= render partial: 'empty' %>
@@ -72,6 +75,12 @@
         </h6>
 
         <%= f.text_field :name, :class => "required" %>
+        
+        <h6>
+          <%= f.label :description, t("profile.#{ current_subject.class.to_s.downcase }.about") %>
+        </h6>
+
+        <%= f.text_area :description, :maxlength => 200, :rows => 10 %>
 
         <h6>
           <%= f.label :organization, t('profile.organization') %>
@@ -93,9 +102,6 @@
 
         <%= f.text_field :country %>
 
-        <%= f.label :description, t("profile.#{ current_subject.class.to_s.downcase }.about") %>
-
-        <%= f.text_area :description, :maxlength => 200, :rows => 10 %>
         <p>
           <%= t('required') %>
         </p>

data/app/views/profiles/_tags.html.erb

@@ -16,7 +16,7 @@
     <div class="update">
       <%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
         <%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
-        <%= f.submit :class => "btn" %>
+        <%= f.submit %>
       <% end %>
     </div>
   <% end %>

data/app/views/relation/customs/_index.html.erb

@@ -0,0 +1,18 @@
+<%= render partial: 'relation/customs/list',
+           object:  list %>
+
+<div id="permissions">
+  <div class="postit rotate">
+    <span class="rotate-int">
+      <%= t 'permission.postit' %>
+    </span>
+  </div>
+  <%= render partial: 'layouts/loading' %>
+</div>
+
+<%= javascript_tag do %>
+  $(function() {
+    SocialStream.RelationCustom.index();
+  })
+<% end %>
+

data/app/views/relation/customs/_list.html.erb

@@ -3,7 +3,8 @@
     <%= t 'relation_custom.list.title' %>
   </h4>
 
-  <%= render list %>
+  <%= render partial: 'relation/customs/custom',
+             collection: list %>
    
   <div id="new_relation">
     <%= link_to t('relation_custom.new'), '#', class: 'new' %>

data/app/views/relation/customs/index.html.erb

@@ -6,21 +6,7 @@
       <%= t 'relation_custom.title' %>
     </h2>
 
-      <%= render :partial => 'relation/customs/list', :object => @customs %>
-
-      <div id="permissions">
-        <div class="postit rotate">
-          <span class="rotate-int">
-            <%= t 'permission.postit' %>
-          </span>
-        </div>
-        <%= render partial: 'layouts/loading' %>
-      </div>
-
-      <%= javascript_tag do %>
-        $(function() {
-          SocialStream.RelationCustom.index();
-        })
-      <% end %>
+    <%= render partial: 'relation/customs/index',
+               locals: { list: @customs } %>
   </section> 
 </section> 

data/config/locales/en.yml

@@ -266,7 +266,7 @@ en:
       other: '%{count} followers'
   forgot_password: Forgot you password?
   frontpage:
-    main_title: Social Stream, the core for building distributed social network websites.
+    main_title: Social Stream, a framework for building distributed social network websites.
     presentation:
       modular:
         header: Modular
@@ -610,6 +610,10 @@ en:
   sign_out: Sign out
   sign_up: Sign up
   site:
+    current:
+      description: A framework for building distributed social network websites
+      keywords: social stream,social software,framework,ruby on rails
+      title: Social Stream
     name: Social Stream
   subject:
     this_is_you: This is you!

data/config/locales/es.yml

@@ -267,8 +267,6 @@ es:
       other: '%{count} seguidores'
   forgot_password: ¿Olvidaste tu contraseña?
   frontpage:
-    main_title: Social Stream, el núcleo para construir webs con características de
-      red social distribuída
     presentation:
       modular:
         header: Modular
@@ -644,6 +642,10 @@ es:
   sign_out: Salir
   sign_up: Registrarse
   site:
+    current:
+      description: Un marco para construir para construir webs con características de red social distribuída
+      keywords: social stream,social software,framework,ruby on rails
+      title: Social Stream
     name: Social Stream
   subject:
     this_is_you: ¡Eres tú!

data/config/locales/pt.yml

@@ -218,7 +218,6 @@ pt:
       title: Followings
   forgot_password: Esqueceu sua senha?
   frontpage:
-    main_title: Social Stream é a base para a construção de sites de rede social.
     stats: '%{users} usuários e %{groups} grupos registrados'
     presentation:
       modular:
@@ -546,8 +545,6 @@ pt:
   sign_in: Entrar
   sign_out: Sair
   sign_up: Cadastrar-se
-  site:
-    name: Social Stream
   subject:
     this_is_you: Este é você!
   sure: Você tem certeza?
@@ -631,3 +628,10 @@ pt:
       by: Order by
       last_modified: Last modified
       most_popular: Most popular
+  site:
+    current:
+      description: A base para a construção de sites de rede social.
+      keywords: social stream,social software,framework,ruby on rails
+      title: Social Stream
+    name: Social Stream
+

data/config/locales/zh.yml

@@ -225,7 +225,6 @@ zh:
       other: '%{count} 粉丝'
   forgot_password: 忘了您的密码吗?
   frontpage:
-    main_title: 社交视频互动是我们建立社交网的核心.
     stats: '%{users} 用户 和 %{groups} 已注册的群组'
     presentation:
       modular:
@@ -546,7 +545,11 @@ zh:
   sign_out: 退出
   sign_up: 注册
   site:
-    name: Gocess.com
+    current:
+      description: 社交视频互动是我们建立社交网的核心.
+      keywords: social stream,social software,framework,ruby on rails
+      title: Social Stream
+    name: Social Stream
   subject:
     this_is_you: 这是您!
   sure: 您肯定吗?

data/lib/inherited_resources/social_stream.rb

@@ -1,23 +1,20 @@
 # Monkey path inherited_resources
 #
-#
-# Pull request https://github.com/josevalim/inherited_resources/pull/237
+# Patch is already accepted in master
+# Remove with inherited_resources > 1.4.0
 module InheritedResources::BaseHelpers
   private
 
-  def resource_params
-    @resource_params ||=
-      build_resource_params
-  end
-
+  # extract attributes from params
   def build_resource_params
-    rparams = [whitelisted_params || params[resource_request_name] || params[resource_instance_name] || {}]
-    rparams << as_role if role_given?
-    rparams
-  end
+    parameters = respond_to?(:permitted_params, true) ? permitted_params : params
+    rparams = [parameters[resource_request_name] || parameters[resource_instance_name] || {}]
+    if without_protection_given?
+      rparams << without_protection
+    else
+      rparams << as_role if role_given?
+    end
 
-  def whitelisted_params
-    whitelist_method = :"#{ resource_request_name }_params"
-    respond_to?(whitelist_method, true) && self.send(whitelist_method)
+    rparams
   end
 end

data/lib/social_stream/base/engine.rb

@@ -61,7 +61,7 @@ module SocialStream
 
         # Load Relation::Public, so it is registered as descendant of Relation::Single
         # and used in ActivityObject#allowed_relations
-        Relation::Public
+        ::Relation::Public
       end
     end
   end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.3".freeze
+    VERSION = "2.0.4".freeze
   end
 end

data/lib/social_stream/controllers/objects.rb

@@ -49,10 +49,8 @@ module SocialStream
         
         protected
 
-        def whitelisted_params
-          return {} if request.present? and request.get?
-
-          params.require(self.class.model_class.to_s.underscore.to_sym).permit( *all_allowed_params )
+        def permitted_params
+          params.permit(self.class.model_class.to_s.underscore.to_sym => all_allowed_params)
         end
 
         private

data/social_stream-base.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
   # Authentication
   s.add_runtime_dependency('devise', '~> 2.2.3')
   # CRUD controllers
-  s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
+  s.add_runtime_dependency('inherited_resources', '~> 1.4.0')
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.0')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.1')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
   # jQuery UI

data/vendor/assets/javascripts/bootstrap-modal.js

@@ -0,0 +1 @@
+// Overwrite Bootstrap modal, which is replaced with bootstrap-scroll-modal

data/vendor/assets/javascripts/bootstrap-scroll-modal.js

@@ -0,0 +1,276 @@
+/*!
+ * Bootstrap Scroll Modal
+ * Version: 1.2
+ * Made for your convenience by @theericanderson.
+ * A variaton of only small piece of the insanely awesome
+ * Twitter Bootstrap (http://twitter.github.com/bootstrap).
+ */
+
+/* =========================================================
+ * bootstrap-modal.js v2.2.1
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        if (this.options.dynamic) {
+          this.$elementWrapper = $('<div class="modal-wrapper" />').insertBefore(this.$element)
+          this.$element.prependTo(this.$elementWrapper)
+        }
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function ( e ) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function (that) {
+        this.$element
+          .hide()
+          .trigger('hidden')
+
+        if (this.options.dynamic) {
+          this.$element.insertAfter(this.$elementWrapper)
+          this.$elementWrapper.remove()
+          this.$elementWrapper = null
+        }
+
+        this.backdrop()
+      }
+
+    , removeBackdrop: function () {
+        this.$element.insertAfter(this.$backdrop)
+        this.$backdrop.remove()
+        this.$backdrop = null
+        $('body').css({ 'overflow' : '' })
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          // Below are Bootstrap Scroll Modal additions to the backdrop function.
+
+          if (!that.$element.parent().length) {
+            this.$backdrop.appendTo(document.body) // don't move modals dom position
+          } else if (this.options.dynamic) {
+            this.$backdrop.insertBefore(this.$elementWrapper)
+          } else {
+            this.$backdrop.insertBefore(this.$element)
+          }
+
+          if (this.options.dynamic) {
+            this.$elementWrapper.prependTo(this.$backdrop)
+              .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+          } else {
+            this.$element.prependTo(this.$backdrop)
+              .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+          }
+
+          $('body').css({ 'overflow' : 'hidden' })
+
+          this.$backdrop.on('click', function(e){
+            if (that.options.backdrop == 'static') {
+              $.proxy(that.$element[0].focus, that.$element[0])
+            } else if (e.target == e.delegateTarget) {
+              that.hide(e)
+            }
+          })
+
+          // end additions
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
+            this.removeBackdrop()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);

data/vendor/assets/stylesheets/bootstrap-scroll-modal.css

@@ -0,0 +1,70 @@
+/*!
+ * Bootstrap Scroll Modal
+ * Version: 1.2
+ * Made for your convenience by @theericanderson
+ * A variaton of but a small piece of the insanely awesome Twitter Bootstrap (http://twitter.github.com/bootstrap)
+ */
+
+.modal-backdrop {
+  overflow-x: hidden;
+  overflow-y: auto;
+  background-color: rgba(0, 0, 0, 0.8);
+}
+.modal-backdrop.fade {
+  background-color: rgba(0, 0, 0, 0.0);
+}
+.modal-backdrop.fade.in {
+  background: rgba(0, 0, 0, 0.8);
+}
+.modal-backdrop.in, .modal-backdrop.fade.in {
+  opacity: 1.0;
+  filter: alpha(opacity=100);
+}
+.modal-wrapper {
+  position: relative;
+  top: 50px;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  margin-bottom: 100px;
+  overflow: visible;
+}
+.modal-wrapper .modal {
+  position: static;
+  margin: 0;
+  z-index: 1060;
+}
+/* Some different styling for dynamic height modals */
+.modal-wrapper .modal .modal-body {
+  overflow-y: visible;
+  max-height: none;
+  z-index: 1060; /* IE8 fix for radio button focus / blur issue */
+}
+
+/* Styles to ensure Scroll Modal works on smaller browsers, specifically mobile. */
+@media (max-width: 767px) {
+  .modal-wrapper {
+      position: relative;
+      top: 50px;
+      left: 20%;
+      z-index: 1050;
+      width: 70%;
+      margin-left: 0px;
+      margin-bottom: 80px;
+      overflow: visible;
+  }
+}
+
+@media (max-width : 480px) {
+  .modal-wrapper {
+      position: relative;
+      top: 50px;
+      left: 10%;
+      z-index: 1050;
+      width: 80%;
+      margin-left: 0px;
+      margin-bottom: 80px;
+      overflow: visible;
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -998,6 +998,7 @@ files:
 - app/views/profiles/update.js.erb
 - app/views/relation/customs/_custom.html.erb
 - app/views/relation/customs/_form.html.erb
+- app/views/relation/customs/_index.html.erb
 - app/views/relation/customs/_list.html.erb
 - app/views/relation/customs/create.js.erb
 - app/views/relation/customs/destroy.js.erb
@@ -1196,7 +1197,9 @@ files:
 - spec/support/mock.rb
 - spec/views/profiles_spec.rb
 - spec/views/settings_spec.rb
+- vendor/assets/javascripts/bootstrap-modal.js
 - vendor/assets/javascripts/bootstrap-multiselect.js
+- vendor/assets/javascripts/bootstrap-scroll-modal.js
 - vendor/assets/javascripts/colorfont.js
 - vendor/assets/javascripts/d3.geom.js
 - vendor/assets/javascripts/d3.js
@@ -1216,6 +1219,7 @@ files:
 - vendor/assets/javascripts/jquery.validate.old.js
 - vendor/assets/javascripts/jquery.watermark.js
 - vendor/assets/javascripts/superfish.js
+- vendor/assets/stylesheets/bootstrap-scroll-modal.css
 - vendor/assets/stylesheets/carousel.css
 - vendor/assets/stylesheets/chosen-sprite.png
 - vendor/assets/stylesheets/chosen.css