social_stream-base 0.9.19 → 0.9.20

data/app/views/devise/registrations/edit.html.erb

@@ -1,98 +1,21 @@
 <% toolbar :profile => current_subject %>
-
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
 <%= location(t('account.one'), 
-  link_to(t('account.edit'), edit_user_registration_path)
+  link_to(t('settings.main'), settings_path)
 ) %>
-
-<%= devise_error_messages! %>
-
-<% content_for :javascript do %>
-  $(".user_edit").validate({errorClass: "validation_error"});
-<%end%>
-
-<div class="space_center"></div>
-<h2><%= t('account.edit') %></h2>
-<div class="space_center"></div>
-
-<div class="block" id="password_form">
-  <div class="header">
-    <div class="header_text">
-      <%=t("account.password.change")%>
-    </div>
-  </div>
-  <div class="space_center"></div>
-  <div >
-    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-    <div class="form_row">
-      <div class="form_label">
-        <%= f.label t('account.password.new') %>
-      </div>
-      <div class="form_field">
-        <%= f.password_field :password, :class => "form_tag" %>
-      </div>
-    </div>
-    <div class="form_row">
-      <div class="form_label">
-        <%= f.label t('account.password.retype') %>
-      </div>
-      <div class="form_field">
-        <%= f.password_field :password_confirmation, :class => "form_tag" %>
-      </div>
-    </div>
-    <div class="form_row">
-      <div class="form_label">
-        <%= f.label :current_password %>
-      </div>
-      <div class="form_field">
-        <%= f.password_field :current_password, :class => "form_tag" %>
-      </div>
-    </div>
-    <div class="form_row space_center">
-      <%= f.submit t('button.update'), :class => "button" %>
-    </div>
-    <% end%>
-  </div>
-</div>
-<div class="block" id="email_form">
-  <div class="header">
-    <div class="header_text">
-      <%=t("account.email.change")%>
-    </div>
-  </div>
-  <div class="space_center"></div>
-  <div >
-    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-    <div class="form_row">
-      <div class="form_label">
-        <%= f.label :email %>
-      </div>
-      <div class="form_field">
-        <%= f.email_field :email, :class => "required form_tag" %>
-      </div>
-    </div>
-    <div class="form_row">
-      <div class="form_label">
-        <%= f.label :current_password %>
-      </div>
-      <div class="form_field">
-        <%= f.password_field :current_password, :class => "required form_tag" %>
-      </div>
-    </div>
-    <div class="form_row space_center">
-      <%= f.submit t('button.update'), :class => "button" %>
-    </div>
-    <% end%>
-  </div>
+<br class="clearfloat" />
+<div class="space_center">
 </div>
-<div class="block" id="cancel_account">
-  <div class="header">
-    <div class="header_text">
-      <%=t("account.cancel")%>
-    </div>
-  </div>
-  <div class="space_center"></div>
-  <div class="form_row">
-    Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
-  </div>
+<h2><%= t('settings.for')%> <%= current_subject.name %></h2>
+<div class="space_center">
 </div>
-<div class="space_center"></div>
+<%= render :partial => "edit_user"%>
+
+<%= render :partial => "settings/notifications" %>
+<% if current_subject.respond_to? :authentication_token%>
+<%= render :partial => "settings/api_key" %>
+<% end %>
+<%= render :partial => "settings/contacts" %>
+<%= render :partial => "delete_account"%>

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

@@ -4,9 +4,6 @@
       <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name, :length => 15 %><span class="sf-sub-indicator"> »</span></a>
       <ul>
         <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
-        <li>
-          <%= link_to t('account.edit'), edit_user_registration_path %>
-        </li>
         <li>
           <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
         </li>

data/app/views/messages/_form.html.erb

@@ -33,7 +33,7 @@
 		<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag", :maxlength => 5000 %>
 	</div>
 	<div class="actions center">
-		<%= submit_tag "Send Message", :name => :send_message, :class => "button" %>
+		<%= submit_tag t('mailboxer.send'), :name => :send_message, :class => "button" %>
 	</div>
 </div>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div id="columns_container">
 
