social_stream-base 0.5.2 → 0.6.0

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

@@ -20,58 +20,37 @@
   } 
 <% end %>
 
-<div class="dialog_add_contact" id="new_contact">
-  <div class="content_add_user" >
-    <div class="activity_add_contact">
-      
-      <%= form_for @contact, :url => contact_path(@contact.to_param), :html => { :method => :put } do |f| %>  
-        <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>
-        	   
-        <div class="block">
-          <div class="form_row center">
-            <h2><%= t("contact.#{ controller.action_name }.title") %></h2>
-          </div>	
-
-          <div class="two_columns_container">
-            <div class="form_column_left">
-              <p class="colum_field_title"><%= t('message.one') %></p>
-              <%= f.text_area :message, :class =>"new_contact_text_area" %>
-            </div>
-          
-            <div class="form_column_right">
-              <div class="select_relations">	
-                <div id="relationsSelect" class="dropdown">
-                  <dd>
-                    <ul>
-                      <% @contact.sender.spheres.each do |sphere| %>
-                        <li class="sphere_name"><span class="sphere_name"><%= sphere.name %></span></li>
-                        <% sphere.customs.sort.each do |relation| %>
-                          <li>
-                            <div contain="<%= dom_id relation %>">
-                              <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" optionOf="<%= sphere.name %>" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
-                              <label for="<%= dom_id relation %>">
-                                <%= relation.name %>
-                              </label>
-                            </div>
-                          </li>
-                        <% end %>
-                        </li>
-                      <% end %>
-                      <li class="new_sphere"><span class="sphere_name"><%= link_to t('contact.type.new'), spheres_path %></span></li>
+<div id="contact-form">
+  <%= form_for @contact do |f| %>
+    <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>
+
+    <% current_subject.spheres.each do |sphere| %>
+      <div class="sphere-name"><%= sphere.name %></div>
+      <ul>
+      <% sphere.customs.sort.each do |relation| %>
+        <li>
+          <div contain="<%= dom_id relation %>">
+            <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" optionOf="<%= sphere.name %>" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
+            <label for="<%= dom_id relation %>">
+              <%= relation.name %>
+            </label>
+          </div>
+        </li>
+      <% end %>
+      </ul>
+    <% end %>
 
-                    </ul>
+    <div id="contact-new">
+      <%= link_to t('contact.type.new'), spheres_path %>
+    </div>
 
-                  </dd>
+    <div id="contact-message">
+      <%= f.label :message %>
+      <%= f.text_area :message, :class =>"new_contact_text_area" %>
+    </div>
 
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="form_bottom">
-              <%= submit_tag t("contact.#{ controller.action_name }.submit"), :class => "button" %>
-            </div>
-          </div>
-        <% end %>
-      </div>
+    <div id="contact-submit">
+      <%= submit_tag t("contact.#{ controller.action_name }.submit"), :class => "button" %>
     </div>
+  <% end %>
 </div>

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

@@ -29,5 +29,5 @@
 <% end %>
 
 <div class="row">
-  <%= will_paginate @contacts %>
+  <%= paginate @contacts %>
 </div>

data/app/views/contacts/edit.html.erb

@@ -1,5 +1,6 @@
 <% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
+
 <% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
-                    t('contact.edit.title'), edit_contact_path(@contact.to_param)) %>
+                    t('contact.edit.title', :name => @contact.receiver.name), edit_contact_path(@contact.to_param)) %>
 
 <%= render :partial => 'form' %>

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

@@ -17,7 +17,7 @@
     <div class="space_center"></div>
     <div class="row" >
       <div class="center">
-        <%= link_to t('contact.all_n', :count => current_subject.contacts(:direction => :sent).count), contacts_path %> -
+        <%= link_to t('contact.all_n', :count => current_subject.contact_subjects(:direction => :sent).count), contacts_path %> -
         <% Actor.distinct_initials.
                  contacted_from(current_subject).
                  merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).

data/app/views/contacts/new.html.erb

@@ -1,5 +1,5 @@
 <% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
 <% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
-                    t('contact.new.title'), new_contact_path(:id => @contact.to_param)) %>
+                    t('contact.new.title', :name => @contact.receiver.name), new_contact_path(:id => @contact.to_param)) %>
 
 <%= render :partial => 'form' %>

data/app/views/conversations/_conversation.html.erb

@@ -26,6 +26,7 @@
 </div>
 <% unless @box.eql?'trash' %>
 <div class="action">
