social_stream 0.4.1 → 0.4.2

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

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

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

@@ -1,7 +1,7 @@
 <% content_for :headers do  -%>
+  <%= javascript_include_tag 'jqcloud-0.1.3.min','jquery.ba-url','ajax.paginate' %>
   <%= stylesheet_link_tag 'smoothness/jquery-ui-1.8.4.custom'  %>
 <% end -%>
-<% javascript_include_tag 'jqcloud-0.1.3.min','ajax.paginate','jquery.min.js' %>
 
 <% toolbar if user_signed_in? %>
 

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

@@ -1,3 +1,8 @@
-<% toolbar :option => :groups %>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
+<% end %>   
+
+<% toolbar%>
 
 <%= render :partial => 'new' %>

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

@@ -13,6 +13,4 @@
 <div class="space_center">
 </div>
 
-<%= render :partial => "activities/activities",
-           :locals => { :activities => @group.profile_wall(current_subject),
-                        :owner => @group } %>
+<%= render :partial => 'activities/walls', :locals => { :owner => @group } %>

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

@@ -0,0 +1,46 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+  <%= javascript_include_tag 'menu' %>
+<% end %>
+
+<ul id="menu">
+		<li>
+			<a href="#">Weblog Tools</a>
+			<ul>
+				<li><a href="http://www.pivotx.net/">PivotX</a></li>
+				<li><a href="http://www.wordpress.org/">WordPress</a></li>
+				<li><a href="http://www.textpattern.com/">Textpattern</a></li>
+				<li><a href="http://typosphere.org/">Typo</a></li>
+			</ul>
+		</li>
+		<li>
+			<a href="#">Programming Languages</a>
+			<ul>
+				<li><a href="http://www.php.net/">PHP</a></li>
+				<li><a href="http://www.ruby-lang.org/en/">Ruby</a></li>
+				<li><a href="http://www.python.org/">Python</a></li>
+				<li><a href="http://www.perl.org/">PERL</a></li>
+				<li><a href="http://java.sun.com/">Java</a></li>
+				<li><a href="http://en.wikipedia.org/wiki/C_Sharp">C#</a></li>
+			</ul>
+		</li>
+		<li><a href="http://www.i-marco.nl/weblog/">Marco's blog (no submenu)</a></li>
+		<li>
+			<a href="#">Cool Stuff</a>
+			<ul>
+				<li><a href="http://www.apple.com/">Apple</a></li>
+				<li><a href="http://www.nikon.com/">Nikon</a></li>
+				<li><a href="http://www.xbox.com/en-US/">XBOX360</a></li>
+				<li><a href="http://www.nintendo.com/">Nintendo</a></li>
+			</ul>
+		</li>
+		<li>
+			<a href="#">Search Engines</a>
+			<ul>
+				<li><a href="http://search.yahoo.com/">Yahoo!</a></li>
+				<li><a href="http://www.google.com/">Google</a></li>
+				<li><a href="http://www.ask.com/">Ask.com</a></li>
+				<li><a href="http://www.live.com/?searchonly=true">Live Search</a></li>
+			</ul>
+		</li>
+	</ul>

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

@@ -2,3 +2,15 @@
 <%= render :partial => "ties/suggestions" %>
 <div class="space_center"></div>
 <%= render :partial => 'ties/pendings' %>
+
+  <% content_for :javascript do %>
+
+    $(".suggestions .tie_close").livequery("click",function(){
+    temp = $(this);
+    $.get("<%=suggestion_ties_path%>", function(data) {
+    temp.parents(".tie").replaceWith(data);
+    });
+
+    });
+
+  <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar do %>
-  <%= render :partial => 'sidebar' %>
+  <% render :partial => 'sidebar' %>
 <% end %>
 
 <% toolbar %>
@@ -16,6 +16,6 @@
 </div>
 <% end %>
 
