social_stream 2.0.0.beta2 → 2.0.0.beta3

data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss

@@ -35,7 +35,7 @@
 // Float them, remove border radius, then re-add to first and last elements
 .btn-group > .btn-blue {
   position: relative;
-  @include border-radius(0px),
+  @include border-radius(0px)
 }
 .btn-group > .btn-blue + .btn-blue {
   margin-left: -1px;

data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss

@@ -6,4 +6,12 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 }
 select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {   
   padding: 6px 2%;
+}
+
+textarea, input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"] {   
+  @include gradient-directional($startColor: #f9f9f9, $endColor: #f1f1f1, $deg: 45deg);
+}
+
+textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus {   
+  @include gradient-directional($startColor: #f9f9f9, $endColor: #f9f9f9, $deg: 45deg);
 }

data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss

@@ -21,4 +21,8 @@
   color: $gray;
   text-decoration: none;
   text-shadow: 0 1px 0 white;
+}
+
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus {
+  @include gradient-vertical($startColor: $white, $endColor: rgba(255, 255, 255, 0.3));
 }

data/base/app/assets/stylesheets/social_stream/fonts/colorfont.css

@@ -1,11 +1,11 @@
 /************* typography COLORFONT PLUGING*******/
 
 .colorfont {
-  color: #e2e2e2;
-  font-family: 'Din OSP' !important;
+  color: #e6e6e6;
+  font-family: 'Josefin OSP' !important;
 }
 
 .colorfont-overlay {
-  color: #ccc;
-  font-family: 'Din Overlay' !important;
+  color: #ddd;
+  font-family: 'Josefin Overlay' !important;
 }

data/base/app/assets/stylesheets/social_stream/fonts/fonts.css

@@ -19,15 +19,15 @@
   src: url(social_stream/fonts/GiveYouGlory.ttf);
 }
 @font-face{
-  font-family: "Din OSP";
+  font-family: "Josefin OSP";
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/DIN_OSP-Original.ttf);
+  src: url(social_stream/fonts/JosefinSlabRegular.ttf);
 }
 
 @font-face{
-  font-family: 'Din Overlay';
+  font-family: 'Josefin Overlay';
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/DIN_OSP-Overlay.ttf);
+  src: url(social_stream/fonts/JosefinSlabOverlay.ttf);
 }

data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass

@@ -0,0 +1,5 @@
+@import "social_stream/base/mixins/colorfont"
+
+@import "social_stream/fonts/fonts"
+
+@import "social_stream/fonts/colorfont"

data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass

@@ -0,0 +1,5 @@
+@import "social_stream/base/mixins/colorfont"
+
+@import "social_stream/fonts/fonts"
+
+@import "social_stream/fonts/colorfont"

data/base/app/controllers/repositories_controller.rb

@@ -1,5 +1,4 @@
 class RepositoriesController < ApplicationController
-
   before_filter :profile_or_current_subject!
 
   def show
@@ -15,7 +14,7 @@ class RepositoriesController < ApplicationController
   end
 
   def search
-    render SocialStream::Search.search(params[:q], current_subject, mode: :repository)
+    render SocialStream::Search.search(params[:q], current_subject, mode: :repository, owner: profile_subject!)
   end
 
   private
@@ -26,7 +25,7 @@ class RepositoriesController < ApplicationController
         select("DISTINCT activity_objects.*").
         where(object_type: SocialStream.repository_models.map(&:to_s).map(&:classify)).
         includes(SocialStream.repository_models).
-        collection(profile_subject, current_subject).
+        collection(profile_or_current_subject, current_subject).
         page(params[:page])
   end
 end

data/base/app/helpers/contacts_helper.rb

@@ -1,34 +1,47 @@
 module ContactsHelper
-  def contact_brief(subject)
+  def contact_count(actor)
     if user_signed_in?
-      t 'contact.in_common', :count => current_subject.common_contacts_count(subject)
+      t 'contact.in_common', :count => current_subject.common_contacts_count(actor)
     else
-      t 'contact.n', count: subject.sent_active_contact_count
+      t 'contact.n', count: actor.sent_active_contact_count
     end
   end
 
-  def contact_link(c)
+  # Add contact button
+  def contact_button(contact_or_actor)
+    if user_signed_in?
+      current_actor_contact_button contact_or_actor
+    else
+      anonymous_contact_button
+    end
+  end
+
+  def current_actor_contact_button contact_or_actor
+    c =
+      if contact_or_actor.is_a?(Contact)
+        if contact_or_actor.sender == current_actor
+          contact_or_actor
+        else
+          current_actor.contact_to!(contact_or_actor.receiver)
+        end
+      else
+        current_actor.contact_to!(contact_or_actor)
+      end
+
     if c.reflexive?
       t('subject.this_is_you')
     else
       render :partial => "contacts/link_#{ SocialStream.relation_model }", :locals => { :contact => c }
     end