-  <div id="permissions_list_block">
+  <div id="permissions_list">
 
     <p class="sectionTitle"><%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %></p>
 
@@ -9,7 +9,7 @@
       <tr>
         <td>
           <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-            <input id=<%= dom_id p %> optionOf="permissions" type="checkbox"/>
+            <input id=<%= dom_id p %> class="permission" type="checkbox"/>
             <label for=<%= dom_id p %>><%= p.description(:brief) %></label>
             <div class="clearfloat"></div>
           </div>

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

@@ -1,10 +1,15 @@
 $('#permissions').html("<%= escape_javascript render(:partial => 'index') %>");
-$('input[id^="permission"]').checkBox();
+
 <% default_permissions.each do |p| %>
   <% if @relation.permission_ids.include? p.id %>
-    $('input[id="permission_<%= p.id %>"]').checkBox('changeCheckStatus', true);
+    $('#<%= 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();

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

@@ -2,8 +2,8 @@
   <% list.each do |r| %>
     <%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
       <div contain="<%= dom_id(r) %>" class="checkboxOptionLeft">
-        <input id=<%= dom_id(r) %> type="checkbox"/>
-        <label for=<%= dom_id(r) %>><%=r.name%></label>
+        <input id="<%= dom_id(r) %>" type="radio" name="relation_custom"/>
+        <label for="<%= dom_id(r) %>"><%=r.name%></label>
         <div class="options">
           <%= link_to image_tag("btn/edit.png", :class => "menu_icon", :title => t('relation_custom.edit')), '#', :class => "relation_custom_edit_link" %>
           <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('relation_custom.delete')), r, :class => "relation_custom_delete_link", :method => :delete, :confirm => t('relation_custom.confirm_delete') %>
@@ -37,9 +37,11 @@
 </table>
 
 <%= javascript_tag do %>