-<%= render :partial => "activities/activities",
-           :locals => { :activities => current_subject.home_wall,
+<%= render :partial => "activities/index",
+           :locals => { :activities => current_subject.wall(:home).paginate(:page => params[:page]),
                         :owner => current_subject } %>

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

@@ -5,7 +5,7 @@
     <title><%= yield(:title) || t('socialstream') %></title>
     <%= stylesheet_link_tag "base", "header","home","footer",
                              :media => "screen, projection" %>
-    <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'menu', 'ui.dropdownchecklist'%>
+    <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'ui.dropdownchecklist'%>
 
     <%= yield :headers %>
 

data/app/views/layouts/test.html

@@ -1,44 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head><title>100% Height CSS Layout</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<style type="text/css">
-* {
-padding: 0;
-margin: 0;
-}
-html, body {
-height: 100%;
-}
-body {
-font-family: "lucida sans", verdana, arial, helvetica, sans-serif;
-font-size: 75%;
-}
-h1 {
-font-size: 1.4em;
-padding: 10px 10px 0;
-}
-p {
-padding: 0 10px 1em;
-}
-#container {
-min-height: 100%;
-background-color: #DDD;
-border-left: 2px solid #666;
-border-right: 2px solid #666;
-width: 676px;
-margin: 0 auto;
-}
-* html #container {
-height: 100%;
-}</style>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-EN">
+<head>
+	<script src="jquery-1.2.1.min.js" type="text/javascript"></script>
+	<script src="menu.js" type="text/javascript"></script>
+	<link rel="stylesheet" type="text/css" href="style.css" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Simple JQuery Accordion menu</title>
+	<!--[if lt IE 8]>
+   <style type="text/css">
+   li a {display:inline-block;}
+   li a {display:block;}
+   </style>
+   <![endif]-->
 </head>
 <body>
-<div id="container">
-<h1>100% Height Demo</h1>
-<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque tempor. Nam in libero vel nisi accumsan euismod. Quisque quis neque. Donec condimentum, enim convallis vestibulum varius, quam mi accumsan diam, sollicitudin ultricies odio ante vitae purus. Etiam ultricies quam. Vestibulum turpis turpis, fermentum ut, accumsan quis, tempor at, ipsum. Nam felis elit, sollicitudin id, ultrices faucibus, fringilla vel, dui. Aliquam tincidunt iaculis eros. Sed in lorem. Nullam eu enim. Quisque tristique pretium diam. Fusce tempor sollicitudin ligula. Donec purus eros, mattis quis, mattis vestibulum, congue quis, felis. Nulla facilisi. Nam ultricies posuere justo. In feugiat.</p>
-<p>Ut lacus neque, interdum in, nonummy ac, placerat a, lorem. In interdum vulputate lectus. Aenean libero elit, eleifend id, tincidunt id, tristique eu, tortor. Pellentesque urna dolor, placerat a, pharetra eget, congue ut, ligula. Sed mi. Nunc volutpat. Donec pharetra accumsan lacus. Integer pede orci, vehicula vitae, porttitor id, pulvinar vel, nisi. Aliquam mauris ligula, eleifend sit amet, eleifend sit amet, luctus at, turpis. Sed neque orci, tincidunt id, tempus condimentum, eleifend a, nisl. Etiam auctor. Donec lectus lacus, consequat ac, ultrices venenatis, imperdiet vel, erat. In porttitor augue at tellus commodo pharetra.</p>
-<p>Sed non nibh. Sed sapien ipsum, fringilla condimentum, consectetuer vitae, convallis eu, urna. Aenean id elit eu nulla aliquet congue. Sed fringilla nonummy nisi. Donec aliquet. Quisque varius. Vivamus ut nulla. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer lacinia. In leo nulla, molestie ac, dignissim sed, pulvinar at, odio. Duis sit amet augue.</p>
-</div>
+
+	<ul id="menu">
+		<li>
+			<a href="#">Weblog Tools</a>
+			<ul>
+				<li><a href="http://www.pivotx.net/">PivotX</a></li>
+				<li><a href="http://www.wordpress.org/">WordPress</a></li>
+				<li><a href="http://www.textpattern.com/">Textpattern</a></li>
+				<li><a href="http://typosphere.org/">Typo</a></li>
+			</ul>
+		</li>
+		<li>
+			<a href="#">Programming Languages</a>
+			<ul>
+				<li><a href="http://www.php.net/">PHP</a></li>
+				<li><a href="http://www.ruby-lang.org/en/">Ruby</a></li>
+				<li><a href="http://www.python.org/">Python</a></li>
+				<li><a href="http://www.perl.org/">PERL</a></li>
+				<li><a href="http://java.sun.com/">Java</a></li>
+				<li><a href="http://en.wikipedia.org/wiki/C_Sharp">C#</a></li>
+			</ul>
+		</li>
+		<li><a href="http://www.i-marco.nl/weblog/">Marco's blog (no submenu)</a></li>
+		<li>
+			<a href="#">Cool Stuff</a>
+			<ul>
+				<li><a href="http://www.apple.com/">Apple</a></li>
+				<li><a href="http://www.nikon.com/">Nikon</a></li>
+				<li><a href="http://www.xbox.com/en-US/">XBOX360</a></li>
+				<li><a href="http://www.nintendo.com/">Nintendo</a></li>
+			</ul>
+		</li>
+		<li>
+			<a href="#">Search Engines</a>
+			<ul>
+				<li><a href="http://search.yahoo.com/">Yahoo!</a></li>
+				<li><a href="http://www.google.com/">Google</a></li>
+				<li><a href="http://www.ask.com/">Ask.com</a></li>
+				<li><a href="http://www.live.com/?searchonly=true">Live Search</a></li>
+			</ul>
+		</li>
+	</ul>
+
 </body>
