social_stream 0.4.1 → 0.4.2

data/app/views/{logos → avatars}/new.html.erb

@@ -3,18 +3,14 @@
 	<%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
     <%= stylesheet_link_tag "logos", :media => "screen, projection" %>
 <%end%>
-<h1>Create a new logo</h1>
-<% if current_subject.blank? %>
-LOGUEATE
-<% else %>
-
-<% if !@logo.logo.errors['precrop'].blank? %>
+<% toolbar :profile => current_subject %>
+<div id="content_logo">
+<% if !@avatar.logo.errors['precrop'].blank? %>
+	<h1><%= t('avatar.crop_image') %></h1>
 	<%= render :partial => 'precrop' %>
 <% else %>
+	<h1><%= t('avatar.new') %></h1>
 	<%= render :partial => 'form' %>
 <% end %>
-
-<%= link_to 'Back', logos_path %>
-
-
-<% end %>
+</div>
+<% link_to 'Back', avatars_path %>

data/app/views/avatars/show.html.erb

@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+
+
+<%= link_to 'Edit', edit_avatar_path(@avatar) %> |
+<%= link_to 'Back', avatars_path %>

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

@@ -0,0 +1,33 @@
+<% cont=0; %>
+
+<% @contacts.each do |contact| %>
+
+  <% if (cont%2) == 0 %>
+    <% cont+=1; %>
+     <div class="row">
+  <% end %>
+
+  <div class="label">
+    <div class="logo">
+      <%= link_to image_tag(contact.logo.url , :size => "50x50", :alt => contact.name), contact %>
+    </div>
+    <div class="sub-block">
+      <div class="name black" >
+        <%=link_to(contact.name, contact)%>
+      </div>
+      <div class="link">
+        <%= ties_to(contact) %>
+      </div>
+    </div>
+  </div>
+<% end %>
+
+<% if ((cont%2) != 0) 	%>
+  <div class="label">
+  </div>
+		</div>
+<% end %>
+
+<div class="row">
+  <%= will_paginate @contacts %>
+</div>

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

@@ -1,2 +1,35 @@
-<h1>Contacts#index</h1>
-<p>Find me in app/views/contacts/index.html.erb</p>
+<% content_for :headers do %>
+  <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
+<% end %>
+
+<% toolbar %>
+
+<div id="my_conferences">
+  <div id="contacts" class="block">
+    <div class="search_field_wrapper">
+      <input type="text" value="Search by name" id="search_field" class="search_input" />
+      <%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
+    </div>
+    <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 %> -
+        <% Actor.distinct_initials.
+                 contacted_from(current_subject).
+                 merge(Tie.original.related_by(current_subject.relations.find_by_id(params[:relation]))).
+                 distinct_initials.
+                 each do |l| %>
+          <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>
+        <% end %>
+      </div>
+    </div>
+    <div class="space_center"></div>
+    <div id="list_contacts_ajax" class="tab_content block">
+      <%= render :partial => "contacts/index"%>
+    </div>
+    <div class="space_center"></div>
+  </div>
+</div>
+
+
+<div class="space_center"></div>

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

@@ -0,0 +1 @@
+$('#list_contacts_ajax').html("<%= escape_javascript(render :partial => "contacts/index") %>");

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

@@ -0,0 +1,37 @@
+<%= div_for(conversation, :class => read_class) do %>
+<div class="notification">
+</div>
+<div class="sender_photo">
+	<%= link_to image_tag(conversation.last_sender.logo.url(:actor),
+	:title => conversation.last_sender.name, :alt => conversation.last_sender.name),
+	conversation.last_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(conversation.updated_at)) %>
+	</div>
+</div>
+<div class="content_right">
+	<div class="subject">
+		<%= link_to(truncate(conversation.subject, :length => 55), conversation_path(conversation.id,:box => @box,:page => params[:page])) %>
+	</div>
+	<div class="briefing">
+		<%= raw(truncate(strip_tags(conversation.last_message.body), :length => 50)) %>
+	</div>
+	<div class="clearfloat">
+	</div>
+</div>
+<% unless @box.eql?'trash' %>
+<div class="action">
+	<%= link_to(image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"),
+	conversation_path(conversation, :location => @box, :box => @box, :page => params[:page]),
+	:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',
+	:method => :delete, :remote => true) %>
+</div>
+<% end %>
+<div class="clearfloat">
+</div>
+<% end %>

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

