social_stream 0.4.0 → 0.4.1

data/app/views/activities/_activities.html.erb

@@ -1,6 +1,13 @@
-<% content_for :headers, stylesheet_link_tag("activities", :media => "screen, projection") %>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "activities", :media => "screen, projection" %>
+	<%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
+<% end %>
+
 <% content_for :javascript do %>
   <%= render :partial => 'activities/jquery' %>
+	$(document).ready(function() {
+    $("#tabs").tabs();
+  });
 <% end -%>
 
 <div id="wrapper_activities">
@@ -10,11 +17,30 @@
     </div>
     <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
   </div>
-  
-  <div id="wall">
-    <% activities = activities.paginate(:page => params[:page]) %>
-    <%- # should be activities.paginate(:page => params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 -%>
-    <%= render activities  %>
-    <%= will_paginate activities %>
-  </div>
+
+		<div id="tabs">
+			<ul>
+	        <li><a href="#fragment-1"><span>Group</span></a></li>
+	        <li><a href="#fragment-2"><span>Followers</span></a></li>
+	        <li><a href="#fragment-3"><span>Partners</span></a></li>
+	    </ul>
+			<div id="fragment-1">
+	      <div id="wall">
+		      <% activities = activities.paginate(:page => params[:page]) %>
+		      <%- # should be activities.paginate(:page => params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 -%>
+		      <%= render activities  %>
+		      <%= will_paginate activities %>
+	      </div>
+	    </div>
+	    <div id="fragment-2">
+	        Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+	        Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+	    </div>
+	    <div id="fragment-3">
+	        Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+	        Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+	        Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+	    </div>
+		</div>
+
 </div>

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

@@ -1,6 +1,6 @@
 <div id="welcome">
   <div id="login" class="block">
-  <h2><%= t('sign_in').capitalize %></h2>
+  <h2><%= t('sign_up').capitalize %></h2>
   <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
     <%= devise_error_messages! %>
     <div class="form_row">

data/app/views/frontpage/host_meta.xml.builder

@@ -0,0 +1,11 @@
+xml.instruct!
+xml.XRD :xmlns     => 'http://docs.oasis-open.org/ns/xri/xrd-1.0',
+        "xmlns:hm" => 'http://host-meta.net/ns/1.0' do
+
+  xml.tag! "hm:Host", request.host_with_port
+
+  xml.Link :rel      => "lrdd",
+           :template => "#{ root_url }subjects/lrdd/{uri}",
+           :type     => "application/xrd+xml"
+
+end

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

@@ -1,4 +1,5 @@
 <div id="logo_index">
+  <div class="center"><span class="title_bold" ><%= @group.name %></span> (<%= ties_to(@group) %>)</div>
   <%= link_to image_tag(@group.logo.url, :alt => @group.name , :size => "119x108"), @group %>
 </div>
 

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

@@ -43,12 +43,15 @@ height: 6
 		</div>
 	</div>
 	<div class="form_row">
-		<%= f.label t('group.new.participants') %>
-	</div>
-	<div class="form_row">
-		<%= f.select :_participants, [], :class => "form_tag" %>
+		<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_row">
+	<div class="form_row form_label">
+
 		<%= f.label :description %>
 	</div>
 	<div class="form_row">

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

@@ -7,4 +7,5 @@
   <%= render :partial => 'ties/pendings' %>
 <% end %>
 
-<%= render :partial => 'profile' %>
+<%= render :partial => 'groups/profile' %>
+

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

@@ -1,6 +1,5 @@
-<% content_for :toolbar do %>
-<%= render :partial => 'toolbar_show' %>
-<% end %>
+<% toolbar :option => :groups %>
+
 <% content_for :sidebar do %>
 <%= render :partial => 'sidebar_show' %>
 <% end %>
@@ -65,7 +64,7 @@ $(".edit_group").validate();
           <%= profile_form.text_field :country,  :class => "form_tag" %>
 				</div>
     </div>
-    <div class="form_row">
+    <div class="form_row form_label">
         <%= profile_form.label :description %>
 		</div>
 		<div class="form_row">
@@ -127,7 +126,7 @@ $(".edit_group").validate();
     <% end %>
     <% end %>
 </div>
-<div class="form_row center">
+<div class="form_row space_center">
     <%= f.submit "Update", :class => "button" %>&nbsp;
     <button class="button" onclick="window.location.href='<%= group_url(@group) %>';">
         Cancel

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

@@ -3,7 +3,7 @@
 <% end -%>
 <% javascript_include_tag 'jqcloud-0.1.3.min','ajax.paginate','jquery.min.js' %>
 
-<% toolbar_menu if user_signed_in? %>
+<% toolbar if user_signed_in? %>
 
 <% content_for :sidebar do %>
 	<%= render :partial => "groups/sidebar_index" %>

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

@@ -1,3 +1,3 @@
-<% toolbar_menu %>
+<% toolbar :option => :groups %>
 
 <%= render :partial => 'new' %>

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