-
   end
 
-  # Show current ties from current user to actor, if they exist, or provide a link
-  # to create new ties to actor
-  def contact_to(a)
-    if user_signed_in?
-      contact_link current_subject.contact_to!(a)
-    else
-      if SocialStream.relation_model == :follow
-        form_tag new_user_session_path do |f|
-          submit_tag t('contact.follow')
-        end
-      else
-        link_to t("contact.new.link"), new_user_session_path
+  def anonymous_contact_button
+    if SocialStream.relation_model == :follow
+      form_tag new_user_session_path do |f|
+        submit_tag t('contact.follow')
       end
+    else
+      link_to t("contact.new.link"), new_user_session_path
     end
   end
 

data/base/app/models/activity_object.rb

@@ -67,24 +67,23 @@ class ActivityObject < ActiveRecord::Base
   }
 
   scope :collection, lambda { |profile_subject = nil, current_subject = nil|
+    col = self
+
+    # /users/demo/posts
+    #
+    # get posts posted to demo's wall
     if profile_subject.present?
-      # /users/demo/posts
-      #
-      # get posts posted to demo's wall
-      col = owned_by(profile_subject)
-
-      # if current_subject != demo, auth filter results
-      if profile_subject != current_subject
-        col = col.shared_with(current_subject)
-      end
-    else
-      # auth filter results
-      col = shared_with(current_subject)
-
-      # if logged in, show the posts from the people following
-      if current_subject.present?
-        col = col.followed_by(current_subject)
-      end
+      col = col.owned_by(profile_subject)
+    end
+
+    # Auth filter results
+    if current_subject != profile_subject || current_subject.blank?
+      col = col.shared_with(current_subject)
+    end
+
+    # Show the posts from the people following
+    if profile_subject.blank? && current_subject.present?
+      col = col.followed_by(current_subject)
     end
 
     col

data/base/app/models/profile.rb

@@ -27,9 +27,6 @@ class Profile < ActiveRecord::Base
   validate :validate_birthday
   
   def birthday=(value)
-    
-    puts "He entrado en el metodo birthday con un :" + value.class.to_s 
-          
     if value.blank?
       @birthday_formatted_invalid = false    
       super value
@@ -42,7 +39,6 @@ class Profile < ActiveRecord::Base
         @birthday_formatted_invalid = true
       end
     end
-
   end
   
   def age

data/base/app/views/activities/_root.html.erb

@@ -8,7 +8,7 @@
   <header class="media-heading">
     <%= activity.title(self) %>
 
-    <% if activity.direct_object && can?(:destroy, activity.direct_object) %>
+    <% if activity.direct_object && !activity.direct_object.acts_as_actor? && can?(:destroy, activity.direct_object) %>
     <div class="x" style="float: right"> 
       <%= link_to ('X'), activity.direct_object , :confirm => t('confirm_delete', 
                     :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  

data/base/app/views/activities/_timeline_modal.html.erb

@@ -1,10 +1,10 @@
 <div class="timeline-modal-carousel modal hide fade">
   <div class="modal-body">
     <div id="modal-carousel" class="carousel slide" data-interval="false">
-      <ol class="carousel-indicators">
-      </ol>
       <div class="carousel-inner">
       </div>
+      <ol class="carousel-indicators">
+      </ol>
     </div>
     <a class="carousel-control left" href="#modal-carousel" data-slide="prev">&lsaquo;</a>
     <a class="carousel-control right" href="#modal-carousel" data-slide="next">&rsaquo;</a>

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

@@ -11,11 +11,11 @@
     </div>
 
     <div class="info">
-      <%= contact_brief(contact.receiver_subject) %>
+      <%= contact_count(contact.receiver) %>
     </div>
   </div>
   <div class="add">
-    <%= contact_link(contact) %>
+    <%= contact_button(contact) %>
   </div>
   <div class="x">
         <%= link_to 'X', contact_path(contact, destroy_params), method: :delete, remote: true, confirm: t('contact.confirm_delete') %>

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

@@ -20,6 +20,12 @@
         <div id="<%= type %>" class="tab-pane <%= 'active' if current_contact_section?(type) %>">
           <%= text_field_tag "contact-filter-#{ type }", (current_contact_section?(type) ? params[:q] : ""), class: "pull-right contact-filter", placeholder: "filter", autocomplete: "off" %>
 
+          <% if type == :group %>
+            <%= link_to t('group.new.link'), new_group_path, class: 'new_group-modal-link', 'data-toggle' => 'modal' %>
+
+            <%= render partial: 'groups/new_modal' %>
+          <% end %>
+
           <div class="contact-list">
             <% if current_contact_section?(type) %>
               <% if @contacts.any? %>

data/base/app/views/explore/_followed.html.erb

@@ -6,11 +6,11 @@
     <section class="second-line"> 
       <%= actor.description %>
     </section>
-    <aside class="well well-small">
-      <div class="top">
-        <%= t 'follower.n', count: actor.follower_count %>
-      </div>
-    </aside>
-  </nav>
+  </div>
+  <aside class="well well-small">
+    <div class="top">
+      <%= t 'follower.n', count: actor.follower_count %>
+    </div>
+  </aside>
 </section>
 

data/base/app/views/groups/{_new.html.erb → _form.html.erb}

@@ -1,9 +1,9 @@
-<%= form_for @group do |f| %>
-  <% if @group.errors.any? %>
+<%= form_for group do |f| %>
+  <% if group.errors.any? %>
     <div class="error">
-      <h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>
+      <h2><%= pluralize(group.errors.count, "error") %> prohibited this group from being saved:</h2>
       <ul>
-        <% @group.errors.full_messages.each do |msg| %>
+        <% group.errors.full_messages.each do |msg| %>
           <li>
           <%= msg %>
           </li>
@@ -12,8 +12,6 @@
     </div>
   <% end %>
 
-  <h2><%= t('group.new.action') %></h2>
-
   <%= f.label :name, t('group.new.name') %>
   <%= f.text_field :name %>
 
@@ -44,4 +42,3 @@
     );
   });
 <% end %>