-  $(function() {
-    $('input[id^="relation_custom"]').checkBox();
-
+  $(function(){
+    $('#relation_customs_list :radio').change(function(){
+      selectRelation(this);
+    });
+    
     $('.relation_custom_edit_link').click(function() {
       $(this).parent().hide();
       $(this).parent().siblings('label').hide();
@@ -52,5 +54,10 @@
 
       return false;
     });
+
+    $("#new_relation_custom_title").click(function() {
+      $("#new_relation_custom_title_block").hide();
+      $("#new_relation_custom_input_block").show();
+    });
   })
 <% end %>

data/app/views/relation/customs/create.js.erb

@@ -13,7 +13,9 @@
   // Refresh list
   $('#relation_customs_list').html("<%= escape_javascript render(:partial => 'relation/customs/list', :object => current_subject.relation_customs) %>");
 
-  // Select relation_custom
-  $('#' + '<%= dom_id @custom %>').checkBox('changeCheckStatus', true);
+
+  $(function(){
+    selectRelation($('#' + '<%= dom_id @custom %>'));
+  });
 <% end %>
 

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

@@ -10,11 +10,6 @@
 
     <%= javascript_tag do %>
       $(function() {
-        $("#new_relation_custom_title").click(function() {
-          $("#new_relation_custom_title_block").hide();
-          $("#new_relation_custom_input_block").show();
-        });
-
         $("#loading").hide();
 
         $("#loading").ajaxStart(function(){

data/app/views/search/_form.html.erb

@@ -10,7 +10,7 @@
           <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
           <% SocialStream.extended_search_models.each do |model_sym| %>
             <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(model_sym.to_s.pluralize.downcase)) ? 'selected' : ''%>
-            <% disabled =ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
+            <% disabled = ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
             <% disabled_class = (disabled ? 'disabled' : '') %>
             <li>
             <% unless disabled %>

data/app/views/settings/_api_key.html.erb

@@ -4,15 +4,15 @@
             <%= t('settings.api_key.name')%>
         </div>
         <div class="header_icon_right">
-            <%= link_to (image_tag('btn/edit.png')),  "javascript:showApiKeySettings();" %>
+      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"api_key_settings\");" %>
         </div>
     </div>
-    <div class="content" id="api_key_settings_briefing">        
+    <div id="api_key_settings_briefing" class="settings_briefing content">        
         <div class="form_row">
             <%= t('settings.api_key.briefing')%>
         </div>
     </div>
-    <div class="content" id="api_key_settings_content" style="display:none;">
+    <div class="content settings_content" id="api_key_settings_content" style="display:none;">
         <div class="settings_block">
             <div class="form_row">
                <%=t('settings.api_key.explanation') %>: <span id="api_token"><%= current_subject.authentication_token.blank? ? t('settings.api_key.empty') : current_subject.authentication_token %></span>

data/app/views/settings/_index.html.erb

@@ -1,12 +1,17 @@
-<%= location(link_to(image_tag("btn/btn_config.png", :class => "btn_config")+t('account.one')+": "+t('account.settings')))%>
 <br class="clearfloat" />
 <div class="space_center">
 </div>
 <h2><%= t('settings.for')%> <%= current_subject.name %></h2>
 <div class="space_center">
 </div>
+<% if current_subject==current_user %>
+<%= render :partial => "devise/registrations/edit_user", :locals => { :resource => current_user, :resource_name => :user }%>
+<% end %>
 <%= render :partial => "notifications" %>
 <% if current_subject.respond_to? :authentication_token%>
 <%= render :partial => "api_key" %>
 <% end %>
 <%= render :partial => "contacts" %>
+<% if current_subject==current_user %>
+<%= render :partial => "devise/registrations/delete_account", :locals => { :resource => current_user, :resource_name => :user }%>
+<% end %>

data/app/views/settings/_notifications.html.erb

@@ -4,15 +4,15 @@
             <%= t('settings.notifications.name')%>
         </div>
         <div class="header_icon_right">
-            <%= link_to (image_tag('btn/edit.png')),  "javascript:showNotificationsSettings();" %>
+      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"notifications_settings\");" %>
         </div>
     </div>
-    <div class="content" id="notifications_settings_briefing">        
+    <div id="notifications_settings_briefing" class="settings_briefing content">        
         <div class="form_row">
             <%= t('settings.notifications.briefing')%>
         </div>
     </div>
-    <div class="content" id="notifications_settings_content" style="display:none;">
+    <div class="content settings_content" id="notifications_settings_content" style="display:none;">
         <%= form_tag update_all_settings_path, :method => :put do %>
         <ul>
         <div class="settings_block">

data/app/views/settings/index.html.erb

@@ -6,10 +6,13 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar %>
+<% toolbar :profile => current_subject %>
 
 <% content_for :javascript do %>
     
 <% end %>
+<%= location(t('account.one'), 
+  link_to(t('settings.main'), settings_path)
+) %>
 
 <%= render :partial => 'index' %>

data/config/locales/en.yml

@@ -19,6 +19,8 @@ en:
     attributes:
       contact:
         relation_ids: "Contact type"
+      relation/custom:
+        name: "Name"
       user:
         email: "Email"
         name: "Name"
@@ -43,9 +45,14 @@ en:
     one: "Activity"
     other: "Activities"
     privacy:
-      contacts:
-        user: "Contacts of %{receiver}"
-        group: "Members of %{receiver}"
+      myself:
+        contacts:
+          group: "All members"
+          user: "Your contacts"
+      outside:
+        contacts:
+          group: "Members of %{receiver}"
+          user: "Contacts of %{receiver}"
     sending: "Sending"
     title: "Activities"
     to_comment: "Comment"
@@ -222,15 +229,21 @@ en:
     base: "You are here"
     separator: " > "
   mailboxer:
+    delete: "Delete"
+    delete_confirm: "Do you want to move '%{object}' to trash?"
     form:
       body: "Body"
       recipients: "Recipients"
       subject: "Subject"
+    mark_as_read: "Mark as read"
     message_mailer:
       subject_new: "%{subject}"
       subject_reply: "%{subject}"
     notification_mailer:
       subject: "%{subject}"
+    reply: "Reply"
+    send: "Send message"
+    sent: "Your message was sent"
   menu:
     options: "Menu Options"
     information: "Information"
@@ -376,15 +389,6 @@ en:
     write: "Write your query ..."
     wrong: "There seems to be a problem with the search engine"
   settings:
-    error: "Some errors raised when saving your changes"
-    for: "Settings for"
-    main: "Settings"
-    manage:
-      name: "Admin Contacs"
-      briefing: "Settings contacts preferences"
-      explanation: "Change contacts permissions"
-    one: "Settings"
-    success: "Your settings where correctly changed"
     api_key:
       briefing: "Manage your API key"
       confirm: "Are you sure?"
@@ -392,6 +396,17 @@ en:
       explanation: "This is your API key"
       name: "API Key"
       regenerate: "Regenerate API key"
+    cancel_account:
+      briefing: "Lets you cancel your account"
+    email_change:
+      briefing: "Change your email"
+    error: "Some errors raised when saving your changes"
+    for: "Settings for"
+    main: "Settings"
+    manage:
+      name: "Admin Contacs"
+      briefing: "Settings for contacts"
+      explanation: "Change contacts permissions"
     notifications:
       briefing: "Settings about notifications behaviour and mail alerts"
       name: "Notifications"
@@ -399,6 +414,10 @@ en:
         name: "Send me an email when I receive a notification"
         always: "Always"
         never: "Never"
+    one: "Settings"
+    password_change:
+      briefing: "Change your password"
+    success: "Your settings where correctly changed"
   share: "Share"
   sign_in: "Sign in"
   sign_out: "Sign out"

data/config/locales/es.yml

@@ -19,6 +19,8 @@ es:
     attributes:
       contact:
         relation_ids: "El tipo de contacto"
+      relation/custom:
+        name: "Nombre"
       user:
         email: "Correo"
         name: "Nombre"
@@ -43,9 +45,14 @@ es:
     one: "Actividad"
     other: "Actividades"
     privacy:
-      contacts:
-        user: "Contactos de %{receiver}"
-        group: "Integrantes de %{receiver}"
+      myself:
+        contacts:
+          group: "Todos los integrantes"
+          user: "Tus contacts"
+      outside:
+        contacts:
+          group: "Integrantes de %{receiver}"
+          user: "Contactos de %{receiver}"
     sending: "Enviando"
     title: "Actividades"
     to_comment: "Comentar"
@@ -195,7 +202,7 @@ es:
     submit:
       relation_custom:
         create: "Guardar"
-        update: "Actualizar"
+        update: "Guardar"
   home: "Inicio"
   inbox:
     one: "Entrada"
@@ -219,15 +226,21 @@ es:
     base: "Estás aquí"
     separator: " > "
   mailboxer:
+    delete: "Borrar"
+    delete_confirm: "¿Quieres enviar '%{object}' a la papelera?"
     form:
       body: "Mensaje"
       recipients: "Para"
       subject: "Asunto"
+    mark_as_read: "Marcar como leido"
     message_mailer:
       subject_new: "%{subject}"
       subject_reply: "%{subject}"
     notification_mailer:
-      subject: "%{subject}"
+      subject: "%{subject}"    
+    reply: "Contestar"
+    send: "Enviar mensaje"
+    sent: "Tu mensaje fue enviado"
   menu:
     options: "Opciones"
     information: "Información"
@@ -371,11 +384,6 @@ es:
     write: "Escribe tu búsqueda..."
     wrong: "Parece que hay un problema con el motor de búsqueda"
   settings:
-    error: "Hubo errores al guardar los cambios"
-    for: "Ajustes para"
-    main: "Ajustes principales"
-    one: "Ajustes"
-    success: "Ajustes guardados con éxito"
     api_key:
       briefing: "Gestiona tu clave API"
       confirm: "¿Estás seguro?"
@@ -383,6 +391,17 @@ es:
       explanation: "Ésta es tu clave API"
       name: "Clave API"
       regenerate: "Regenerar clave API"
+    cancel_account:
+      briefing: "Te permite cancelar tu cuenta"
+    email_change:
+      briefing: "Cambia tu email"
+    error: "Hubo errores al guardar los cambios"
+    for: "Ajustes para"
+    main: "Ajustes"
+    manage:
+      name: "Administrar contactos"
+      briefing: "Ajustes de contactos"
+      explanation: "Cambiar los permisos de contactos"
     notifications:
       briefing: "Ajustes sobre notificaciones y alertas por correo"
       name: "Notificaciones"
@@ -390,6 +409,10 @@ es:
         name: "Mandarme un correo cuando me llega una notificación"
         always: "Siempre"
         never: "Nunca"
+    one: "Ajustes"
+    password_change:
+      briefing: "Cambia tu contraseña"
+    success: "Ajustes guardados con éxito"
   share: "Compartir"
   sign_in: "Entrar"
   sign_out: "Salir"

data/config/routes.rb

@@ -14,17 +14,6 @@ Rails.application.routes.draw do
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
   
-  ##API###
-  match 'api/keygen' => 'api#create_key', :as => :api_keygen
-  match 'api/user/:id' => 'api#users'
-  match 'api/me' => 'api#users'
-  match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
-  match 'api/me/contacts' => 'contacts#index', :format => 'json'
-  match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json'
-  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
-  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
-  ##/API##
-  
   # Webfinger
   match '.well-known/host-meta',:to => 'frontpage#host_meta'
   
@@ -87,4 +76,14 @@ Rails.application.routes.draw do
   (SocialStream.objects - [ :actor ]).each do |object|
     resources object.to_s.pluralize
   end
+  
+  ##API###
+  match 'api/keygen' => 'api#create_key', :as => :api_keygen
+  match 'api/user/:id' => 'api#users', :as => :api_user
+  match 'api/me' => 'api#users', :as => :api_me
+  match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
+  match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
+  match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
+  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom', :as => :api_user_activities
+  ##/API##
 end

data/lib/mailboxer/notification_decoder.rb

@@ -20,7 +20,7 @@ module Mailboxer
                                                     :receiver => truncate_name(activity.receiver.name)))
         notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
       end
-
+              
       if activity.direct_object.present?
         object = activity.direct_object
         object = object.subject if object.is_a? Actor
@@ -28,10 +28,19 @@ module Mailboxer
                                                                       url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
                                                                               :id=> object.id, :only_path => false)))
         notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
