social_stream 1.1.12 → 2.0.0.beta1

data/base/app/views/toolbar/_messages.html.erb

@@ -0,0 +1,26 @@
+<section id="toolbar" class="toolbar-conversations">
+  <nav class="toolbar_menu">
+    <ul class="nav">
+    <li>
+      <%= link_to new_message_path do %>
+        <i class='icon_message-new <%= 'active' if controller.action_name == 'new' %>'></i>
+      <% end %>
+    </li>
+    <li>
+      <%= link_to conversations_path(box: :inbox) do %>
+        <i class='icon_message-inbox <%= 'active' if params[:box] == 'inbox' %>'></i> (<%= current_subject.unread_messages_count %>)
+      <% end %>
+    </li>
+    <li>
+      <%= link_to conversations_path(box: :sentbox) do %>
+        <i class='icon_message-sentbox <%= 'active' if params[:box] == 'sentbox' %>'></i>
+      <% end %>
+    </li>
+    <li>
+      <%= link_to conversations_path(box: :trash) do %>
+        <i class='icon_message-trash <%= 'active' if params[:box] == 'trash' %>'></i>
+      <% end %>
+    </li>
+    </ul>
+  </nav>
+</section>

data/base/app/views/toolbar/_profile.html.erb

@@ -0,0 +1,48 @@
+<section id="toolbar" class="toolbar-profile">
+  <div class="user">
+    <%= render partial: 'toolbar/logo',
+               locals: { subject: subject } %>
+
+    <% if current_subject.present? && subject != current_subject %>
+    <div class="contact-button">
+      <%= contact_to subject %>
+
+      <%= javascript_tag do %>
+        $(function() {
+          SocialStream.Contact.show();
+        });
+      <% end %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <nav class="toolbar_menu">
+    <ul class="nav">
+    <li>
+      <%= link_to [ subject, :profile ] do  %>
+        <i class='icon_tool16-info'></i> <%= t 'menu.information' %>
+      <% end %>
+    </li>
+
+    <% if SocialStream.repository_models.present? %>
+      <li>
+        <%= link_to [ subject, :repository ] do %>
+          <i class='icon_navbar-resources'></i> <%= t 'repository.title' %>
+        <% end %>
+      </li>
+    <% end %>
+    <li>
+      <%= link_to new_message_path do %>
+        <i class='icon_navbar-message'></i> <%= t 'mailboxer.send' %>
+      <% end %>
+    </li>
+
+    <div class="base_items"/>
+    </ul>
+  </nav>
+
+  <%= render partial: 'toolbar/contacts', locals: { subject: subject } %>
+
+  <%= render partial: 'toolbar/groups', locals: { subject: subject } %>
+</section>

data/base/app/views/toolbar/_subject.html.erb

@@ -1,10 +1,6 @@
-<div class="model_with_details">
-  <div class="logo">
-    <%= link_to (image_tag(current_subject.logo.url , :size => "50x50", :alt => current_subject.name )), current_subject  %>
-  </div>
-  <div class="sub-block">
-    <div class="name black" >
-      <%= link_to truncate_name(current_subject.name, :length => 80), current_subject %>
-    </div>
-  </div>
-</div>
+<div class="logo_home">
+  <%= link_to (image_tag(current_subject.logo.url(:medium) , :size => "small", :alt => current_subject.name )), current_subject  %>
+</div>
+<h5>
+  <%= link_to truncate_name(current_subject.name, :length => 80), current_subject %>
+</h5>

data/base/app/views/users/_index.html.erb

@@ -1,19 +1,16 @@
-<% cont=0; %>
-
-<% @users.each do |user| %>
-
-<% if (cont%2) == 0 %>
-<% cont+=1; %>
-<div class="row">
-  <% end %>
-  <div class="label">
-    <%= model_with_details user %>
-  </div>
-  <% end %>
-
-  <% if ((cont%2) != 0) 	%> <div class="label"></div>
-</div>
-<% end %>
-<div class="row">
+<div id="list_users_ajax" class="tab_content block">
+  <% cont=0; %>
+    <% @users.each do |user| %>
+      <% if (cont%2) == 0 %>
+        <% cont+=1; %>
+      <% end %>
+      <div class="label">
+        <%= render user %>
+      </div>
+    <% end %>
+    <% if ((cont%2) != 0)     %> 
+      <div class="label">
+      </div>
+    <% end %>
   <%= paginate @users %>
 </div>

