social_stream 0.3.3 → 0.3.4

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

@@ -11,7 +11,7 @@
         <%= form_for(@user, :remote => true) do |f| %>
         <% if @user.errors.any? %>
         <div id="error_explanation">
-            <h2><%= pluralize(@user.errors.count, "error") %>prohibited this user from being saved:</h2>
+            <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
             <ul>
                 <% @user.errors.full_messages.each do |msg| %>
                 <li>
@@ -28,8 +28,7 @@
 									$("#contact_info").addClass('section_normal');
                   $("#experience_info").addClass('section_normal');
 									$("#personal_info").addClass('section_normal');
-									$("#contacts").addClass('section_normal');
-									$(".space_profile").addClass('section_normal');
+									
 									
                   $("#edit_user_1").validate();
                 
@@ -47,9 +46,10 @@
             <%= f.text_field :name, :class => "required" %>
 
             <br/>
+
 						<script type="text/javascript">
 
-							$(function() {
+							$(function () {
                   $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>', 
 								                                    changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
 									
@@ -60,20 +60,22 @@
 
 					  </script>
 						<%= f.fields_for :profile do |profile_form| %>
+						
 						<div class="editField">
-              <%= profile_form.label :birthday %>
+              <%= profile_form.label :organization %>
               <br/>
-						</div>
-            <%= profile_form.text_field :birthday , :class => "date" %>
+            </div>
+            <%= profile_form.text_field :organization %>
             <br/>
-						
-            
 						<div class="editField">
-              <%= profile_form.label :organization %>
+              <%= profile_form.label :birthday %>
               <br/>
 						</div>
-            <%= profile_form.text_field :organization %>
+            <%= profile_form.text_field( :birthday , :class => "date") %>
             <br/>
+						
+            
+						
 						<div class="editField">
               <%= profile_form.label :city %>
               <br/>
@@ -114,19 +116,19 @@
               <%= profile_form.label :phone %>
               <br/>
 						</div>
-            <%= profile_form.text_field :phone, :class => "digits" %>
+            <%= profile_form.text_field :phone, :class => "phone" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :mobile %>
               <br/>
 						</div>
-            <%= profile_form.text_field :mobile, :class => "digits" %>
+            <%= profile_form.text_field :mobile, :class => "phone" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :fax %>
               <br/>
 						</div>
-            <%= profile_form.text_field :fax, :class => "digits" %>
+            <%= profile_form.text_field :fax, :class => "phone" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :address %>
@@ -164,6 +166,9 @@
 	            <% end %>
             <% end %>
         </div>
+				<% if params[:section].present? %>
+				<%= hidden_field_tag("section", params[:section]) %>
+				<% end %>
         <div class="actions">
             <%= f.submit "Update" %>&nbsp;<button onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
         </div>

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

@@ -1,3 +1,6 @@
+<% content_for :head, stylesheet_link_tag("users") %>
+
+
 <% content_for :middle do %>
 	<%= render :partial => "users/middle_index" %>
 <% end %>
@@ -15,52 +18,30 @@
 <div class="space_center">
 </div>
 
-<div class="space_center">
-</div>
-
 <div id="my_conferences">
 		<div id="tabconference_browse" class="widget content_size">
 				<ul class="tabconference_browse">
 					<li>
-							<a href="#contacts"> <%= t('user.other')%> (<%=User.count%>) </a>
+							<a href="/users"><%= t('user.all')%> (<%=User.count%>) </a>
 					</li>
 				</ul>
 				<div id="contacts" class="tabconference_browse">
 						<div class="space_center">
 						</div>
+                                                <div><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="letters" class="content_size">
-								<a href="#">A</a>
-								<a href="#">B</a>
-								<a href="#">C</a>
-								<a href="#">D</a>
-								<a href="#">E</a>
-								<a href="#">F</a>
-								<a href="#">G</a>
-								<a href="#">H</a>
-								<a href="#">I</a>
-								<a href="#">J</a>
-								<a href="#">K</a>
-								<a href="#">L</a>
-								<a href="#">M</a>
-								<a href="#">N</a>
-								<a href="#">O</a>
-								<a href="#">P</a>
-								<a href="#">Q</a>
-								<a href="#">R</a>
-								<a href="#">S</a>
-								<a href="#">T</a>
-								<a href="#">U</a>
-								<a href="#">V</a>
-								<a href="#">W</a>
-								<a href="#">X</a>
-								<a href="#">Y</a>
-								<a href="#">Z</a>
+                                                    <% for char in 'A'..'Z' %>
+                                                      <%= link_to char,{:letter => char,:page => 1},:class => "user_letter_link" %>
+                                                    <% end %>
 						</div>
 						<div class="space_center" class="content_size">
 
 						</div>
-					  	<%= render :partial => "users/index"%>
-
+                                  <div id="list_users_ajax">
+                                                  <%= render :partial => "users/index"%>
+                                  </div>
 						<div class="space_center">
 						</div>
 				</div>
@@ -73,4 +54,4 @@
 <br class="clearfloat" />
 <div class="space_center">
 </div>
-
+<%= javascript_include_tag "ajax.paginate" %>

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

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

data/app/views/users/update.js.erb

@@ -1,19 +1,41 @@
 
-<% if @user.valid? %>
-
-
   if ($("#notice").length == 0){
-	  
-    $("#content").prepend('<div id="notice"></div>');
-		
-  }  
-  $("#notice").html("<h2>Form Submitted!</h2>");
 
+    $("#content").prepend('<div id="notice"></div>');
+    
+  } 
+	
+<% if @user.valid? %>
+ 	
+  $("#notice").html("<h2>Form Submitted!</h2><br/>");
+	$("#notice").removeClass('error_explanation');
+  $("#notice").addClass('confirmed');
   $("#middleContent").replaceWith("<%= escape_javascript(render(:partial => 'middle_show'))%>");
 	
+  $("#contact_info").addClass('section_normal');
+  $("#experience_info").addClass('section_normal');
+	$("#personal_info").addClass('section_normal');
+	
+  <% if !params[:section].present? or params[:section].eql?("about_me") %>	                  
+		$("#personal_info").removeClass('section_normal');
+		$("#personal_info").addClass('section_highlight');
+	<%end%>
+	
+	<% if !params[:section].present? or params[:section].eql?("contact_info") %>
+		$("#contact_info").removeClass('section_normal');
+		$("#contact_info").addClass('section_highlight');
+	<%end%>
+
+	<% if !params[:section].present? or params[:section].eql?("my_experience") %>
+		$("#experience_info").removeClass('section_normal');
+		$("#experience_info").addClass('section_highlight');
+	<%end%>
+	
 <% else %>
-
-  $("#flash_error").html("<h2>Fail!</h2>"); 
+  $("#notice").html("<h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>"
+	 +"<ul><% @user.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul><br/>");
+	$("#notice").removeClass('confirmed');
+	$("#notice").addClass('error_explanation'); 
 
 <% end %>
 

data/config/locales/en.yml

@@ -52,7 +52,12 @@ en:
     by: "By groups"    
     last: "Last groups"
     my: "My groups"
-    new: "New group"
+    new:
+      action: "New group"
+      name: "Name"
+      description: "Description"
+      participants: "Participants"
+    cloud: "Group tag cloud"
     popular:
       most: "Most popular"
     voted:
@@ -93,4 +98,5 @@ en:
     by: "By Users"
     one: "User"
     other: "Users"
+    all: "All users"
 

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-
+  get "contacts/index"
   root :to => "frontpage#index"
 
   match 'home' => 'home#index', :as => :home

data/lib/generators/social_stream/templates/migration.rb

@@ -63,6 +63,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "actor_id"
       t.datetime "created_at"
       t.datetime "updated_at"
+      t.string    "description"
     end
 
     add_index "groups", "actor_id"

data/lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js

@@ -0,0 +1,53 @@
+$(function(){
+
+    $('#search_field').live('click',function(){
+        if(this.value=="Search by name"){
+            this.value="";
+        }
+    });
+
+    $('#search_field').keypress(function(event){
+        if(event.keyCode == '13'){
+            $('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
+            $.getScript(window.location.pathname+"?search="+this.value+"");
+        }
+    });
+
+    $('#search_button').click(function(){
+        e = $.Event('keypress');
+        e.keyCode = 13;
+        $('#search_field').trigger(e);
+    });
+
+    $('.pagination a').live('click',function(){
+        $('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
+        $.setFragment({ "page" : $.queryString(this.href).page });
+        $.getScript(this.href);
+        return false;
+    });
+
+    $('.user_letter_link').live('click',function(){
+        $('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
+        $.setFragment({ "page" : $.queryString(this.href).page });
+        $.setFragment({ "letter" : $.queryString(this.href).letter });
+        $.getScript(this.href);
+        return false;
+    });
+
+    $.fragmentChange(true);
+    $(document).bind("fragmentChange.page", function() {
+        $.getScript($.queryString(document.location.href, { "page" : $.fragment().page,
+                                                            "letter": $.fragment().letter}));
+    });
+    $(document).bind("fragmentChange.letter", function() {
+        $.getScript($.queryString(document.location.href, { "page" : $.fragment().page,
+                                                            "letter": $.fragment().letter}));
+    });
+
+    if ($.fragment().page) {
+        $(document).trigger("fragmentChange.page");
+    }
+    if ($.fragment().letter) {
+        $(document).trigger("fragmentChange.letter");
+    }
+});

data/lib/generators/social_stream/templates/public/javascripts/jqcloud-0.1.3.min.js

@@ -0,0 +1,11 @@
+/*
+ * jQCloud Plugin for jQuery
+ *
+ * Version 0.1.3
+ *
+ * Copyright 2011, Luca Ongaro
+ * Licensed under the MIT license.
+ *
+ * Date: Wed Feb 16 11:41:32 2011 +0100
+ */
+(function(a){a.fn.jQCloud=function(c,e){var d=this;var b=function(){var g=function(o,m){var l=function(q,p){if(Math.abs(2*q.offsetLeft+q.offsetWidth-2*p.offsetLeft-p.offsetWidth)<q.offsetWidth+p.offsetWidth){if(Math.abs(2*q.offsetTop+q.offsetHeight-2*p.offsetTop-p.offsetHeight)<q.offsetHeight+p.offsetHeight){return true}}return false};var n=0;for(n=0;n<m.length;n++){if(l(o,m[n])){return true}}return false};c.sort(function(m,l){if(m.weight<l.weight){return 1}else{if(m.weight>l.weight){return -1}else{return 0}}});var i=2;var f=[];var h=d.width()/d.height();var k=d.width()/2;var j=d.height()/2;a.each(c,function(q,l){var o=6.28*Math.random();var r=0;var p=Math.round((l.weight-c[c.length-1].weight)/(c[0].weight-c[c.length-1].weight)*9)+1;var u=l.url!==undefined?"<a href='"+l.url+"'>"+l.text+"</a></span>":l.text;d.append("<span id='word_"+q+"' class='w"+p+"' title='"+(l.title||"")+"'>"+u+"</span>");var m=a("#word_"+q).width();var t=a("#word_"+q).height();var n=k-m/2;var s=j-t/2;a("#word_"+q).css("position","absolute");a("#word_"+q).css("left",n+"px");a("#word_"+q).css("top",s+"px");while(g(document.getElementById("word_"+q),f)){r+=i;o+=(q%2===0?1:-1)*i;n=k+(r*Math.cos(o)-(m/2))*h;s=j+r*Math.sin(o)-(t/2);a("#word_"+q).css("left",n+"px");a("#word_"+q).css("top",s+"px")}f.push(document.getElementById("word_"+q))});if(typeof e==="function"){e.call(this)}};setTimeout(function(){b()},100);return this}})(jQuery);