-</html>
+</html>

data/app/views/location/_location.html.erb

@@ -0,0 +1,3 @@
+<div id="map_location" class="content_size">
+	<%= raw(location_body) %>
+</div>

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

@@ -1,57 +1,10 @@
-<% 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>
+<% if @receipt and @receipt.errors.any? %>
+<div class="error">
+	<h2><%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:</h2>
 	<ul>
-		<% @conversation.errors.full_messages.each do |msg| %>
+		<% @receipt.errors.full_messages.each do |msg| %>
 		<li>
 			<%= msg %>
 		</li>
@@ -83,4 +36,4 @@
 		<%= submit_tag "Send Message", :name => :send_message, :class => "button" %>
 	</div>
 </div>
-<% end %>
+<% end %>

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

@@ -0,0 +1,31 @@
+<%= div_for(message, :class => read_class) do%>
+<div class="sender_photo">
+	<%= link_to image_tag(message.sender.logo.url(:actor),
+	:title => message.sender.name, :alt => message.sender.name),
+	message.sender.subject %>
+</div>
+<div class="container">
+	<div class="header">
+		<div class="content_left">
+			<div class="sender_name">
+				<%= link_to message.sender.name, message.sender.subject %>
+			</div>
+			<div class="date">
+				<%= t('time.ago', :time => time_ago_in_words(message.updated_at)) %>
+			</div>
+		</div>
+		<div class="content_right">
+			<div class="subject">
+				<%= truncate(message.subject, :length => 70) %>
+			</div>
+		</div>
+		<div class="clearfloat">
+		</div>
+	</div>
+	<div class="body">
+		<%= raw(message.body) %>
+	</div>
+</div>
+<div class="clearfloat">
+</div>
+<% end %>

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

@@ -1,21 +1,15 @@
-<% content_for :headers do %>
-<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-<% end %>
+
+<%= location(
+	link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
+	link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+) %>
+
 
 <br class="clearfloat" />
-<div class="space_center">
-</div>
-<div id="new_message">
-	<% if @box.present? %>
-    <%= link_to 'Back', messages_path(:box => @box) %>
-	<% else %>
-    <%= link_to 'Back', messages_path %>
-	<% end %>
-</div>
-<div class="space_center">
-</div>
-<div class="space_center">
-</div>
+<div class="space_center"></div>
+<div class="space_center"></div>
+
+
 <div id="conversation">
     <%= render :partial => 'form' %>
 </div>

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

@@ -2,9 +2,54 @@
 <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar :option => :messages do %>
-  <%= render :partial => 'menu_options' %>
+<% toolbar %>
+
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<%= 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_path(:format => :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 %>
 
-<%= render :partial => 'location' %>
 <%= render :partial => 'new' %>

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

@@ -1 +1,38 @@
-$("#content").html("<%=escape_javascript(render :partial => 'new') %>");
+$("#content").html("<%= escape_javascript(render :partial => 'new') %>");
+
+$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
+$("head").append($("<%= escape_javascript(stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection") %>"));
+
+$("head").append($("<%= escape_javascript(javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js') %>"));
+
+var recipients = $("#_recipients").fcbkcomplete({
+        json_url: "<%= contacts_path(:format => :json) %>",
+	cache: true,
+	filter_case: true,
+	filter_hide: true,
+	newel: false,
+	height: 6
+});
+
+
+$('#body').ckeditor(
+);
+
+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();