-        notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
+        
+        
+          
+        if object.respond_to? :text
+          notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
                                                                           url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
-                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text
-      
+                                                                                  :id=> object.id, :only_path => false))) 
+        elsif SocialStream.objects.include? :document and object.is_a? Document
+          notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.file_file_name.truncate(100, :separator =>' '), 
+                                                                          url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
+                                                                                  :id=> object.id, :only_path => false)))
+                  
+        end
         #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
       
       else

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.19".freeze
+    VERSION = "0.9.20".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +02:00
+date: 2011-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -628,7 +628,6 @@ files:
 - app/assets/images/mini-loading.gif
 - app/assets/images/right.png
 - app/assets/images/tipsy.gif
-- app/assets/images/title_background.png
 - app/assets/javascripts/activities.js.erb
 - app/assets/javascripts/contacts.js
 - app/assets/javascripts/conversations.js
@@ -793,6 +792,8 @@ files:
 - app/views/conversations/show.js.erb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/_delete_account.html.erb
+- app/views/devise/registrations/_edit_user.html.erb
 - app/views/devise/registrations/edit.html.erb
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
@@ -1062,7 +1063,6 @@ files:
 - vendor/assets/javascripts/jquery.watermarkinput.js
 - vendor/assets/javascripts/menu.js
 - vendor/assets/javascripts/superfish.js
-- vendor/assets/javascripts/ui.checkbox.js
 - vendor/assets/stylesheets/carousel.css
 - vendor/assets/stylesheets/chosen-sprite.png
 - vendor/assets/stylesheets/chosen.css