social_stream 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1cc6d62a122d099dba6c5743271633208a5e07
-  data.tar.gz: b2acfe7e532951befbccc464524e07427cdf0702
+  metadata.gz: f0db077c1e603d3899591dea35f043c8aa3d91df
+  data.tar.gz: 0c2b036ffe855298d2a8ebbdc75e6a5534f38459
 SHA512:
-  metadata.gz: 00e5e5daf756380879d06155fa693fa4eefac5419e83500d7b465bc3dd66e7c5c14211a0a614523be82f44188bc368aafe9e39a5ae01dbd42d16badf5a6f19ae
-  data.tar.gz: fd69a6a5d90fef0ab82d36a5c52b22d4abf5d15a1eea124da2f62791bbd251a451d803a19f61a5a3e99f31e8fc4fe78f1178da72232638cdf12f292962deb88f
+  metadata.gz: efba25852f05c3076943c393eaffbae7891aff2db73f40c4c25a5cae8cb3d37d40373be95bb056437392e458ca1d293f91918d7bb519b3023c60aecb3a73b8bc
+  data.tar.gz: 06b33c37329c16de1d5fd01ad27516beb74a19f5ccf207db288503cf0b4f2dce2256db8708e68f779141fc1152ece372ab6d7c2f8072459ebaf3755048ad69cc

data/base/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/base/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/base/app/assets/stylesheets/social_stream-base.css.sass

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

data/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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: 您肯定吗?