-

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

@@ -0,0 +1,11 @@
+<div id="new_group-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="new_group-modal-title" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="new_group-modal-title"><%= t 'group.new.title' %></h3>
+  </div>
+  <div class="modal-body">
+    <%= render partial: 'groups/form',
+               object: Group.new,
+               as: :group %>
+  </div>
+</div>

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

@@ -5,5 +5,9 @@
 
   <%= render partial: 'toolbar/home' %>
 
-  <%= render :partial => 'new' %>
+  <h2><%= t('group.new.title') %></h2>
+
+  <%= render partial: 'form',
+             object: @group,
+             as: :group %>
 </section>

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

@@ -1,4 +1,4 @@
-<footer class="container">
+<footer>
   <ul>
     <li>
       <%= Date.today.year %> © 

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

@@ -33,16 +33,15 @@
   </head>
   
   <body>
-    <div class="wrapper container-fluid">
-      <%= render :partial => "layouts/header" %>
+    <div class="container-fluid">
+      <div class="wrapper">
+        <%= render :partial => "layouts/header" %>
 
-      <%= flashy %>
+        <%= flashy %>
 
-      <%= yield %>
-  
+        <%= yield %>
+      </div>  
+      <%= render :partial => "layouts/footer" %>
     </div>
-    
-    <%= render :partial => "layouts/footer" %>
-
   </body>
 </html>

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

@@ -1,16 +1,16 @@
-<section class="avatar">
-  <header>
-    <%= render partial: 'edit_icon' %>
-    <h4>
+<section class="accordion-group avatar">
+  <div class="accordion-heading">
+    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion5" href="#collapseFive">
       <%= t('avatar.profile_change') %>
-    </h4>
-  </header>
-  
+    </a>
+  </div>
   <% if can? :update, @profile %>
-  <div class="update">
+  <div id="collapseFive" class="accordion-body collapse">
+    <div class="accordion-inner">
     <%= render partial: 'avatars/form',
                object: @profile.actor,
                as: :avatarable %>
-  </div>
+    </div>
   <% end %>
+  </div>
 </section>

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

@@ -1,12 +1,9 @@
-<section class="comunication-info">
-  <header>
-    <%= render partial: 'edit_icon' %>
-    <h4>
+<section class="accordion-group comunication-info">
+  <div class="accordion-heading">
+    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTree">
       <%= t('profile.contact') %>
-    </h4>
-  </header>
+    </a>
 
-  <div class="briefing">
     <% if @profile.contact_present? %>
       <% if @profile.phone? %>
         <h5>
@@ -56,9 +53,11 @@
       <%= render partial: 'empty' %>
     <% end %>
   </div>
+ 
 
   <% if can? :update, @profile %>
-    <div class="update">
+  <div id="collapseTree" class="accordion-body collapse">
+    <div class="accordion-inner">
       <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
         <h6>
           <%= f.label :phone, t('profile.phone') %>
@@ -95,4 +94,5 @@
       <% end %>
     </div>
   <% end %>
+  </div>
 </section>