@@ -0,0 +1,52 @@
+<div class="title">
+	<h2><%= conversation.subject %></h2>
+</div>
+<div class="action">
+	<% 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 %>
+</div>
+<div class="clearfloat">
+</div>
+<div class="participants">
+	<% conversation.recipients.each do |recp| %>
+	<%= link_to image_tag(recp.logo.url(:tie), :title=>recp.name, :alt => recp.name), recp.subject %>
+	<% end %>
+</div>
+<div class="messages">
+	<% @receipts.each do |receipt| %>
+	<% message = receipt.message %>
+	<% read_class = message.is_unread?(@actor) ? 'unread' : '' %>
+	<%= render :partial => "messages/message",:object => message, :locals => {:read_class => read_class} %>
+	<% end %>
+
+	<% unless @box.eql?'trash' %>
+	<br>
+	<%= form_tag conversation_path(conversation.id), :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>
+			<ul>
+				<% @receipt.errors.full_messages.each do |msg| %>
+				<li>
+					<%= msg %>
+				</li>
+				<% end %>
+			</ul>
+		</div>
+	<% end %>
+		<div class="block">
+		<div class="form_row">
+			Write your answer:
+		</div>
+		<div class="form_row">
+			<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
+		</div>
+		<div class="actions center">
+			<%= submit_tag "Reply", :name => :reply_all,:class => "button" %>
+		</div>
+	</div>
+	<% end %>
+	<%end %>
+</div>

data/app/views/{messages → conversations}/_conversations.html.erb

@@ -1,4 +1,5 @@
 <% @conversations.each do |conversation| %>
-	<%= render :partial => 'conversation', :object => conversation, :locals => {:active => cycle("active","inactive")} %>
+	<% read_class = conversation.is_unread?(@actor) ? 'unread' : '' %>
+	<%= render :partial => 'conversation', :object => conversation, :locals => {:read_class => read_class} %>
 <% end %>
 <%= will_paginate @conversations %>

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

@@ -0,0 +1,23 @@
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
+
+<%= location(
+	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
+) %>
+
+
+<% content_for :javascript do %>
+  $('.pagination a').attr('data-remote', 'true');
+<% end %>
+
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+<div class="space_center"></div>
+
+
+<h2><%= t('message.' + @box) %></h2>
+<div class="conversations">  
+  <%= render :partial => 'conversations' %>
+</div>

data/app/views/{messages → conversations}/_menu_options.html.erb

@@ -1,5 +1,5 @@
 <li>
-	<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other'), messages_path) %>
+	<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other'), messages_path, :remote => :true) %>
 </li>
 <li>
 	<ul>
@@ -7,7 +7,7 @@
 			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+ t('message.new'), new_message_path) %>
 		</li>
 		<li>
-			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.inbox')+" (" + @mailbox.inbox(:unread => true).count.to_s + ")", messages_path, :remote => true) %>
+			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.inbox')+" (" + @mailbox.inbox(:unread => true).count.to_s + ")", messages_path, :remote => :true) %>
 		</li>
 		<li>
 			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.sentbox'), messages_path(:box => :sentbox), :remote => true) %>

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

@@ -0,0 +1,21 @@
+
+
+<%= location(
+	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true),
+	link_to(image_tag("btn/message_conversation.png", :class => "menu_icon")+ truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
+) %>
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+<div id="new_message">
+	<% if @box.present? %>
+    <%= link_to 'Back', conversations_path(:box => @box, :page => params[:page]), :remote => true %>
+	<% else %>
+    <%= link_to 'Back', conversations_path(:page => params[:page]), :remote => true %>
+	<% end %>
+</div>
+<div class="space_center">
+</div>
+<div class="conversation_full">  
+ <%= render :partial => 'conversation_full', :locals =>{:conversation => @conversation} %>
+</div>

data/app/views/{messages → conversations}/index.html.erb

@@ -2,8 +2,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar :option => :messages do %>
-  <%= render :partial => 'menu_options' %>
-<% end %>
+<% toolbar %>
 
 <%= render :partial => 'index' %>

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

@@ -0,0 +1,7 @@
+$("#content").html("<%=escape_javascript(render :partial => 'index') %>");
+
+$('.pagination a').attr('data-remote', 'true');
+	  
+
+$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
+

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

@@ -0,0 +1,47 @@
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<% toolbar %>
+
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<%= javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate' %>
+<% end %>
+
+<% content_for :javascript do %>
+$('.cont_conversation').validate();
+<% unless @box.eql?'trash' %>
+$('#body').ckeditor(
+	function(){
+		$('#cke_top_body').click(updateTextArea);
+		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
+		if (message_hash && message_hash.length > 0){
+			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+		}else{
+			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
+		}}
+	,{ width:525 }
+);
+var editor = $('#body').ckeditorGet();
+editor.on("instanceReady", function(){
+this.document.on("keyup", updateTextArea);
+this.document.on("paste", updateTextArea);
+this.document.on("mousedown", updateTextArea);
+});
+
+var updateTextArea = function (){
+editor.updateElement();
+$("#body").trigger('keyup');
+}
+<% else %>
+		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
+		if (message_hash && message_hash > 0){
+			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+		}else{
+			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});	
+		}
+<% end %>
+<% end %>
+
+<%= render :partial => 'show' %>