+  <% link_to(image_tag('btn/btn_read.png', :alt => "Mark as read", :title => "Mark as read")) %>
 	<%= link_to(image_tag('btn/btn_delete.png', :alt => "Delete", :title => "Delete"),
 	conversation_path(conversation, :location => @box, :box => @box, :page => params[:page]),
 	:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',

data/app/views/conversations/_conversation_full.html.erb

@@ -2,7 +2,7 @@
 	<h2><%= conversation.subject %></h2>
 </div>
 <div class="action">
-	<% unless @box.eql?'trash' %><%= link_to ( image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"),
+	<% unless @box.eql?'trash' %><%= link_to(image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"),
 	conversation_path(conversation, :location => 'conversation', :box => @box),
 	:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',
 	:method => :delete, :remote => true) %><% end %>
@@ -12,7 +12,7 @@
 <div class="participants">
 	<h3><%= t("message.participants") %>:</h3>
 	<% conversation.recipients.each do |recp| %>
-	<%= link_to image_tag(recp.logo.url(:tie), :title=>recp.name, :alt => recp.name), recp.subject %>
+	<%= link_to image_tag(recp.logo.url(:contact), :title=>recp.name, :alt => recp.name), recp.subject %>
 	<% end %>
 </div>
 <div class="messages">
@@ -24,7 +24,7 @@
 
 	<% unless @box.eql?'trash' %>
 	<br>
-	<%= form_tag conversation_path(conversation.id), :method => :put, :class => "cont_conversation" do %>
+	<%= form_tag conversation_path(conversation), :method => :put, :class => "cont_conversation" do %>
 	<% if @receipt and @receipt.errors.any? %>
 		<div class="error">
 			<h2><%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:</h2>

data/app/views/conversations/_conversations.html.erb

@@ -2,4 +2,4 @@
 	<% read_class = conversation.is_unread?(@actor) ? 'unread' : '' %>
 	<%= render :partial => 'conversation', :object => conversation, :locals => {:read_class => read_class} %>
 <% end %>
-<%= will_paginate @conversations %>
+<%= paginate @conversations %>

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

@@ -1,16 +1,16 @@
 <div id="login">
-  <h2><%= t('password.update') %></h2>
+  <h2><%= t('devise.passwords.update') %></h2>
   <div class="space_height">
   </div>
   <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
     <%= devise_error_messages! %>
     <%= f.hidden_field :reset_password_token %>
     <div class="line">
-      <div class="label"><%= f.label t('password.default') %></div>
+      <div class="label"><%= f.label :password %></div>
       <div class="field"><%= f.password_field :password, :class =>"field_x" %></div>
     </div>
     <div class="line">
-      <div class="label"><%= f.label t('password.confirmation') %></div>
+      <div class="label"><%= f.label :password_confirmation %></div>
       <div class="field"><%= f.password_field :password_confirmation, :class =>"field_x" %></div>
     </div>
     <div class="space_height"></div>

data/app/views/devise/passwords/new.html.erb

@@ -7,6 +7,9 @@
       <%= devise_error_messages! %>
       <div class="form_row"><%=t('devise.passwords.field')  %></div>
       <div class="form_row"><%= f.text_field :email %></div>
+
+      <%= render :partial => "devise/shared/links" %>
+
       <div class="space_center"></div>
       <div class="btn_login">
         <%= f.submit t('action.send'), :class =>"myButton" %>

data/app/views/devise/sessions/new.html.erb

@@ -22,9 +22,12 @@
         <% end -%>
       </div>
 
+      <%= render :partial => "devise/shared/links" %>
+
       <div class="btn_login">
         <%= f.submit t('action.send'), :class =>"myButton" %>
       </div>
     <% end %>
   </div>
+
 </div>

data/app/views/frontpage/_header.html.erb

@@ -1,6 +1,6 @@
 <div id="headerFront">
   <div class="banner_top">
-    <div id="logo"><%= link_to(image_tag('/images/logo.png', :alt => t('socialstream')), '/'); %></div>
+    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('socialstream')), '/'); %></div>
     <div class="div_login">
       <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
         <span><%= f.label :email %></span>
@@ -14,9 +14,9 @@
         <span>|</span>
         <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
         <span>|</span>
