social_stream 2.1.1 → 2.2.0

data/base/app/models/relation/follow.rb

@@ -1,8 +1,14 @@
 # This relation model implements Twitter-like relations:
 # Users just have followers and followings.
 #
-# Use this model setting <tt>config.relation_model = :follow</tt> in your
-# <tt>config/initializers/social_stream.rb</tt>
+# You can achieve a Twitter-like model for users
+# setting custom relations to empty and system relations to [ :follow ]
+# in config/initializers/social_stream.rb
+#
+#   config.custom_relations[:user] = {}
+#
+#   config.system_relations[:user] = [ :follow ]
+#
 class Relation::Follow < Relation::Single
   PERMISSIONS = 
     [

data/base/app/models/relation/owner.rb

@@ -0,0 +1,10 @@
+# Owner of {Group groups}
+class Relation::Owner < Relation::Single
+  PERMISSIONS = SocialStream.available_permissions['group']
+
+  class << self
+    def create_activity?
+      false
+    end
+  end
+end

data/base/app/models/relation/single.rb

@@ -14,15 +14,18 @@ class Relation::Single < Relation
     end
 
     def permissions
-      self::PERMISSIONS.map{ |p|
-        Permission.find_or_create_by_action_and_object p.first, p.last
-      }
+      Permission.instances self::PERMISSIONS
     end
-
   end
 
   # The name of public relation
   def name
     I18n.t("relation_#{ self.class.name.split("::").last.underscore }.name")
   end
+
+  # The available permissions for {Relation::Single} match with the permissions
+  # described in the variable
+  def available_permissions
+    self.class.permissions
+  end
 end

data/base/app/models/site.rb

@@ -9,7 +9,7 @@ class Site < ActiveRecord::Base
 
   class << self
     def current
-      Current.instance
+      ::Site::Current.instance
     end
   end
 end

data/base/app/models/tie.rb

@@ -69,7 +69,7 @@ class Tie < ActiveRecord::Base
 
   validates_presence_of :contact_id, :relation_id
 
-  validate :relation_belongs_to_sender
+  validate :relation_must_belong_to_sender
 
   after_create  :create_activity
   after_create  :set_follow_action
@@ -137,6 +137,11 @@ class Tie < ActiveRecord::Base
     action.update_attribute(:follow, false)
   end
 
+  def relation_belongs_to_sender?
+      relation.is_a?(Relation::Single) ||
+        contact.sender_id == relation.actor_id
+  end
+
   private
 
   # before_create callback
@@ -152,9 +157,8 @@ class Tie < ActiveRecord::Base
                      :activity_verb => ActivityVerb[contact.verb]
   end
 
-  def relation_belongs_to_sender
+  def relation_must_belong_to_sender
     errors.add(:relation, "must belong to sender") unless
-      relation.is_a?(Relation::Single) ||
-        contact.sender_id == relation.actor_id
+      relation_belongs_to_sender?
   end
 end

data/base/app/views/contacts/_add_button.html.erb

@@ -0,0 +1,9 @@
+<% if can? :create, Contact.new(sender: Actor.normalize(sender)) %>
+  <%= link_to t('site.client.contact.add'), '#add-contact-modal', id: 'add-contact-link', 'data-toggle' => 'modal' %>
+  <%= render partial: 'contacts/new_modal',
+             locals: {
+               sender: sender,
+               type: type
+             } %>
+<% end %>
+

data/base/app/views/contacts/_button.html.erb

@@ -1,3 +1,3 @@
-<%= form_for contact, remote: true, html: { 'data-contact_id' => contact.id } do |f| %>
-  <%= f.select :relation_ids, contact.options_for_select, {}, { multiple: true } %>
-<% end %>
+<%= render partial: "contacts/button_#{ contact.options_for_select_type }",
+           object:  contact,
+           as:      :contact %>

data/base/app/views/contacts/_button_multiple.html.erb

@@ -0,0 +1,4 @@
+<%= form_for contact, remote: true, html: { 'data-contact_id' => contact.id } do |f| %>
+  <%= f.select :relation_ids, contact.options_for_select, {}, { multiple: true } %>
+<% end %>
+

data/base/app/views/contacts/_button_simple.html.erb

@@ -0,0 +1,17 @@
+<div class="contact-button-single-<%= contact.id %>">
+  <% if contact.sent? %>
+    <div class="following-button">
+      <%= t 'contact.following' %>
+    </div>
+    <div class="unfollow-button">
+      <%= form_for contact, method: :delete, remote: true do |f| %>
+        <%= f.submit t('contact.unfollow') %>
+      <% end %>
+    </div>
+  <% else %>
+    <%= form_for contact, remote: true do |f| %>
+      <%= f.hidden_field :relation_ids, value: contact.options_for_select.first.last %>
+      <%= f.submit t('contact.follow') %>
+    <% end %>
+  <% end %>
+</div>

data/base/app/views/contacts/_new_modal.html.erb

@@ -0,0 +1,22 @@
+<div id="add-contact-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
+  <%= form_tag polymorphic_path([ sender, Contact.new ]) do %>
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      <h3><%= t 'contact.new.modal.title' %></h3>
+    </div>
+    <div class="modal-body">
+      <%= label_tag 'actors', t('actor.title.other') %>
+      <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(',') %>
+
+      <%= label_tag 'relations', t('activerecord.attributes.contact.relation_ids') %>
+      <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true %>
+    </div>
+    <div class="modal-footer">
+      <%= submit_tag t('contact.new.modal.button') %>
+    </div>
+  <% end %>
+
+  <%= javascript_tag do %>
+    SocialStream.Contact.new_();
+  <% end %>
+</div>

data/base/app/views/contacts/destroy.js.erb

@@ -1,7 +1,8 @@
 <% if @contact.errors.blank? %>
-SocialStream.Contact.destroy({
-  id: "<%= @contact.id %>"
-});
+  <% if @contact.options_for_select.count == 1 %>
+    $('.contact-button-single-<%= @contact.id %>').replaceWith("<%= j render(partial: 'contacts/button_simple', object: @contact, as: :contact) %>");
+  <% end %>
+  SocialStream.Contact.destroy({ id: "<%= @contact.id %>" });
 <% else %>
-SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
+  SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
 <% end %>

data/base/app/views/contacts/update.js.erb

@@ -1,7 +1,8 @@
 <% if @contact.errors.blank? %>
-SocialStream.Contact.update({
-  id: "<%= @contact.id %>"
-});
+  <% if @contact.options_for_select.count == 1 %>
+    $('.contact-button-single-<%= @contact.id %>').replaceWith("<%= j render(partial: 'contacts/button_simple', object: @contact.reload, as: :contact) %>");
+  <% end %>
+  SocialStream.Contact.update({ id: "<%= @contact.id %>" });
 <% else %>
-SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
+  SocialStream.Flash.error("<%= @contact.errors.full_messages.to_sentence %>");
 <% end %>

data/base/app/views/devise/confirmations/new.html.erb

@@ -1,14 +1,19 @@
 <section id="confirmation">
-  <h2>Resend confirmation instructions</h2>
+  <header>
+    <h2>Resend confirmation instructions</h2>
+  </header>
+  <section class="confirmation">
+    <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+      <%= devise_error_messages! %>
 
-  <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-    <%= devise_error_messages! %>
+      <div><%= f.label :email %><br />
+      <%= f.email_field :email, :autofocus => true %></div>
 
-    <div><%= f.label :email %><br />
-    <%= f.email_field :email, :autofocus => true %></div>
+      <div><%= f.submit "Resend confirmation instructions" %></div>
 
-    <div><%= f.submit "Resend confirmation instructions" %></div>
-  <% end %>
-
-  <%= render "devise/shared/links" %>
+      <hr class="soften">
+      
+      <%= render "devise/shared/links" %>
+    <% end %>
+  </section>
 </section>

data/base/app/views/frontpage/_presentation.html.erb

@@ -1,3 +1,3 @@
-<article id="presentation">
+<section id="presentation">
   <%= render partial: 'frontpage/presentation_default' %>
-</article>
+</section>

data/base/app/views/groups/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for group do |f| %>
+<%= form_for group, html: { class: 'ss_group_form' } do |f| %>
   <% if group.errors.any? %>
     <div class="error">
       <h2><%= pluralize(group.errors.count, "error") %> prohibited this group from being saved:</h2>
@@ -11,34 +11,34 @@
       </ul>
     </div>
   <% end %>
-<section>
-  <%= f.label :name, t('group.new.name') %>
-  <%= f.text_field :name %>
-</section>
-<section>
-  <%= f.label :_participants, t('group.new.participants') %>
-  <%= f.hidden_field :_participants, 'data-path' => contacts_path(format: :json) %>
-</section>
-<section>
-  <%= f.label :tags_list, t('group.tags')%>
-  <%= f.text_field :tag_list, 'data-path' => tags_path(format: :json) %>
-</section>
-<section>
-  <%= f.label :description %>
-  <%= f.text_area :description %>
-</section>
-  <%= f.submit :class => "btn" %>
+
+  <section class="name">
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </section>
+  <section class="owners">
+    <%= f.label :owners %>
+    <%= f.hidden_field :owners, 'data-path' => actors_path(format: :json) %>
+  </section>
+  <section class="tags">
+    <%= f.label :tags_list %>
+    <%= f.text_field :tag_list, 'data-path' => tags_path(format: :json) %>
+  </section>
+  <section class="description">
+    <%= f.label :description %>
+    <%= f.text_area :description %>
+  </section>
+    <%= f.submit :class => "btn" %>
 <% end %>
 
 <%= javascript_tag do %>
   $(function() {
     SocialStream.Group.new_(
       {
+        form: '.ss_group_form',
         validate: [
           {
-            form: ".new_group",
             errorClass: "validation_error"
-
           }
         ]
       }

data/base/app/views/groups/show.html.erb

@@ -1,17 +1,17 @@
 <% content_for :title do %>
-  <%= "#{ @group.name } | #{ t 'site.name' }" %>
+  <%= "#{ resource.name } | #{ t 'site.name' }" %>
 <% end %>
 
 <% content_for :description do %>
-  <% if @group.profile.description? %>
-    <%= @group.profile.description%>
+  <% if resource.profile.description? %>
+    <%= resource.profile.description%>
   <% else %>
-    <%= "#{ @group.name } #{ t 'profile.is_on' } #{ t 'site.name' }" %>
+    <%= "#{ resource.name } #{ t 'profile.is_on' } #{ t 'site.name' }" %>
   <% end %>
 <% end %>
 
 <% content_for :keywords do %>
-  <%= @group.profile.subject.tag_list%>
+  <%= resource.tag_list%>
 <% end %>
 
 <%= render :partial => 'show' %>

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

@@ -15,11 +15,9 @@
       <%= link_to t('dropdown.settings'), settings_path, :id => "btn_menu_settings" %>
     </li>
 
-    <% if SocialStream.relation_model == :custom %>
-      <li  class="privacity-menu">
-        <%= link_to t('dropdown.privacy'), relation_customs_path %>
-      </li>
-    <% end %>
+    <li class="privacy-menu">
+      <%= link_to t('dropdown.privacy'), relation_customs_path %>
+    </li>
 
     <li class="divider">
     </li>

data/base/app/views/layouts/_header_signed_in.erb

@@ -6,7 +6,7 @@
 
     
       <%= form_tag search_path, method: 'get', id: "search-box", class: "navbar-search pull-left search-mobile" do %>
-        <%= text_field_tag :q, nil, autocomplete: :off, class: "search-query input-small icon_tool16-searcher", placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
+        <%= text_field_tag :q, nil, autocomplete: :off, class: "search-query-mobile input-small icon_tool16-searcher", placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
       <% end %>
       <%= javascript_tag do %>
         $(function() {
@@ -16,7 +16,7 @@
 
   
     
-    <div class="search-nav hidden-phone">
+    <div class="search-nav hidden-phone hidden-tablet">
       <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
         <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
       <% end %>
@@ -50,7 +50,7 @@
      <ul class="nav pull-right">
       <li>
         <%= link_to current_subject do %>
-          <%= image_tag current_subject.logo.url(:small) %>
+          <%= image_tag current_subject.logo.url(:small), :class=>"user" %>
           <span class="name hidden-phone"><%= truncate_name(current_subject.name, length: 15) %></span>
         <% end %>
       </li>

data/base/app/views/layouts/_logo_in.html.erb

@@ -15,5 +15,5 @@
     <div class="shadow">
     </div>
   <% end %>
-  <%= link_to(image_tag('header-logo.png', class: "logo hidden-phone hidden-tablet", :alt => t('site.name')), root_path) %>
+  <%= link_to(image_tag('header-logo.png', class: "logo", :alt => t('site.name')), root_path) %>
 </div>

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

@@ -12,6 +12,8 @@
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>
 
+    <script>document.write('<script src="http://' + (location.host || '${1:localhost}').split(':')[0] + ':${2:35729}/livereload.js?snipver=1"></' + 'script>')</script>
+    
     <%= yield :headers %>
 
     <%= favicon_link_tag "icons/favicon.ico" %>

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

@@ -1,7 +1,7 @@
 <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 }" %>
+    <%= check_box_tag 'relation_custom[permission_ids][]', p.id, relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ relation.id }_permission_#{ p.id }", disabled: cannot?(:update, relation) %>
     <%= 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) %>

data/base/app/views/profiles/_avatar.html.erb

@@ -6,10 +6,6 @@
         <%= t('avatar.profile_change') %>
       </h4>
     </header>
-    <div class="update">
-      <%= render partial: 'avatars/form',
-                 object: @profile.actor,
-                 as: :avatarable %>
-    </div>
+    <%= render partial: 'avatar_edit' %>
   <% end %>
 </section>

data/base/app/views/profiles/_avatar_edit.html.erb

@@ -0,0 +1,5 @@
+<section class="avatar-edit">
+  <%= render  partial: 'avatars/form',
+              object: @profile.actor,
+              as: :avatarable %>
+</section>

data/base/app/views/profiles/_comunication-info.html.erb

@@ -58,41 +58,7 @@
  
   <% if can? :update, @profile %>
   <div class="update">
-
-    <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
-      <h6>
-        <%= f.label :phone, t('profile.phone') %>
-      </h6>
-      <%= f.phone_field :phone %>
-
-      <h6>
-        <%= f.label :mobile, t('profile.mobile') %>
-      </h6>
-      <%= f.phone_field :mobile %>
-
-      <h6>
-        <%= f.label :fax, t('profile.fax') %>
-      </h6>
-      <%= f.phone_field :fax %>
-
-      <h6>
-        <%= f.label :address, t('profile.address') %>
-      </h6>
-      <%= f.text_field :address %>
-
-      <h6>
-        <%= f.label :email, t('profile.email') %>
-      </h6>
-
-      <%= f.email_field :email, :class => "email" %>
-
-      <h6>
-        <%= f.label :website, t('profile.website') %>
-      </h6>
-      <%= f.text_field :website, :class => "url" %>
-
-      <%= f.submit :class => "btn" %>
-    <% end %>
-  <% end %>
+    <%= render partial: 'comunication-info_edit' %>
   </div>
+  <% end %>
 </section>

data/base/app/views/profiles/_comunication-info_edit.html.erb

@@ -0,0 +1,27 @@
+<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+  <%= f.label :phone, t('profile.phone') %>
+
+  <%= f.phone_field :phone %>
+
+  <%= f.label :mobile, t('profile.mobile') %>
+
+  <%= f.phone_field :mobile %>
+
+  <%= f.label :fax, t('profile.fax') %>
+
+  <%= f.phone_field :fax %>
+
+  <%= f.label :address, t('profile.address') %>
+
+  <%= f.text_field :address %>
+
+  <%= f.label :email, t('profile.email') %>
+
+  <%= f.email_field :email, :class => "email" %>
+
+  <%= f.label :website, t('profile.website') %>
+
+  <%= f.text_field :website, :class => "url" %>
+
+  <%= f.submit %>
+<% end %>