data/base/app/views/users/_quick_search_result.html.erb

@@ -0,0 +1 @@
+<%= render user %>

data/base/app/views/users/_search_result.html.erb

@@ -0,0 +1 @@
+<%= render user %>

data/base/app/views/users/_show.html.erb

@@ -1,34 +1,9 @@
-<% content_for :title do %>
-  <%= @user.name+" | "+t('site.name') %>
-<% end %>
+<section id="user">
+  <%= render partial: 'toolbar/profile', locals: { subject: @user } %>
 
+  <%= render :partial => "activities/index",
+             :locals  => { section: @user,
+                           owner:   @user } %>
 
-<% content_for :description do %>
-  <% if @user.profile.description? %>
-    <%= @user.profile.description%>
-  <% else %>
-    <%= @user.name+" "+t('profile.is_on') + " "+ t('site.name') %>
-  <% end %>
-<% end %>
-
-<% content_for :keywords do %>
-  <%= @user.profile.subject.tag_list%>
-<% end %>
-
-<% sidebar %>
-
-<%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
-              
-<% toolbar :profile, :subject => @user %>
-
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-
-<%= render :partial => "users/groups",
-           :locals  => { :user => @user } %>
-
-<%= render :partial => "activities/index",
-           :locals  => { :activities => @user.wall(:profile, :for => current_subject).
-                                              page(params[:page]),
-                         :owner => @user } %>
+  <%= render partial: 'sidebar/show' %>
+</section>

data/base/app/views/users/_timeline.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: 'subjects/timeline',
+           object: user,
+           as: :subject %>

data/base/app/views/users/_user.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'subjects/subject',
-           :object  => user %>
+<%= render partial: 'subjects/subject',
+           object:  user %>

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

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

data/base/config/locales/devise.es.yml