-        <%= link_to image_tag('/images/btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
+        <%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
      
-        <%= link_to image_tag('/images/btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
+        <%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
       </div>
     </div>
   <br class="clearfloat" />

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

@@ -62,7 +62,7 @@
   <div class="espacio"></div>
 
   <div id="join_form">
-      <%= link_to image_tag("/images/frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
+      <%= link_to image_tag("frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
   </div>
 </div>
 

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

@@ -31,5 +31,5 @@
 		</div>
 <% end %>
 <div class="row">
-  <%= will_paginate @groups %>
+  <%= paginate @groups %>
 </div>

data/app/views/groups/_new.html.erb

@@ -10,7 +10,6 @@
   $("#group__participants").fcbkcomplete({
     json_url: "<%= contacts_path(:format => :json) %>",
 		cache: true,
-		filter_case: true,
 		filter_hide: true,
 		newel: false,
 		height: 6

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

@@ -18,5 +18,5 @@
 <% end %>
 
 <%= render :partial => "activities/index",
-           :locals => { :activities => current_subject.wall(:home).paginate(:page => params[:page]),
+           :locals => { :activities => current_subject.wall(:home).page(params[:page]),
                         :owner => current_subject } %>

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -0,0 +1,40 @@
+<div>
+  <div><%= @sender.name %> has invited you to <%= link_to( t('socialstream'), new_user_registration_path)%>
+    <div><%= @message%></div>
+  </div>
+  <div>
+    <div>
+      <%= t('frontpage.share.default')%>
+    </div>
+    <div>
+      <ul>
+        <li><%= t('frontpage.share.sentence1') %></li>
+        <li><%= t('frontpage.share.sentence2') %></li>
+      </ul>
+    </div>
+  </div>
+  
+  <div>
+    <div>
+      <%= t('frontpage.meet.default')%>
+    </div>
+    <div>
+      <ul>
+        <li><%= t('frontpage.meet.sentence1') %></li>
+      </ul>
+    </div>
+  </div>
+
+  <div>
+    <div>
+      <%= t('frontpage.collaborate.default')%>
+    </div>
+    <div>
+      <ul>
+        <li><%= t('frontpage.collaborate.sentence1') %></li>
+        <li><%= t('frontpage.collaborate.sentence2') %></li>
+      </ul>
+    </div>
+  </div>
+</div>
+

data/app/views/invitation_mailer/send_invitation.text.erb

@@ -0,0 +1,15 @@
+<%= @sender.name %> has invited you to <%= link_to( t('socialstream'), new_user_registration_path)%>
+"<%= @message%>"
+
+<%= t('frontpage.main_title') %>
+
+<%= t('frontpage.share.default')%>:
+<%= t('frontpage.share.sentence1') %>
+<%= t('frontpage.share.sentence2') %>
+
+<%= t('frontpage.meet.default')%>:
+<%= t('frontpage.meet.sentence1') %>
+
+<%= t('frontpage.collaborate.default')%>:
+<%= t('frontpage.collaborate.sentence1') %>
+<%= t('frontpage.collaborate.sentence2') %>

data/app/views/invitations/_new.html.erb

@@ -0,0 +1,35 @@
+<% content_for :javascript do %>
+  $(function() {
+     $(".invitation_form").validate();
+  });
+<% end %>
+
+<br class="clearfloat" />
+<div class="space_center"></div>
+<div class="space_center"></div>
+
+<h2><%=t('invitation.other')%></h2>
+
+<%= form_tag invitations_path, :method=> :post, :class => "invitation_form"  do %>
+  <div class="block">   
+    <h3 class= "form_row"><%=t('invitation.join')%></h3>
+    <div class="form_row form_label ">
+      <%= label_tag t('invitation.e-mails')%>
+      <span class= "form_comment">(Separated by commas)</span>
+    </div>
+
+    <div class="form_row">
+      <%= text_field_tag 'mails', nil, :class => "required form_tag" %>
+    </div>  
+    <div class="form_row form_label">
+      <%=t('invitation.text')%>
+    </div>
+    <div class="form_row">
+      <%= text_area_tag 'message', nil, :class => "form_tag", :maxlength => 500, :rows => 10 %>
+    </div>
+  </div>
+  
+  <div class="form_row space_center">
+    <%= submit_tag t('action.send'), :class => "button" %>
+  </div>
+<%end%>

data/app/views/invitations/new.html.erb

@@ -0,0 +1,16 @@
+<% toolbar  %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => "home/sidebar" %>
+<% end %>
+
+<% content_for :headers do %>
+  <%= javascript_include_tag 'jquery.validate' %>
+  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
+<% end %>
+
+<%= location(
+  link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
+) %>
+
+<%= render :partial => 'new' %>

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

@@ -1,16 +1,18 @@
-<ul class="sf-menu" >
-  <li class="current" id="account">
-    <a href="#" class="sf-with-ul" id="btn_menu_config"><%= t('account.one') %><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-      <li>
-        <%= link_to t('account.settings'), edit_user_registration_path %>
-      </li>
-      <li>
-        <%= link_to t('account.notifications'), '#' %>
-      </li>
-      <li class="current">
-        <%= link_to t('account.privacy'), spheres_path %>
-      </li>
+<div id="account_menu">
+    <ul class="sf-menu" >
+        <li class="current" id="account">
+            <a href="#" class="sf-with-ul" id="btn_menu_account">
+            <%= t('account.one') %>
+            <span class="sf-sub-indicator"> »</span>
+            </a>
+            <ul>
+                <li>
+                    <%= link_to t('account.edit'), edit_user_registration_path %>
+                </li>
+                <li class="btn_menu_exit">
+                    <%= link_to t('sign_out'), destroy_user_session_path, :id => "btn_menu_account_logout"  %>
+                </li>
+            </ul>
+        </li>
     </ul>
-  </li>
-</ul>
+</div>

data/app/views/layouts/_header.erb

@@ -21,19 +21,21 @@
     </div>
     <div id="header_right">
        <% if user_signed_in? %>
-        <%= render :partial => 'layouts/account' %>
+        <%= render :partial => 'layouts/representation' %>
         <div class="menu_list menu_white" id="menu_pipe" >
           <ul>
             <li class="pipe">|</li>
           </ul>
         </div>
-        <%= render :partial => 'layouts/representation' %>
-        <div class="menu_list menu_white" id="menu_account">
+        <%= render :partial => 'layouts/settings' %>
+        
+        <div class="menu_list menu_white" id="menu_pipe" >
           <ul>
             <li class="pipe">|</li>
-            <li class="btn_menu_exit"><%= link_to t('sign_out'), destroy_user_session_path %></li>
           </ul>
         </div>
+        <%= render :partial => 'layouts/account' %>
+
       <% end %>
     </div>
   </div>

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

@@ -1,5 +1,9 @@
 <div id="current_user_info">
-  <%= link_to(image_tag(current_user.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon'), current_user) %>
+  <% if current_user == current_subject %>
+    <%= link_to(image_tag(current_user.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon', :id=> 'current_user_avatar_img'), current_user) %>
+  <% else %>
+    <%= link_to(image_tag(current_user.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon'), current_user) %>
+  <% end %> 
   <%= link_to(current_user.name, current_user) %>
 
   <%= t('representation.action') %>
@@ -10,11 +14,11 @@
 <div id="representations_menu">
   <ul class="sf-menu" >
     <li id="representation_li">
-      <a href="#" class="sf-with-ul" style="background: transparent url('<%= current_subject.logo.url(:representation)%>') no-repeat left top;"><%= current_subject.name %><span class="sf-sub-indicator"> »</span></a>
+      <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;"><%= current_subject.name %><span class="sf-sub-indicator"> »</span></a>
       <ul>
         <% representations.each do |representation| %>
         <li>
-        <%= link_to representation.name, { :s => representation.slug }, { :style => "background: transparent url('#{representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+        <%= link_to representation.name, { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
        </li>
         <% end %>
       </ul>

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

@@ -0,0 +1,18 @@
+<div id="settings_menu">
+    <ul class="sf-menu" >
+        <li class="current" id="account">
+            <a href="#" class="sf-with-ul" id="btn_menu_settings">
+            <%= t('settings.one') %>
+            <span class="sf-sub-indicator"> »</span>
+            </a>
+            <ul>
+                <li>
+                    <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
+                </li>
+                <li class="current">
+                    <%= link_to t('account.privacy'), spheres_path %>
+                </li>
+            </ul>
+        </li>
+    </ul>
+</div>

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

@@ -8,11 +8,12 @@
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
     <%= stylesheet_link_tag "base", "header","home","footer",
                              :media => "screen, projection" %>
-    <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'ui.dropdownchecklist'%>
+    <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'ui.dropdownchecklist','modernizr.min'%>
 
     <%= yield :headers %>
 
-    <link rel="shortcut icon" href="/images/icons/favicon.ico" />
+    <%= favicon_link_tag "icons/favicon.ico" %>
+
     <% if protect_against_forgery? %>
       <%= csrf_meta_tag %>
     <% end %>

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

@@ -9,7 +9,9 @@
     <%= stylesheet_link_tag "header","frontpage", "base", "footer",
                             :media => "screen, projection" %>
     <%= javascript_include_tag 'jquery', 'jquery.livequery' %>
-    <link rel="shortcut icon" href="/images/icons/favicon.ico" />
+
+    <%= favicon_link_tag "icons/favicon.ico" %>
+
     <% if protect_against_forgery? %>
       <%= csrf_meta_tag %>
     <% end %>

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

@@ -18,7 +18,6 @@
 	var recipients = $("#_recipients").fcbkcomplete({
                 json_url: "<%= contacts_path(:format => :json) %>",
 		cache: true,
-		filter_case: true,
 		filter_hide: true,
 		newel: false,
 		height: 6

data/app/views/messages/new.js.erb

@@ -11,7 +11,6 @@ $("head").append($("<%= escape_javascript(javascript_include_tag 'jquery.fcbkcom
 var recipients = $("#_recipients").fcbkcomplete({
         json_url: "<%= contacts_path(:format => :json) %>",
 	cache: true,
-	filter_case: true,
 	filter_hide: true,
 	newel: false,
 	height: 6

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

@@ -16,6 +16,6 @@
     <% read_class = notification.is_unread?(@actor) ? 'unread' : '' %>
     <%= render :partial => 'notification', :object => notification, :locals => {:read_class => read_class} %>
   <% end %>
-  <%= will_paginate @notifications %>
+  <%= paginate @notifications %>
 </div>
 

data/app/views/notifications/_notification.html.erb

@@ -1,16 +1,12 @@
 <%= div_for(notification, :class => read_class + ' conversation') do %>
 
-<div class="notification">
-</div>
+<div class="notification"></div>
 <div class="sender_photo">
-  <%= link_to image_tag(current_subject.logo.url(:actor),
-  :title => current_subject.name, :alt => current_subject.name),
-  current_subject %>
+  <%= link_to image_tag(notification.object.sender.logo.url(:actor),
+      :title => notification.object.sender.name, :alt => notification.object.sender.name),
+      notification.object.sender.subject %>
 </div>
 <div class="content_left">
-  <div class="sender_name">
-    <%#= link_to conversation.last_sender.name, conversation.last_sender.subject %>
-  </div>
   <div class="date">
     <%= t('time.ago', :time => time_ago_in_words(notification.created_at)) %>
   </div>
@@ -25,22 +21,18 @@
   <div class="clearfloat">
   </div>
 </div>
-<div class="action">
-  <% if notification.is_unread?(current_subject) %>
-    <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => t('notification.read'), 
+<div class="action">  
+  <% if notification.is_unread?(@actor) %>
+    <%= link_to(image_tag('btn/btn_notification_read.png', :alt => t('notification.read'), 
         :title => t('notification.read')), notification_path(notification, :page => params[:page], :read => "Read"),
         :method => :put, :remote => true) %>
-  <% else%>
-    <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => t('notification.unread'), 
-        :title => t('notification.unread')), notification_path(notification, :page => params[:page], :read => "Unread"),
-        :method => :put, :remote => true) %>
   <% end%>
-</div>
-<div class="action">  
+  
   <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => "Delete", :title => "Delete"),
   notification_path(notification, :page => params[:page]),
-  :confirm => 'Do you want to delete "' + notification.subject,
+  :confirm => t('notification.destroy_sure'),
   :method => :delete, :remote => true) %>
+
 </div>
 <div class="clearfloat">
 </div>

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

@@ -11,7 +11,7 @@
 <% end %>
 
 <%= location(
-    link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)
+    link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true) +' ('+@mailbox.notifications.not_trashed.unread.count.to_s+')'
 ) %>
 
 <% toolbar  %>

data/app/views/objects/_new.html.erb

@@ -0,0 +1,14 @@
+<% object._contact_id = current_subject.contact_to!(receiver).id %>
+<% remote = true if remote.nil? %>
+
+<%= form_for object, :remote => remote  do |f| %>
+  <%= f.hidden_field :_contact_id %>
+
+  <%= render :partial => object.class.to_s.tableize+'/fields' , :locals => {:f => f} %>	
+
+  <% if current_subject != receiver %>
+    <% receiver.activity_relations(current_subject, :from => :receiver).each do |r| %>
+      <%= f.hidden_field "_relation_ids][", :value => r.id %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -34,9 +34,3 @@
     <% end %>
   </div>
 </div>
-
-<%= javascript_tag do %>
-  $(function() {
-    initPrivacyRules();
-  })
-<% end %>