Improvements in contact new and edit

Marisayem · Jun 1, 2011 · f26dadc · f26dadc
1 parent 2021bbf
commit f26dadc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/app/models/actor.rb b/app/models/actor.rb
@@ -250,7 +250,7 @@ def suggestion(options = {})
 
   # Set of ties sent by this actor received by a
   def ties_to(a)
-    sent_ties.received_by(a)
+    sent_ties.received_by(a).intended
   end
 
   # Get the first of the ties created to a, or create a new one with the {Relation::Public}

diff --git a/app/models/tie.rb b/app/models/tie.rb
@@ -45,6 +45,8 @@
 #                        integer, array
 # replied:: ties having at least another tie in the other way, a tie from a to b
 #           is replied if there is a tie from b to a
+# intended:: ties can be desactivated by subjects when they change their connections.
+#            This scope gathers the active ones
 #
 class Tie < ActiveRecord::Base
   # Facilitates relation assigment along with find_relation callback
@@ -107,6 +109,8 @@ class Tie < ActiveRecord::Base
     joins(:relation).where('relations.type' => 'Relation::Public')
   }
 
+  scope :intended, where(:intended => true)
+
   validates_presence_of :sender_id, :receiver_id, :relation
 
   before_validation :find_or_build_relation

diff --git a/app/views/contacts/_form.html.erb b/app/views/contacts/_form.html.erb
@@ -55,9 +55,14 @@
                             </div>
                           </li>
                         <% end %>
-                        <% end %>
-                      </ul>
-                    </dd>
+                        </li>
+                      <% end %>
+                      <li class="new_sphere"><span class="sphere_name"><%= link_to t('contact.type.new'), spheres_path %></span></li>
+
+                    </ul>
+
+                  </dd>
+
                   </div>
                 </div>
               </div>

diff --git a/app/views/toolbar/_profile_menu_tie_options.html.erb b/app/views/toolbar/_profile_menu_tie_options.html.erb
@@ -12,13 +12,13 @@
     <% if current_subject.ties_to(subject).present? %>
       <li >
       <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
-                  t('tie.edit.contact', :type => current_subject.ties_to(subject).map(&:relation_name).join(", ")),
+                  current_subject.ties_to(subject).map(&:relation_name).join(", "),
                   edit_contact_path(subject.actor_id) %>
      </li>
     <% else %>
       <li >
       <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
-                  t('tie.add.contact'),
+                  t('contact.new.title'),
                   edit_contact_path(subject.actor_id),
                   :id => 'contacts_menu' %>
       </li>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -91,6 +91,8 @@ en:
       one: "Suggestion"
       other: "Suggestions"
       all: "All"
+    type:
+      new: "New type"
   copyright: "2010 Copyright - All rights reserved"
   days: Days
   delete:

diff --git a/lib/generators/social_stream/templates/public/stylesheets/default/contacts.css b/lib/generators/social_stream/templates/public/stylesheets/default/contacts.css
@@ -69,13 +69,13 @@ span.ui-radio-state-checked-hover {
 }
 
 
-li.sphere_name {
+li.sphere_name, li.new_sphere {
 	background-color: #1F4A75;
 	padding: 5px;
 	text-align: left;
 }
 
-span.sphere_name{
+span.sphere_name, span.sphere_name a{
 	color: white;
 }