social_stream-base 2.0.4 → 2.1.0

data/app/views/permissions/_list.html.erb

@@ -0,0 +1,10 @@
+<ul>
+  <% relation.available_permissions.each do |p| %>
+    <li>
+    <%= check_box_tag 'relation_custom[permission_ids][]', p.id, relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ relation.id }_permission_#{ p.id }" %>
+    <%= label_tag "checkbox_relation_#{ relation.id }_permission_#{ p.id }",
+                  p.title(subject: current_subject),
+                  title: p.description(subject: current_subject, state: (relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: relation.name) %>
+    </li>
+  <% end %>
+</ul>

data/app/views/permissions/index.js.erb

@@ -1,15 +1 @@
-$('#permissions').html("<%= escape_javascript render(:partial => 'index') %>");
-
-<% default_permissions.each do |p| %>
-  <% if @relation.permission_ids.include? p.id %>
-    $('#<%= dom_id p %>').attr('checked', 'checked');
-  <% else %>
-    $('label[for="relation_custom_permission_ids_' + <%= p.id %> + '"]').parent().hide();
-  <% end %>
-<% end %>
-
-$('#permissions_list input.permission').change(function(){
-  selectPermission(this);
-});
-
-$('#permissions').show();
+$('#permissions').html("<%= escape_javascript render(partial: 'index') %>");

data/app/views/posts/create.js.erb

@@ -1,9 +1,10 @@
 <% if @post.valid? %>
   //Display the new post
-  $(".timeline").prepend("<%= escape_javascript(render @post.post_activity) %>");
+  $(".timeline").prepend("<%= escape_javascript render(@post.post_activity) %>");
 
-  SocialStream.Timeline.create("<%= escape_javascript dom_id(@post.post_activity) %>");
+  SocialStream.Timeline.update("<%= escape_javascript dom_id(@post.post_activity) %>");
+  SocialStream.Wall.new_();
 <% else %>
-  SocialStream.Timeline.create();
-  alert('<%= j @post.errors.full_messages.to_sentence %>');
+  SocialStream.Flash.error('<%= j @post.errors.full_messages.to_sentence %>');
+  SocialStream.Wall.new_();
 <% end %>

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

@@ -71,7 +71,7 @@
       <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
         <h6>
           <span class="required">*</span>
-          <%= f.label t('*actor.name') %>
+          <%= f.label t('actor.name') %>
         </h6>
 
         <%= f.text_field :name, :class => "required" %>
@@ -105,7 +105,7 @@
         <p>
           <%= t('required') %>
         </p>
-        <%= f.submit :class => "btn" %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   </div>

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

@@ -1,27 +1,2 @@
-<%= div_for custom do %>
-  <%= radio_button_tag :relation_custom,
-    custom.id,
-    false,
-    :id => "input_#{ dom_id custom }" %>
-  <%= label_tag "input_#{ dom_id custom }", custom.name %>
-
-  <div class="actions">
-    <%= link_to '#', class: "edit" do %>
-      <i class="icon_tool16-edit"></i>
-    <% end %>
-
-    <%= link_to custom, class: "delete", method: :delete, confirm: t('relation_custom.confirm_delete'), remote: true do %>
-      <i class="icon_tool16-trash"></i>
-    <% end %>
-  </div>
-
-  <div class="edit_name">
-    <%= form_for custom, url: polymorphic_path(custom, section: 'name'), :remote => true do |f| %>
-      <%= f.text_field :name %>
-
-      <%= link_to '#', class: "submit" do %>
-        <i class="icon_tool16-ok"></i>
-      <% end %>
-    <% end %>
-  </div>
-<% end %>
+<%= render partial: 'relations/relation',
+           object:  custom %>

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

@@ -1,4 +1,4 @@
-<% @custom ||= Relation::Custom.new(:actor_id => current_subject.actor_id) %>
+<% @custom ||= Relation::Custom.new(actor_id: subject.actor_id) %>
 
 <%= form_for @custom, :remote => true do |f| %>
   <%= f.hidden_field :actor_id %>

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

@@ -1,5 +1,5 @@
 <%= render partial: 'relation/customs/list',
-           object:  list %>
+           locals:  { subject: subject } %>
 
 <div id="permissions">
   <div class="postit rotate">

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

@@ -3,12 +3,13 @@
     <%= t 'relation_custom.list.title' %>
   </h4>
 
-  <%= render partial: 'relation/customs/custom',
-             collection: list %>
+  <%= render partial: 'relations/relation',
+             collection: subject.relations_list %>
    
   <div id="new_relation">
-    <%= link_to t('relation_custom.new'), '#', class: 'new' %>
+    <%= link_to t('relation_custom.new'), 'javascript:void(0);', class: 'new' %>
 
-    <%= render :partial => 'relation/customs/form' %>
+    <%= render partial: 'relation/customs/form',
+               locals:  { subject: subject }%>
   </div> 
 </section>

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

@@ -7,6 +7,6 @@
     </h2>
 
     <%= render partial: 'relation/customs/index',
-               locals: { list: @customs } %>
+               locals: { subject: current_subject } %>
   </section> 
 </section> 

data/app/views/relations/_relation.html.erb

@@ -0,0 +1,33 @@
+<%= div_for relation do %>
+  <%= radio_button_tag :relation,
+    relation.id,
+    false,
+    :id => "input_#{ dom_id relation }" %>
+  <%= label_tag "input_#{ dom_id relation }", relation.name %>
+
+  <div class="actions">
+    <% if can? :edit, relation %>
+      <%= link_to 'javascript:void(0);', class: "edit" do %>
+        <i class="icon_tool16-edit"></i>
+      <% end %>
+    <% end %>
+
+    <% if can? :delete, relation %>
+      <%= link_to relation, class: "delete", method: :delete, confirm: t('relation_custom.confirm_delete'), remote: true do %>
+        <i class="icon_tool16-trash"></i>
+      <% end %>
+    <% end %>
+  </div>
+
+  <% if can? :edit, relation %>
+    <div class="edit_name">
+      <%= form_for relation, url: polymorphic_path(relation, section: 'name'), :remote => true do |f| %>
+        <%= f.text_field :name %>
+
+        <%= link_to '#', class: "submit" do %>
+          <i class="icon_tool16-ok"></i>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/config/locales/en.yml

@@ -65,6 +65,7 @@ en:
         other: '%{count} groups'
     sending: Sending
     share: Share
+    share_loading: Sharing...
     stream:
       atom_title: Activity Stream from %{subject}
       title:
@@ -175,7 +176,7 @@ en:
         zero: Add
         one: '%{count} role'
         other: '%{count} roles'
-      link: + Add contact
+      link: Add contact
       title: Add %{name} to your contacts
       menu: Add contact
       submit: Add Contact
@@ -224,7 +225,8 @@ en:
     passwords:
       confirm: Confirm password
       forgot: Forgot your password?
-      instructions: 'Enter your email address and we will send you instructions to change it:'
+      instructions: 'Enter your email address and we will send you instructions to
+        change it:'
       update: Change your password
   dropdown:
     notifications: Notifications
@@ -266,7 +268,8 @@ en:
       other: '%{count} followers'
   forgot_password: Forgot you password?
   frontpage:
-    main_title: Social Stream, a framework for building distributed social network websites.
+    main_title: Social Stream, a framework for building distributed social network
+      websites.
     presentation:
       modular:
         header: Modular
@@ -507,8 +510,8 @@ en:
             nil:
               positive: Activities of the contacts at %{relation} WILL APPEAR in your
                 home wall
-              negative: Activities of the contacts at %{relation} WILL APPEAR in your
-                home wall
+              negative: Activities of the contacts at %{relation} WILL NOT APPEAR
+                in your home wall
           read:
             activity:
               positive: They WILL BE ABLE to read posts in your wall, except those
@@ -540,6 +543,8 @@ en:
       title: Roles
     new: + New role
     title: Privacy
+  relation_manager:
+    name: Manager
   relation_public:
     name: Public
   repository:

data/config/locales/es.yml

@@ -65,6 +65,7 @@ es:
         other: '%{count} grupos'
     sending: Enviando
     share: Compartir
+    share_loading: Compartiendo...
     stream:
       atom_title: Actividades de %{subject}
       title:
@@ -286,6 +287,8 @@ es:
           si te encuentras con problemas. <a href="https://github.com/ging/social_stream/issues/new">Abre
           un reporte</a> si encutras algún fallo. ¡Los pull request son muy bienvenidos!
     stats: '%{users} personas and %{groups} grupos registrados'
+    main_title: Social Stream, a framework for building distributed social network
+      websites.
   group:
     one: grupo
     other: grupos
@@ -502,8 +505,10 @@ es:
         detailed:
           create:
             activity:
-              positive: Los contactos en %{relation} PODRÁN publicar actividades en vuestro muro
-              negative: Los contactos en %{relation} NO PODRÁN publicar actividades en vuestro muro
+              positive: Los contactos en %{relation} PODRÁN publicar actividades en
+                vuestro muro
+              negative: Los contactos en %{relation} NO PODRÁN publicar actividades
+                en vuestro muro
           follow:
             nil:
               positive: Las actividades de los contactos en %{relation} APARECERÁN
@@ -512,49 +517,21 @@ es:
                 en vuestra página de inicio
           read:
             activity:
-              positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en vuestro muro,
-                salvo las que compartáis solo con otros roles
-              negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en vuestro
-                muro, salvo las que marques como públicas
+              positive: Los contactos en %{relation} PODRÁN leer las publicaciones
+                que aparezcan en vuestro muro, salvo las que compartáis solo con otros
+                roles
+              negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones
+                que aparezcan en vuestro muro, salvo las que marques como públicas
           represent:
             nil:
-              positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en nombre de %{name}
-              negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en nombre de %{name}
+              positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar
+                en nombre de %{name}
+              negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para
+                actuar en nombre de %{name}
           notify:
             nil:
               positive: Las actividades SE NOTIFICARÁN a los contactos en %{relation}
               negative: Las actividades NO SE NOTIFICARÁN a los contactos en %{relation}
-      user: 
-        brief:
-          create:
-            activity: Publicar en tu muro
-          read:
-            activity: Leer tu muro
-          represent:
-            nil: Administrarte
-          notify:
-            nil: Notificarles
-        detailed:
-          create:
-            activity:
-              positive: Los contactos en %{relation} PODRÁN publicar actividades en tu muro
-              negative: Los contactos en %{relation} NO PODRÁN publicar actividades en tu muro
-          follow:
-            nil:
-              positive: Las actividades de los contactos en %{relation} APARECERÁN
-                en tu página de inicio
-              negative: Las actividades de los contactos en %{relation} NO APARECERÁN
-                en tu página de inicio
-          read:
-            activity:
-              positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en tu muro,
-                salvo las que compartáis solo con otros roles
-              negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en tu
-                muro, salvo las que marques como públicas
-          represent:
-            nil:
-              positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en tu nombre
-              negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en tu nombre
     of_relation:
       choose: Permisos para <strong>%{name}</strong>
     postit: Gestiona los permisos de tus contactos y crea nuevos roles
@@ -572,6 +549,8 @@ es:
       title: Roles
     new: + Nuevo rol
     title: Privacidad
+  relation_manager:
+    name: Admin
   relation_public:
     name: Público
   repository:
@@ -643,7 +622,8 @@ es:
   sign_up: Registrarse
   site:
     current:
-      description: Un marco para construir para construir webs con características de red social distribuída
+      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

data/config/locales/pt.yml

@@ -103,6 +103,7 @@ pt:
         make-friend: '%{author} also added %{activity_object} as contact'
         post: '%{author} posted %{activity_object}'
         updated: '%{author} posted %{activity_object}'
+    share_loading: Sharing...
   browse: Browse
   button:
     cancel: Cancelar
@@ -237,6 +238,8 @@ pt:
           Stream's Google group</a> or <a href="http://stackoverflow.com/questions/tagged/social-stream">StackOverflow</a>
           if you have problems. <a href="https://github.com/ging/social_stream/issues/new">Open
           an issue</a> if you find a defect. Pull request are very welcomed!
+    main_title: Social Stream, a framework for building distributed social network
+      websites.
   group:
     one: Grupo
     other: Grupos
@@ -634,4 +637,5 @@ pt:
       keywords: social stream,social software,framework,ruby on rails
       title: Social Stream
     name: Social Stream
-
+  relation_manager:
+    name: Manager

data/config/locales/zh.yml

@@ -57,8 +57,8 @@ zh:
           group: 所有成员All members
           user: 您的联系人Your contacts
         outside:
-          group: 来自%{receiver}的成员Members of 
-          user: 来自%{receiver}的联系人Contacts of 
+          group: 来自%{receiver}的成员Members of
+          user: 来自%{receiver}的联系人Contacts of
       relation:
         one: '%{count} 小组group'
         other: '%{count} 多个小组groups'
@@ -102,6 +102,7 @@ zh:
       join:
         one: '%{sender} 加入了joined the %{title} %{thing}.'
     share: 分享Share
+    share_loading: Sharing...
   activity_action:
     follow: 关注
     sentence:
@@ -229,19 +230,23 @@ zh:
     presentation:
       modular:
         header: 模块Modular
-        p: 可用的Available <a href="https://github.com/ging/social_stream#social-stream-components">Social Stream配件Social
-          Stream components</a> 只为您提供您社交网络所需要的功能。只需添加您喜欢的Gems到您的Gemfile.provide your application only with the features you
-          need in your social network. Just add your desired gems to your Gemfile
+        p: 可用的Available <a href="https://github.com/ging/social_stream#social-stream-components">Social
+          Stream配件Social Stream components</a> 只为您提供您社交网络所需要的功能。只需添加您喜欢的Gems到您的Gemfile.provide
+          your application only with the features you need in your social network.
+          Just add your desired gems to your Gemfile
       flexible:
         header: 灵活灵便Flexible
-        p: 完全地个性化定制您的社交网络Completely customize your social network <a href="https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales">更改任何一个Scial Stream组建changing
-          any Social Stream component</a>, <a href="https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects">添加新的活动对象adding
+        p: 完全地个性化定制您的社交网络Completely customize your social network <a href="https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales">更改任何一个Scial
+          Stream组建changing any Social Stream component</a>, <a href="https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects">添加新的活动对象adding
           new activity objects</a> 或者使用CSS更改Sass.or changing the CSS using <a href="http://sass-lang.com/">Sass</a>
       community:
         header: 社区Community
         p: Social Stream的开发者社区正在茁壮成长。如果您有什么问题，可以在<a href="http://groups.google.com/group/social-stream">Social
           Stream's Google group</a> 或者 <a href="http://stackoverflow.com/questions/tagged/social-stream">StackOverflow</a>给我们留言。
-          如果您发现有缺陷<a href="https://github.com/ging/social_stream/issues/new">提交一个问题</a>. 随时欢迎各种请求Pull request are very welcomed!
+          如果您发现有缺陷<a href="https://github.com/ging/social_stream/issues/new">提交一个问题</a>.
+          随时欢迎各种请求Pull request are very welcomed!
+    main_title: Social Stream, a framework for building distributed social network
+      websites.
   group:
     one: 群组
     other: 群组
@@ -468,7 +473,8 @@ zh:
               negative: 活动将不会通知 %{name} 的联系
     of_relation:
       choose: 2. <strong>%{name}</strong>圈內的权限
-    postit: 管理您联系人的权限和创建新的关系Manage the permissions of your contacts and create new roles
+    postit: 管理您联系人的权限和创建新的关系Manage the permissions of your contacts and create new
+      roles
   privacy:
     intro: '拥有 <strong>%{relation}</strong>级别的联系只容许作出以下行为:'
     rule:
@@ -623,3 +629,5 @@ zh:
       by: 排序Order by
       last_modified: 最近更新Last modified
       most_popular: 最流行Most popular
+  relation_manager:
+    name: Manager

data/lib/generators/social_stream/base/install_generator.rb

@@ -23,10 +23,6 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'initializer.rb', 'config/initializers/social_stream.rb'
   end
 
-  def create_config_relations_file
-    copy_file 'relations.yml', 'config/relations.yml'
-  end
-
   def create_config_sphinx_file
     copy_file 'sphinx.yml', 'config/sphinx.yml'
   end

data/lib/generators/social_stream/base/templates/initializer.rb

@@ -20,6 +20,30 @@ SocialStream.setup do |config|
   #
   # config.relation_model = :custom
 
+  # Config the default relations that will be created and customized by actors
+  # config.custom_relations = {
+  #  user: {
+  #    friend: {
+  #      name: "friend",
+  #      permissions: [
+  #        [ 'follow' ],
+  #        [ 'create',  'activity' ],
+  #        [ 'read',    'activity' ]
+  #      ]
+  #    },
+  #  group: {
+  #    member: {
+  #      name: "member",
+  #      permissions: [
+  #        [ 'represent' ],
+  #        [ 'create', 'activity' ],
+  #        [ 'read',   'activity' ],
+  #        [ 'read',   'tie' ]
+  #      ]
+  #    },
+  #  'site/current' => {}
+  # }
+
   # Configure the type of actors that are suggested in the sidebar
   #
   # config.suggested_models = [ :user, :group ]