@@ -1,16 +1,8 @@
-<% content_for :headers do  -%>
-  <%= stylesheet_link_tag 'fcbkComplete' %>
-<% end -%>
-
-
 <% content_for :sidebar do %>
   <%= render :partial => 'sidebar_show' %>
 <% end %>
 
-<% content_for :toolbar do %>
-  <%= render :partial => 'toolbar_show' %>
-<% end %>
-
+<% toolbar :profile => @group %>
 
 <%= render :partial => 'location' %>
 

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

@@ -2,7 +2,7 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 
-<% toolbar_menu %>
+<% toolbar %>
 
 <%= render :partial => 'location' %>
 

data/app/views/layouts/_header.erb

@@ -1,5 +1,5 @@
 <div id="headerFront">
-  <div class="banner_top">
+  <div class="banner_top banner_top_height">
     <div id="header_left">
       <div id="logo_txt">
         <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -18,7 +18,7 @@
     </div>
     <div id="header_right">
       <% if user_signed_in? %>
-        <div class="menu_list menu_white" id="menu_home">
+        <div class="menu_list menu_white" id="menu_account">
           <ul>
             <li class="btn_menu_config"><%= link_to t('account.one'), '#' %></li>
             <li class="pipe">|</li>
@@ -30,5 +30,4 @@
       <% end %>
     </div>
   </div>
-  <br class="clearfloat" />
 </div>

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

@@ -1,15 +1,12 @@
-<%= link_to(image_tag(current_user.logo.url(:tie), :width => 20, :height => 20), current_user) %>
 
-<li class="pipe">
+  <%= link_to(image_tag(current_user.logo.url(:tie), :width => 20, :height => 20, :class => 'menu_icon'), current_user) %>
   <%= link_to(current_user.name, current_user) %>
-
   <%= t('representation.action') %>
-
   <%= form_for(Representation.new(current_subject), :url => representation_path) do |f| %>
     <%= f.select :subject_dom_id, current_user.represented.unshift(current_user).map{ |s| [ s.name, dom_id(s) ] } %>
     <%= f.submit t('representation.change') %>
   <% end %>
-</li>
+
 
 <%-# this should be in content_for(:javascript), but the partial is rendered after yield(:javascript) -%>
 <script type="text/javascript" charset="utf-8">

data/app/views/logos/_precrop.html.erb

@@ -2,6 +2,7 @@ Crop your image:
 
 
 <% my_file_name = File.basename(@logo.logo.queued_for_write[:original].path) %>
+<%# my_file_name = params[:name] %>
 <div style="width:100px;height:100px;overflow:hidden;margin-left:5px;"> 
 		<%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
 </div>
@@ -30,7 +31,7 @@ function update_crop(coords) {
     marginLeft: '-' + Math.round(rx * coords.x) + 'px',
     marginTop: '-' + Math.round(ry * coords.y) + 'px'
   });
-  var ratio = <%= precrop_dimensions[:width] %> / <%= precrop_dimensions[:height] %>;
+  var ratio = 1;//<% precrop_dimensions[:width] %> / <%= precrop_dimensions[:height] %>
   $("#crop_x").val(Math.round(coords.x * ratio));
   $("#crop_y").val(Math.round(coords.y * ratio));
   $("#crop_w").val(Math.round(coords.w * ratio));
@@ -41,8 +42,10 @@ function update_crop(coords) {
 <%= form_for :logo, @logo,:url => logos_path, :html => { :multipart => true } do |f| %>
 
   <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
-    <%= f.text_field attribute, :id => attribute %>
+    <%= f.hidden_field attribute, :id => attribute %>
   <% end %>
+	<%= f.hidden_field :name, :value => my_file_name %>
+	
   <p><%= f.submit "Crop" %></p>
 <% end %>
 

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

@@ -12,7 +12,7 @@
   	<% #debugger %>
 	<td><%= image_tag logo.logo.url(:profile) %></image_tag></td>
 	<td><%= image_tag logo.logo.url(:tie) %></image_tag></td>
-	<td><%= image_tag logo.logo.url() %></image_tag></td>
+	<td><% image_tag logo.logo.url() %></image_tag></td>
 	<td><%= image_tag logo.logo.url(:actor) %></image_tag></td>
 
     <td><%= link_to 'Show', logo %></td>

data/app/views/menu/_group.html.erb

@@ -9,7 +9,7 @@
 <div class="menu_header"><b><%=t('menu.options')%></b>
 </div>
 <div id="menu_lateral">
-  <%= render :partial => "menu/options" %>
+  <%= render :partial => "menu/optionsGroups" %>
 </div>
 <div class="space_center">
 </div>

data/app/views/menu/_optionsGroups.html.erb

@@ -0,0 +1,11 @@
+<ul class="menu noaccordion">
+  <li>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), messages_path) %>
+  </li>
+  <li>
+    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [@group, :profile]) %>
+  </li>
+  <li>
+    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>
+  </li>
+</ul>

data/app/views/menu/{_options.html.erb → _optionsUser.html.erb}

@@ -1,9 +1,9 @@
 <ul class="menu noaccordion">
   <li>