@@ -0,0 +1,59 @@
+# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
+# Translation by William Wong Garay (willywg) https://github.com/willywg
+
+es:
+  errors:
+    messages:
+      expired: "ha expirado, por favor solicita una nueva"
+      not_found: "no se encontró"
+      already_confirmed: "ya fue confirmado, por favor intenta iniciar sesión"
+      not_locked: "no estaba bloqueado"
+      not_saved:
+        one: "Un error ocurrió al tratar de guardar %{resource}:"
+        other: "%{count} errores ocurrieron al tratar de guardar %{resource}:"
+
+  devise:
+    failure:
+      already_authenticated: 'Ya has iniciado una sesión.'
+      unauthenticated: 'Tienes que iniciar sesión o registrarte para poder continuar.'
+      unconfirmed: 'Tienes que confirmar tu cuenta para poder continuar.'
+      locked: 'Tu cuenta está bloqueada.'
+      invalid: 'Contraseña o Correo inválidos.'
+      invalid_token: 'Código de autenticación inválido.'
+      timeout: 'Tu sesión expiró, por favor inicia sesión nuevamente para continuar.'
+      inactive: 'Tu cuenta aún no ha sido activada.'
+    sessions:
+      link: 'Iniciar Sesión'
+      signed_in: 'Sesión iniciada.'
+      signed_out: 'Sesión finalizada.'
+    passwords:
+      link: '¿Olvidaste tu contraseña?'
+      send_instructions: 'Vas a recibir un correo con instrucciones sobre cómo resetear tu contraseña en unos pocos minutos.'
+      updated: 'Tu contraseña fue cambiada. Ya iniciaste sesión.'
+      send_paranoid_instructions: "Si tu Correo existe en nuestra base de datos, vas a recibir un correo con instrucciones sobre cómo resetear tu contraseña en tu bandeja de entrada."
+    confirmations:
+      link: "¿No recibiste instrucciones de confirmación?"
+      send_instructions: 'Vas a recibir un correo con instrucciones sobre cómo confirmar tu cuenta en unos pocos minutos.'
+      send_paranoid_instructions: 'Si tu Correo existe en nuestra base de datos, vas a recibir un correo con instrucciones sobre cómo confirmar tu cuenta en unos pocos minutos.'
+      confirmed: 'Tu cuenta fue confirmada. Ya iniciaste sesión.'
+    registrations:
+      link: 'Crear cuenta'
+      signed_up: 'Bienvenido. Tu cuenta fue creada.'
+      inactive_signed_up: 'Tu cuenta fue creada. Sin embargo, no podemos iniciar tu sesión porque tu cuenta está %{reason}.'
+      updated: 'Tu cuenta fue actualizada.'
+      destroyed: 'Fue grato tenerte con nosotros. Tu cuenta fue cancelada.'
+    unlocks:
+      link: "¿No recibiste instrucciones para desbloquear?"
+      send_instructions: 'Vas a recibir instrucciones para desbloquear tu cuenta en unos pocos minutos.'
+      send_paranoid_instructions: 'Si tu cuenta existe, vas a recibir instrucciones para desbloquear tu cuenta en unos pocos minutos.'
+      unlocked: 'Tu cuenta fue desbloqueada. Ya iniciaste sesión.'
+    omniauth_callbacks:
+      success: 'Has sido autorizado satisfactoriamente de la cuenta %{kind}.'
+      failure: 'No has sido autorizado en la cuenta %{kind} porque "%{reason}".'
+    mailer:
+      confirmation_instructions: 
+        subject: 'Instrucciones de confirmación'
+      reset_password_instructions:
+        subject: 'Instrucciones de recuperación de contraseña'
+      unlock_instructions:
+        subject: 'Instrucciones para desbloquear'

data/base/config/locales/en.yml

@@ -17,11 +17,10 @@ en:
       change: "Change password"
       new: "New password"
       retype: "Retype new password"
-    privacy: "Privacy"
   activerecord:
     attributes:
       contact:
-        relation_ids: "Contact type"
+        relation_ids: "Roles"
       relation/custom:
         name: "Name"
       user:
@@ -53,15 +52,18 @@ en:
     one: "Activity"
     other: "Activities"
     privacy:
-      myself:
-        contacts:
+      contact:
+        myself:
           group: "All members"
           user: "Your contacts"
-      outside:
-        contacts:
+        outside:
           group: "Members of %{receiver}"
           user: "Contacts of %{receiver}"
+      relation:
+        one: "%{count} group"
+        other: "%{count} groups"
     sending: "Sending"
+    share: "Share"
     stream:
       atom_title: "Activity Stream from %{subject}"
       title:
@@ -110,6 +112,8 @@ en:
         one: "%{count} more person"
         other: "%{count} more people"
     unfollow: "Unfollow"
+  ajax:
+    error: "There was an error in the remote server"
   browse: "Browse"
   button:
     cancel: "Cancel"
@@ -136,19 +140,20 @@ en:
     confirm_delete: "Delete comment?"
     name: "comment"
     one: "a comment"
+    other: "comments"
     title:
       one: "Comment"
       other: "Comments"
-    view_all: "View all comments"
+    view_all: "View all comments (%{count})"
   contact:
-    addressbook: "Addressbook"
     all_n: "All contacts (%{count})"
-    confirm_delete: "Delete contact?"
+    confirm_delete: "Remove contact?"
     current: "Current"
     delete: "Delete"
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit contact"
+    empty: "You have not added anybody yet. What about <a href=\"%{explore}\">exploring</a>?"
     error_count:
       one: "1 error prohibited this contact from being saved:"
       other: "%{count} errors prohibited this contact from being saved:"
@@ -160,7 +165,14 @@ en:
     in_common:
       one: "1 contact in common"
       other: "%{count} contacts in common"
+    n:
+      one: "%{count} contact"
+      other: "%{count} contacts"
     new:
+      button:
+        zero: "Add"
+        one: "%{count} role"
+        other: "%{count} roles"
       link: "+ Add contact"
       title: "Add %{name} to your contacts"
       menu: "Add contact"
@@ -168,9 +180,10 @@ en:
     one: "Contact"
     other: "Contacts"
     pending:
-      other: "Pending"
+      other: "Added you"
       all: "All"
       all_n: "See all pending requests (%{count})"
+    received: "Received"
     relation:
       one: "Contact type"
       new: "New type"
@@ -178,6 +191,8 @@ en:
       link: "+ Reply contact"
       title: "Reply contact request to %{name}"
       submit: "Reply contact"
+    saving: "Saving..."
+    sent: "Added"
     suggestion:
       one: "Suggestion"
       other: "Suggestions"
@@ -185,9 +200,17 @@ en:
     type:
       new: "+ New type"
     unfollow: "Unfollow"
-  copyright: "2010 Copyright - All rights reserved"
+    view_all: "View all..."
+  copyright: "2013 Copyright - All rights reserved"
+  counter:
+    like:
+      one: "<span class=\"counter\">%{count}</span> like"
+      other: "<span class=\"counter\">%{count}</span> likes"
+    view:
+      one: "<span class=\"counter\">%{count}</span> view"
+      other: "<span class=\"counter\">%{count}</span> views"
   delete:
-    confirm: Delete %{element}}?
+    confirm: "Delete %{element}}?"
   devise:
     links:
       sign_in: "Sign in"
@@ -201,6 +224,36 @@ en:
       forgot: "Forgot your password?"
       instructions: "Type the email address bound to your account and we will sent you instructions to change it:"
       update: "Change your password"
+  dropdown:
+    notifications: "Notifications"
+    privacy: "Privacy"
+    settings: "Settings"
+  explore:
+    explore:
+      most_followed: "Most followed"
+      most_popular: "Most popular"
+    header:
+      explore: "Explore"
+      participants: "Participants"
+      resources: "Resources"
+      timeline: "Timeline"
+      tags: "Tags"
+      search: "Search"
+    link: "Explore"
+    or: "or Explore"
+    participants:
+      last_active: "Last active"
+      last_registered: "Last registered"
+      most_members: "Most members"
+      registered_since: "since %{time}"
+    resources:
+      last_uploaded: "Last uploaded"
+      most_visited: "Most viewed"
+      uploaded_since: "since %{time}"
+    search:
+      title: "Advanced search"
+      placeholder: "looking for..."
+      submit: "Search"
   follower:
     follower:
       title: "Followers"
@@ -211,33 +264,21 @@ en:
       other: "%{count} followers"
   forgot_password: "Forgot you password?"
   frontpage:
-    collaborate:
-      default: "Collaborate"
-      sentence1: "Organize your projects and activities"
-      sentence2: "Participate in conferences and events"
-      sentence3: "Create your own group and conferences"
-    elements:
-      comments: "Comments"
-      conferences: "Conferences"
-      networks: "Social Networks"
-      organizers: "Organizers"
-      participants: "Participants"
-      groups: "Groups"
-      tags: "Tags"
-    main_title: "Social Stream is a core for building social network websites."
-    meet:
-      default: "Meet"
-      sentence1: "Meet interesting people and groups"
-      sentence2: "Find last activity of your contacts"
-    register: "Register now!"
-    share:
-      default: "Share"
-      sentence1: "Your proyects and activities"
-      sentence2: "Posts, photos, audio and videos"
+    main_title: "Social Stream, the core for building distributed social network websites."
+    presentation:
+      modular:
+        header: "Modular"
+        p: "Available <a href=\"https://github.com/ging/social_stream#social-stream-components\">Social Stream components</a> 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\">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> or changing the CSS using <a href=\"http://sass-lang.com/\">Sass</a>"
+      community:
+        header: "Community"
+        p: "Social Stream enjoys a growing community of developers. Feel free to drop a message at <a href=\"http://groups.google.com/group/social-stream\">Social 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!"
     stats: "%{users} users and %{groups} groups registered"
   group:
-    one: "Group"
-    other: "Groups"
+    one: "group"
+    other: "groups"
     all: "All groups"
     all_n: "All groups (%{count})"
     by: "By groups"    
@@ -251,6 +292,9 @@ en:
     input: "What is the name of the group?"
     last: "Last groups"
     my: "My groups"
+    n:
+      one: "%{count} group"
+      other: "%{count} groups"
     new:
       action: "New group"
       name: "Name"
@@ -264,6 +308,7 @@ en:
     title:
       one: "Group"
       other: "Groups"
+    view_all: "View all..."
   help: "Help"
   helpers:
     submit:
@@ -284,10 +329,12 @@ en:
     toolbar: "Invite"
     success: "Your invitations have successfully been sent"
     text: "Write your own message"
+  layout:
+    more: "See more (%{count})"
   like:
     n:
-      one: "1 fan"
-      other: "%{count} fans"
+      one: "%{count} like"
+      other: "%{count} likes"
   location:
     message: "You are here > %{location}"
     base: "You are here"
@@ -344,7 +391,7 @@ en:
     like:
       group: "%{sender} likes %{whose} %{thing}." 
       user: "%{sender} likes %{whose} %{thing}."
-    look: "Take a look at %{sender}'s wall"
+    look: "Take a look at %{sender}'s profile"
     makefriend:
       group: "%{sender} also added %{who} as contact."
       user: "%{sender} also added %{who} as contact."
@@ -372,9 +419,10 @@ en:
     confirm_delete: "Delete post?"
     form:
       title: "Post"
-    input: "What are you doing?"
+    input: "Share you thoughts here!"
     name: "post"
     one: "a post"
+    other: "posts"
     title:
       one: "Post"
       other: "Posts"
@@ -454,7 +502,8 @@ en:
               positive: "Activities WILL BE notified to contacts at %{name}"
               negative: "Activities WILL NOT BE notified to contacts at %{name}"
     of_relation:
-      choose: "2. Permissions in <strong>%{name}</strong> sphere"
+      choose: "Permissions in <strong>%{name}</strong> role"
+    postit: "Manage the permissions of your contacts and create new roles"
   privacy:
     intro: "Contacts at <strong>%{relation}</strong> level are only allowed to:"
     rule:
@@ -462,21 +511,31 @@ en:
       title: "Privacy rules"
       saved: "Privacy rules saved"
   relation_custom:
-    choose: "1. Choose sphere"
-    confirm_delete: "Delete this sphere?"
+    confirm_delete: "Delete this role?"
     delete: "Delete"
     edit: "Change name"
-    new: "+ New sphere"
-    title: "Privacy & context"
+    list:
+      title: "Roles"
+    new: "+ New role"
+    title: "Privacy"
   relation_public:
     name: "Public"
+  repository:
+    filter: "filter"
+    title: "Repository"
+    order:
+      by: "Order by"
+      last_modified: "Last modified"
+      most_popular: "Most popular"
   representation:
     notice: "Your session has changed. Now you are acting on behalf of %{subject}. Use the top-right menu to return to your session"
     switch: "Switch session"
   required: "(*) These fields are required"
   search:
     all_results: "Search all %{subject} (%{count})"
-    at_least: "Write at least two characters"
+    at_least:
+      one: "Write at least %{count} character"
+      other: "Write at least %{count} characters"
     global: 
       name: "Global search"
       first_result:
@@ -509,7 +568,7 @@ en:
     for: "Settings for"
     main: "Settings"
     manage:
-      name: "Admin Contacs"
+      name: "Admin Contacts"
       briefing: "Settings for contacts"
       explanation: "Change contacts permissions"
     notifications:
@@ -539,8 +598,8 @@ en:
     all: "All users"
     all_n: "All users (%{count})"
     by: "By Users"
-    one: "User"
-    other: "Users"
+    one: "user"
+    other: "users"
     title:
       one: "User"
       other: "Users"