social_stream 0.4.2 → 0.4.3

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

@@ -1,27 +1,56 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "addContact.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'addContact'%>
+<% end %> 
+
+<% toolbar :profile => @tie.receiver_subject, :option => 'contacts' %>
+
 <div class="dialog_add_tie" id="new_tie">
-    <div class="content_add_user" >
-      <div class="activity_add_ties">
-  
+  <div class="content_add_user" >
+    <div class="activity_add_ties">
+      
+		  <%= location(
+			  link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.new.title'), new_tie_path("tie[sender_id]" => @tie.sender.id, "tie[receiver_id]" => @tie.receiver.id),:remote => true)
+		  ) %>
+      
 	  	<%= form_for @tie do |f| %>  
-           	<%= f.hidden_field :receiver_id %>
-           	<%= f.hidden_field :sender_id %>
+        <%= f.hidden_field :receiver_id %>
+        <%= f.hidden_field :sender_id %>
+        <%= f.hidden_field :relation_name %>
         	   
 			<div class="block">
-				  <div class="close_add_contact">
-				  	<%=link_to('X','#', :id => "close_add_contact")%>
+        				  
+			  <div class="form_row center">
+			   <h2> <%= t('tie.new.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_tie_text_area" %>
 				  </div>
-				  <div class="form_row center">
-				    <h2> <%= t('tie.new.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_tie_text_area" %>
-						</div>
-		
-						<div class="form_column_right">
-							<div class="select_relations">
-						  		<%= f.select :relation_name, @tie.sender.relations.sort.map{ |r| [ r.name, r.name ] } %>
+          
+					<div class="form_column_right">
+					  <div class="select_relations">	
+							<div id="relationsSelect" class="dropdown">
+							<dt><a href="#"><span><%= t('tie.relation.one') %></span></a></dt>
+							<dd>                
+							  <ul>
+								<% (@tie.sender.relations.sort.map{ |r| [ r.name] }).each do |relationArray| %>
+								  <li><a href="#" class="option"><%=relationArray[0]%><span class="value"><%=relationArray[0]%></span></a></li>
+								<% end %>
+								  <li><a href="#" class="input_link">
+									 <span class="value"></span>
+									 <input type="text" class="input_select"/>
+										</a></li>
+							  </ul>
+							</dd>
+							  </div>
+							</div>
+							
+							<div id="relationPermissions">
+							  <p class="relationPermision"><input type="checkbox" class="checkbox_permission" name="tie[relation_permissions][]" value="<%= Permission.find_by_action_and_function_and_object("read","star_ties","activity").id%>"> <%= t('permissions.read.activity.star_ties', :user=> @tie.receiver.name) %></p>
+							  <p class="relationPermision"><input type="checkbox" class="checkbox_permission" name="tie[relation_permissions][]" value="<%= Permission.find_by_action("follow").id%>" checked="true"> <%= t('permissions.follow', :user=> @tie.receiver.name) %></p>
+							  <p class="relationPermision"><input type="checkbox" class="checkbox_permission" name="tie[relation_permissions][]" value="<%= Permission.find_by_action_and_function_and_object("create","tie","activity").id%>"> <%= t('permissions.create.activity.tie', :user=> @tie.receiver.name) %></p>
 							</div>
 						</div>
 					</div>

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

@@ -0,0 +1 @@
+<%= render :partial => 'ties/edit' %>

data/config/locales/en.yml

@@ -18,14 +18,22 @@ en:
     unlike: "Already I do not like"
     verb:
         follow:
-          title: "%{subject} added %{contact} as contact."
-          message: "%{name} added you as contact."
+          User:
+            title: "%{subject} added %{contact} as contact."
+            message: "%{name} added you as contact."
+          Group:
+            title: "%{subject} added %{contact} as contact."
+            message: "%{name} added you as contact."
         make-friend:
-          title: "%{subject} and %{contact} are now connected."
-          message: "%{name} also added you as contact."
+          User:
+            title: "%{subject} and %{contact} are now connected."
+            message: "%{name} also added you as contact."
+          Group:
+            title: "%{subject} added %{contact} as contact."
+            message: "%{name} added you as contact."
   avatar:
     crop_image: "Crop the uploaded image"
-    crop_submit: "Crop"
+    crop_submit: "Crop image"
     destroy: "Delete"
     destroy_sure: "Are you sure you wan't to delete the selected avatar?"
     error:
@@ -35,23 +43,31 @@ en:
     new: "Create a new avatar"
     new_short: "New avatar"
     no_avatars: "You haven't any avatar, plesase create a new one."
+    one: "Avatar"
+    other: "Avatars"
+    original: "Original image"
     preview: "Preview"
     profile_change: "Change your avatar"
     set_default: "Set as default"
     set_default_sure: "Are you sure you wan't to set this avatar as default?"
     upload: "Upload"
   browse: "Browse"
+  button:
+    cancel: "Cancel"
+    update: "Update"
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
   contact:
-    one: "Contact"
-    other: "Contacts"
     all_n: "All contacts (%{count})"
+    edit:
+      submit: "Edit Contact"
     new:
       link: "+ Add contact"
       title: "Add %{name} as contact"
-      submit: "+ Add contact"
+      submit: "Add Contact"
+    one: "Contact"
+    other: "Contacts"
   copyright: "2010 Copyright - All rights reserved"
   days: Days
   delete:
@@ -89,22 +105,6 @@ en:
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'
-  edit:
-    aboutme: "About me --NOTE: use profile.<class>.about"
-    actualcity: "Actual City --NOTE: use profile.actualcity"
-    address: "Address --NOTE: use profile.address"
-    birthday: "BirthDay --NOTE: use profile.<class>.birthday"
-    contact: "Contact information --NOTE: use profile.contact"
-    email: "E-mail --NOTE: use profile.email"
-    experience: "Experience --NOTE: use profile.experience"
-    fax: "Fax --NOTE: use profile.fax"
-    group_info: "Group information --NOTE: use profile.<class>.info"
-    mobile: "Mobile --NOTE: use profile.mobile"
-    organization: "Organization --NOTE: use profile.organization"
-    personal_info: "Personal information --NOTE: use profile.<class>.info"
-    phone: "Phone --NOTE: use profile.phone"
-    profile: "Edit profile"
-    website: "Website --NOTE: use profile.website"
   forgot_password: "Forgot you password?"
   frontpage:
     collaborate:
@@ -158,10 +158,12 @@ en:
     information: "Information"
     wall: "Wall"
   message:
+    answer: "Write your answer"
     inbox: "Inbox"
     new: "New Message"
     one: "Message"
     other: "Messages"
+    participants: "Participants"
     sentbox: "Sentbox"
     trash: "Trash"
     send: "Send a message"
@@ -201,6 +203,17 @@ en:
   service:
     one: "Service"
     other: "Services"
+  permissions:
+    read:
+      activity:
+        star_ties: "Allow %{user} to read my wall"
+      tie:
+        weak_star_ties: "Not defined"
+    follow: "Follow %{user}"
+    create: 
+         activity:
+             tie: "Allow %{user} to write in my wall"
+             weak_ties: "Not defined"
   products:
     one: "Product"
     other: "Products"
@@ -212,14 +225,16 @@ en:
   tie:
     add:
       bookmark: "Bookmark"
-      contact: "Add contact as"
+      contact: "Add contact as..."
       follow: "Follow"
       like: "Like"
       partner: "Add Partner"
-    category:
-      new: "New category"
+    relation:
+      one: "Contact type"
+      new: "New type"
     edit:
       contact: "Contact: %{type}"
+      title: "Edit Contact"
     new:
       title: "Add New Contact"
     pending:

data/config/routes.rb

@@ -12,12 +12,6 @@ Rails.application.routes.draw do
   match 'api/user/:id/home' => 'api#activity_atom_feed', :format => 'atom'
   ##/API##
   
-  # PubSubHubBub
-  match 'pshb/callback' => 'pshb#callback', :as => :pshb_callback
-  # Test
-  match 'pshb/test_s' => 'pshb#pshb_subscription_request'
-  match 'pshb/test_p' => 'pshb#pshb_publish'
-   
   # Webfinger
   match '.well-known/host-meta',:to => 'frontpage#host_meta'
   

data/lib/generators/social_stream/templates/public/javascripts/addContact.js

@@ -0,0 +1,100 @@
+$(document).ready(function() {
+	
+$("#relationPermissions").hide();
+
+$(".dropdown dt a").click(function() {
+	$(".dropdown dd ul").toggle();
+});
+        
+$(".dropdown dd ul li a.option").click(function() {
+	var text = $(this).html();
+	$(".dropdown dt a span").html(text);
+	$(".dropdown dd ul").hide();
+	$('input[name$="tie[relation_name]"]').val(getSelectedValue("relationsSelect"));
+});
+
+
+$('input.input_select').click(function() {
+	return false;
+});
+
+$(".dropdown dd ul li a.input_link").click(function() {
+	var text = $('input.input_select').val();
+	setSelectedValue(text);
+
+});
+        
+function getSelectedValue(id) {
+	$("#relationPermissions").hide();
+	return $("#" + id).find("dt a span.value").html();
+}
+
+function setSelectedValue(text){
+	if(validate_value_for_input(text)){
+		$('input[name$="tie[relation_name]"]').val(text);
+	    $(".dropdown dt a span").html(text);
+		$("#relationPermissions").show();
+	}
+	$(".dropdown dd ul").hide();
+}
+
+function validate_value_for_input(value){
+	var result = true;
+	
+	if (value.trim()=="") {
+		result = false;
+	}
+	
+	var constantOptions = $(".dropdown dd ul li a.option");
+	$.each(constantOptions, function(index, item) { 
+		if(item.text==value){
+			result = false;
+		}
+		if(item.text==value.trim()){
+			result = false;
+		}
+	});
+
+	return result;
+}
+
+function isConstantOptionSelected(){
+	var selected = $(".dropdown dt a span.value").text();
+	var constantOptions = $(".dropdown dd ul li a.option");
+	var result = false;
+
+	$.each(constantOptions, function(index, item) { 
+		if(item.text==selected){
+			result = true;
+		}
+	});
+
+	return result;
+}
+
+
+$(document).bind('click', function(e) {
+	var $clicked = $(e.target);
+	if (! $clicked.parents().hasClass("dropdown")){
+	//If any previous option selected...
+		if(!isConstantOptionSelected()){
+			var text = $('input.input_select').val();
+		    	setSelectedValue(text);
+		}else{
+			$(".dropdown dd ul").hide();
+		}
+	}
+});
+
+
+$('input.input_select').bind('keypress', function(e) {
+
+	if (e.which == '13') {
+	     //Case: Intro key 
+	     setSelectedValue($(this).val());
+	     return false;
+	   }
+
+	});
+	
+});

data/lib/generators/social_stream/templates/public/javascripts/avatars.js

@@ -0,0 +1,8 @@
+$(document).ready( function() {
+  //Full Caption Sliding (Hidden to Visible)
+  $('.boxgrid.captionfull').hover( function() {
+    $(".cover", this).stop().animate({top:'61px'},{queue:false,duration:160});
+  }, function() {
+    $(".cover", this).stop().animate({top:'104px'},{queue:false,duration:160});
+  });
+});

data/lib/generators/social_stream/templates/public/javascripts/hoverIntent.js

@@ -0,0 +1,84 @@
+(function($){
+	/* hoverIntent by Brian Cherne */
+	$.fn.hoverIntent = function(f,g) {
+		// default configuration options
+		var cfg = {
+			sensitivity: 7,
+			interval: 100,
+			timeout: 0
+		};
+		// override configuration options with user supplied object
+		cfg = $.extend(cfg, g ? { over: f, out: g } : f );
+
+		// instantiate variables
+		// cX, cY = current X and Y position of mouse, updated by mousemove event
+		// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
+		var cX, cY, pX, pY;
+
+		// A private function for getting mouse position
+		var track = function(ev) {
+			cX = ev.pageX;
+			cY = ev.pageY;
+		};
+
+		// A private function for comparing current and previous mouse position
+		var compare = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			// compare mouse positions to see if they've crossed the threshold
+			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+				$(ob).unbind("mousemove",track);
+				// set hoverIntent state to true (so mouseOut can be called)
+				ob.hoverIntent_s = 1;
+				return cfg.over.apply(ob,[ev]);
+			} else {
+				// set previous coordinates for next time
+				pX = cX; pY = cY;
+				// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
+				ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
+			}
+		};
+
+		// A private function for delaying the mouseOut function
+		var delay = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			ob.hoverIntent_s = 0;
+			return cfg.out.apply(ob,[ev]);
+		};
+
+		// A private function for handling mouse 'hovering'
+		var handleHover = function(e) {
+			// next three lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
+			var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
+			while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
+			if ( p == this ) { return false; }
+
+			// copy objects to be passed into t (required for event object to be passed in IE)
+			var ev = jQuery.extend({},e);
+			var ob = this;
+
+			// cancel hoverIntent timer if it exists
+			if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
+
+			// else e.type == "onmouseover"
+			if (e.type == "mouseover") {
+				// set "previous" X and Y position based on initial entry point
+				pX = ev.pageX; pY = ev.pageY;
+				// update "current" X and Y position based on mousemove
+				$(ob).bind("mousemove",track);
+				// start polling interval (self-calling timeout) to compare mouse coordinates over time
+				if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
+
+			// else e.type == "onmouseout"
+			} else {
+				// unbind expensive mousemove event
+				$(ob).unbind("mousemove",track);
+				// if hoverIntent state is true, then call the mouseOut function after the specified delay
+				if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
+			}
+		};
+
+		// bind the function to the two event listeners
+		return this.mouseover(handleHover).mouseout(handleHover);
+	};
+	
+})(jQuery);

data/lib/generators/social_stream/templates/public/javascripts/main.js

@@ -1,8 +1,17 @@
 // initialise plugins
 jQuery(function(){
-jQuery('ul.sf-menu').superfish();
+jQuery('ul.sf-menu').superfish({
+        delay:       1000,                            // one second delay on mouseout
+        animation:   {height:'show'},  // fade-in and slide-down animation
+        speed:       'fast',                          // faster animation speed
+        autoArrows:  false,
+        dropShadows: false                            // disable drop shadows
 });
 
+});
+
+
+
 $(document).ready(function() {
 $('#tabright> ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
 });