-    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), '#') %>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), messages_path) %>
   </li>
   <li>
-    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), '#') %>
+    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [@user, :profile]) %>
   </li>
   <li>
     <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>

data/app/views/menu/_user.html.erb

@@ -9,7 +9,7 @@
 <div class="menu_header"><b><%=t('menu.options')%></b>
 </div>
 <div id="menu_lateral">
-  <%= render :partial => "menu/options" %>
+  <%= render :partial => "menu/optionsUser" %>
 </div>
 <div class="space_center">
 </div>

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

@@ -0,0 +1,34 @@
+<%= div_for(conversation, :class => active) do %>
+<div class="actor_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="actor_name">
+	<%= link_to conversation.last_sender.name, conversation.last_sender.subject %>
+	</div>
+	<div class="date">
+	<%= conversation.updated_at %>
+	</div>
+</div>
+<div class="content_right">
+	<div class="subject">
+	<%= link_to(conversation.subject, message_path(conversation.id,:box => @box)) %>
+	</div>
+	<div class="briefing">
+	<%= truncate(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"),
+			message_path(conversation, :location => @box, :box => @box),
+			:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',
+			:method => :delete, :remote => true) %>
+		</div>
+	<% end %>
+<div class="clearfloat"></div>
+<% end %>

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

@@ -0,0 +1,65 @@
+<% content_for :headers do %>
+<%= javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.jsjquery.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);},
+			function() {$.scrollTo('#message_<%= conversation.last_message.id %>');},
+	 		{ width:493 }	
+		);
+		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 %>
+		$.scrollTo('#message_<%= conversation.last_message.id %>');
+	<% end %>
+<% end %>
+
+<%= div_for (conversation) do %>
+  <%= conversation.subject %>
+  <br>
+  Actions: <% unless @box.eql?'trash' %><%= link_to ( image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"), 
+			message_path(conversation, :location => 'conversation', :box => @box), 
+			:confirm => 'Do you want to move "' + conversation.subject + '" to trash?', 
+			:method => :delete, :remote => true) %><% end %>
+  <br>
+  <% conversation.get_recipients.each do |recp| %>
+ 	 <%= link_to image_tag(recp.logo.url(:tie), :title=>recp.name, :alt => recp.name), recp.subject %>
+  <% end %><br>
+	
+  <% @receipts.each do |receipt| %>  	
+	<% message= receipt.message %>
+	<%= div_for (message) do%>
+		<%= link_to image_tag(message.sender.logo.url(:tie),:alt => message.sender.name,:title =>message.sender.name), message.sender.subject %><br>
+		<%= message.sender.name %> on <%= message.created_at %> said:<br>
+		<%= raw (message.body) %>
+  	<% end %>
+  <% end %>
+  <% unless @box.eql?'trash' %>
+	  Write your answer:<br>
+	  <% form_tag message_path(conversation.id), :method => :put, :class => "cont_conversation" do %>
+		<div class="block">
+			<div class="form_row">
+				<%= label_tag :body %>
+			</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 %>
+<% end %>

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

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

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

@@ -0,0 +1,86 @@
+<% content_for :headers do %>
+<%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
+<%= javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js' %>
+<% end %>
+
+<% content_for :javascript do %>
+
+	var recipients = $("#_recipients").fcbkcomplete({
+		json_url: "../../contacts/index.json",
+		cache: true,
+		filter_case: true,
+		filter_hide: true,
+		newel: false,
+		height: 6
+	});	
+
+	
+	$('#body').ckeditor(
+	 function(){
+	  $('#cke_top_body').click( updateTextArea);
+	 },
+	 		{ width:493 }
+	);
+	
+	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');       
+  }
+	
+
+	<% unless @recipient.nil? %>
+		$("#_recipients").trigger("addItem",[{"title": "<%= @recipient.name %>", "value": "<%= @recipient.id %>"}]);
+	<% end %>
+
+  $(".new_message").validate();
+
+<% end %>
+
+
+<h2>New Message</h2>
+<%= form_tag messages_path, :method => :post , :class => "new_message" do %>
+<% if @conversation and @conversation.errors.any? %>
+<div id="notice">
+	<h2><%= pluralize(@conversation.errors.count, "error") %> prohibited this message from being sent:</h2>
+	<ul>
+		<% @conversation.errors.full_messages.each do |msg| %>
+		<li>
+			<%= msg %>
+		</li>
+		<% end %>
+	</ul>
+</div>
+<% end %>
+<div class="block">
+	  <div class="form_row">
+      <%= label_tag :recipients %>
+		</div>
+	  <div class="form_row">
+      <%= select_tag :_recipients, "", :class => "required form_tag" %>
+
+  </div>
+	<div class="form_row">
+		<%= label_tag :subject %>
+	</div>
+	<div class="form_row">
+		<%= text_field_tag :subject,nil, :class => "required form_tag" %>
+	</div>
+	<div class="form_row">
+		<%= label_tag :body %>
+	</div>
+	<div class="form_row" id="ck_editor" >
+		<%= 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" %>
+	</div>
+</div>
+<% end %>