data/app/views/conversations/show.js.erb

@@ -0,0 +1,39 @@
+$("#content").html("<%= escape_javascript(render :partial => 'show') %>");
+
+$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection")  %>"));
+
+$("head").append($("<%= escape_javascript(javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate')  %>"));
+
+$('.cont_conversation').validate();
+<% unless @box.eql?'trash' %>
+	$('#body').ckeditor(
+		function(){$('#cke_top_body').click( updateTextArea);
+		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
+		if (message_hash && message_hash.length > 0){
+			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+		}else{
+			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
+		}
+		},
+		{ width:525, customConfig:'/javascripts/ckeditor/config.js',skin:'../javascripts/ckeditor/skins/kama'}
+	);
+	var editor = $('#body').ckeditorGet();
+		editor.on("instanceReady", function(){
+			this.document.on("keyup", updateTextArea);
+			this.document.on("paste", updateTextArea);
+			this.document.on("mousedown", updateTextArea);
+		}
+	);
+	
+	var updateTextArea = function (){
+		editor.updateElement();
+		$("#body").trigger('keyup');
+	}
+<% else %>
+	var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
+		if (message_hash && message_hash.length > 0){
+			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+		}else{
+			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
+		}
+<% end %>

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

@@ -10,9 +10,13 @@
         <%= f.submit t(:sign_in), :class => 'other_blue'%>
       <% end -%>
       <div class="subtexto">
-        <%= link_to t('sign_in'), new_user_registration_path, :class => "register_link" %>
+        <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
         <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('/images/btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
       </div>
     </div>
   <br class="clearfloat" />

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

@@ -4,61 +4,63 @@
 <% end %>   
 
 <% content_for :javascript do %>
-$(function() {
-$(".new_group").validate();
-});
-$("#group__participants").fcbkcomplete({
-json_url: "../contacts/index.json",
-cache: true,
-filter_case: true,
-filter_hide: true,
-newel: false,
-height: 6
-});
+  $(function() {
+    $(".new_group").validate();
+  });
+  $("#group__participants").fcbkcomplete({
+    json_url: "<%= contacts_path(:format => :json) %>",
+		cache: true,
+		filter_case: true,
+		filter_hide: true,
+		newel: false,
+		height: 6
+  });
 <% end %>
 
 <%= form_for @group do |f| %>
-<% f.object._founder = current_subject.slug %>
-<%= f.hidden_field :_founder %>
+	<% f.object._founder = current_subject.slug %>
+	<%= f.hidden_field :_founder %>
 
-<% if @group.errors.any? %>
-<div id="notice">
-	<h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>
-	<ul>
-		<% @group.errors.full_messages.each do |msg| %>
-		<li>
-			<%= msg %>
-		</li>
-		<% end %>
-	</ul>
-</div>
-<% end %>
-<div class="block">
-	<div class="form_row">
-		<div class="form_label">
-			<%= f.label t('group.new.name') %>
+	<% if @group.errors.any? %>
+		<div id="notice">
+			<h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>
+			<ul>
+				<% @group.errors.full_messages.each do |msg| %>
+	        <li>
+						<%= msg %>
+					</li>
+				<% end %>
+			</ul>
 		</div>
-		<div class="form_field">
-			<%= f.text_field :name, :class => "required form_tag" %>
+	<% end %>
+	<div class="block">
+	  <div class="form_row center">
+	    <h2><%= t('group.new.action') %></h2>
+	  </div>	
+		<div class="form_row">
+			<div class="form_label">
+				<%= f.label t('group.new.name') %>
+			</div>
+			<div class="form_field">
+				<%= f.text_field :name, :class => "required form_tag" %>
+			</div>
 		</div>
-	</div>
-	<div class="form_row">
-		<div class="form_label">
-		  <%= f.label t('group.new.participants') %>
+		<div class="form_row">
+			<div class="form_label">
+			  <%= f.label t('group.new.participants') %>
+			</div>
+			<div class="form_field">
+				<%= f.select :_participants, [], :class => "form_tag" %>
+			</div>
 		</div>
-		<div class="form_field">
-			<%= f.select :_participants, [], :class => "form_tag" %>
+		<div class="form_row form_label">
+			<%= f.label :description %>
+		</div>
+		<div class="form_row">
+			<%= f.text_area :description, :rows =>6, :cols=> 53, :class => "form_tag" %>
+		</div>
+		<div class="actions center">
+			<%= f.submit :class => "button" %>
 		</div>
 	</div>
-	<div class="form_row form_label">
-
-		<%= f.label :description %>
-	</div>
-	<div class="form_row">
-		<%= f.text_area :description, :rows =>6, :cols=> 53, :class => "form_tag" %>
-	</div>
-	<div class="actions center">
-		<%= f.submit :class => "button" %>
-	</div>
-</div>
 <% end %>