social_stream 0.3.6 → 0.4.0

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

@@ -1,85 +1,93 @@
-<div class="left column span-11 borde">
-    <div id="left_espacio">
-    </div>
-    <div id="left_contenido">
-        <div id="vcc_title">
-            <%= t('frontpage.main_title') %>
-            <span id="text_bottom_title">
-                <br/>
-                <%= t('frontpage.stats', :users => User.count, :groups => Group.count) %>
-            </span>
-        </div>
-        <br/>
-        <div id="share">
-            <span><%=image_tag("../images/frontpage/share.gif") %></span>
-            <span>
-                <ul class="purple">
-                </li>
-                <li><%=image_tag("../images/frontpage/purple_sq.png") %><%= t('frontpage.share.sentence1') %>
-                </img>
-            </li>
-            <li>
-            <%=image_tag("../images/frontpage/purple_sq.png") %><%= t('frontpage.share.sentence2') %>
-            </img>
-        </li>
-        </ul>
-    </span>
-</div>
-<div id="meet" class="no_float_left">
-    <span><%=image_tag("../images/frontpage/meet.gif") %></span>
-    <span class="no_float">
-        <ul class="green">
-        <li><%=image_tag("../images/frontpage/green_sq.png") %><%= t('frontpage.meet.sentence1') %>
-        </img>
-    </li>
-</ul>
-</span>
-</div>
-<div id="collaborate" class="no_float_left">
-    <span><%=image_tag("../images/frontpage/collaborate.gif") %></span>
-    <span>
-        <ul class="yellow">
-            <li>
-            <%=image_tag("../images/frontpage/yellow_sq.png") %><%= t('frontpage.collaborate.sentence1') %>
-            </img>
-        </li>
-    <li>
-    <%=image_tag("../images/frontpage/yellow_sq.png") %><%= t('frontpage.collaborate.sentence2') %>
-    </img>
-</li>
-</ul>
-</span>
-</div>
-<br/>
-<div id="join_form" class="no_float_left">
-    <%= link_to image_tag("/images/frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
-</div>
+<div class="banner_busqueda">
+  <div id="espacio_busqueda">
+    <% flash.each do |name, msg| %>
+      <div id="<%= name %>">&laquo; <%= msg %> &raquo;</div>
+    <% end %>
+  </div>
+  <%= render :partial => "search" %>
 </div>
-</div>
-<div class="right column span-12 borde">
-    <div id="caracteristics">
 
-        <ul>
-            <li class="participants">
-                <%= t('frontpage.elements.participants') %>
-            </li>
-            <li class="organizers">
-                <%= t('frontpage.elements.organizers') %>
-            </li>
-            <li class="spaces">
-                <%= t('frontpage.elements.groups') %>
-            </li>
-            <li class="comments">
-                <%= t('frontpage.elements.comments') %>
-            </li>
-            <li class="tags">
-                <%= t('frontpage.elements.tags') %>
-            </li>
-            <li class="networks">
-                <%= t('frontpage.elements.networks') %>
-            </li>
-        </ul>
+<div id="wrapper_left">
+  <div id="frontpage_title">
+      <%= t('frontpage.main_title') %>
+      <span id="text_bottom_title">
+          <br/>
+          <%= t('frontpage.stats', :users => User.count, :groups => Group.count) %>
+      </span>
+  </div>
+  <div class="espacio"></div>
+  <div class="espacio"></div>
+  <div id="share">
+    <div class="icon">
+      <div id="icon_share"></div>
+      <div class="icon_text"><%= t('frontpage.share.default')%>  </div>
+    </div>
+    <div class="sentences">
+      <ul>
+        <li class="purple"><%= t('frontpage.share.sentence1') %></li>
+        <li class="purple"><%= t('frontpage.share.sentence2') %></li>
+      </ul>
+    </div>
+  </div>
+  <div class="espacio"></div>
+
+  <div id="meet">
+    <div class="icon">
+      <div id="icon_meet"></div>
+      <div class="icon_text"><%= t('frontpage.meet.default')%>  </div>
     </div>
+    <div class="sentences">
+      <ul>
+        <li class="green"><%= t('frontpage.meet.sentence1') %></li>
+      </ul>
+    </div>
+  </div>
+  <div class="espacio"></div>
+
+  <div id="collaborate">
+    <div class="icon">
+      <div id="icon_collaborate"></div>
+      <div class="icon_text"><%= t('frontpage.collaborate.default')%>  </div>
+    </div>
+    <div class="sentences">
+      <ul>
+        <li class="yellow"><%= t('frontpage.collaborate.sentence1') %></li>
+        <li class="yellow"><%= t('frontpage.collaborate.sentence2') %></li>
+      </ul>
+    </div>
+  </div>
+  <div class="espacio"></div>
+
+  <div id="join_form">
+      <%= link_to image_tag("/images/frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
+  </div>
 </div>
-<div id="espacio_body_bottom">
+
+<div id="wrapper_right">
+  <div id="caracteristics">
+    <ul>
+      <li class="participants">
+          <%= t('frontpage.elements.participants') %>
+      </li>
+      <li class="organizers">
+          <%= t('frontpage.elements.organizers') %>
+      </li>
+      <li class="spaces">
+          <%= t('frontpage.elements.groups') %>
+      </li>
+      <li class="comments">
+          <%= t('frontpage.elements.comments') %>
+      </li>
+      <li class="tags">
+          <%= t('frontpage.elements.tags') %>
+      </li>
+      <li class="networks">
+          <%= t('frontpage.elements.networks') %>
+      </li>
+    </ul>
+  </div>
 </div>
+
+<div id="espacio_body_bottom"></div>
+
+

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

@@ -1,6 +1,4 @@
-<% if (current_subject.recent_groups.count)>10 %>
-  <li>
-<% end %>
+<li>
   <%= div_for group do %>
     <div class="group_content">
       <%=link_to(image_tag(group.logo.url(:actor), :class => 'btn_group', :alt => group.name, :title => group.name), group) %>
@@ -9,6 +7,4 @@
       <%=link_to(group.name, group)%>
     </div>
   <% end %>
-<% if (current_subject.recent_groups.count)>10 %>
-  </li>
-<% end %>
+</li>

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

@@ -1,34 +1,31 @@
 <% cont=0; %>
-
 <% @groups.each do |group| %>
-
-	<% if (cont%2) == 0
-			cont+=1; %>
-	  	<div class="wrap_post">
+	<% if (cont%2) == 0 %>
+	  <% cont+=1; %>
+ 	  <div class="row">
 	<% end %>
-
-			<div class="post_browse">
-			<div class="post_picture"><%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )), group  %></div>
-			<div class="post_browse_content_people content_size">
-                          <div class="post_browse_title content_size" >
-                            <%= link_to group.name, group %>
-                          </div>
-
-                          <div class="content_size">
-                            <%= ties_to(group) %>
-                          </div>
-			</div>
-			</div>
-
+    <div class="label">
+      <div class="logo">
+        <%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )), group  %>
+      </div>
+      <div class="sub-block">
+        <div class="name black" >
+          <%= link_to group.name, group %>
+        </div>
+        <div class="link">
+          <%= ties_to(group) %>
+        </div>
+      </div>
+    </div>
 	<% if ((cont%2) == 0) 	%>
-			</div>
+  	</div>
 	<% end %>
-
 <% end %>
-
-
 <% if ((cont%2) != 0) 	%>
+  <div class="label">
+  </div>
 		</div>
 <% end %>
-
-<%= will_paginate @groups %>
+<div class="row">
+  <%= will_paginate @groups %>
+</div>

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

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

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

@@ -1,44 +1,61 @@
-<%= form_for @group do |f| %>
-  <% f.object._founder = current_subject.permalink %>
-  <%= f.hidden_field :_founder %>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
+<% end %>   
 
-  <% if @group.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>
+<% 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
+});
+<% end %>
 
-      <ul>
-      <% @group.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+<%= form_for @group do |f| %>
+<% f.object._founder = current_subject.slug %>
+<%= f.hidden_field :_founder %>
 
-  <div class="field">
-    <%= f.label t('group.new.name') %><br />
-    <%= f.text_field :name, :size=> 71 %>
-  </div>
-  <div class="field">
-    <%= f.label t('group.new.description') %><br />
-    <%= f.text_area :description, :rows =>6, :cols=> 53 %>
-  </div>
-  <div class="field">
-    <%= f.label t('group.new.participants') %><br />
-    <%= f.select :_participants, "" %>
-  </div>
-  <br>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
+<% 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 %>
-<br><br>
-<% content_for :javascript do %>
-	$("#group__participants").fcbkcomplete({
-		json_url: "../contacts/index.json",
-		cache: true,
-		filter_case: true,
-		filter_hide: true,
-		newel: false,
-		height: 6
-	});
+<div class="block">
+	<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 class="form_row">
+		<%= f.label t('group.new.participants') %>
+	</div>
+	<div class="form_row">
+		<%= f.select :_participants, [], :class => "form_tag" %>
+	</div>
+	<div class="form_row">
+		<%= 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 %>

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

@@ -0,0 +1,142 @@
+      <% content_for :head do %>
+          <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %>          
+        <% end %>       
+      <div class="space_center"></div>
+
+      <div class="block" id="personal_info" >
+        <div class="header">
+            <div class="header_text">
+                Group Information
+            </div>
+            <div class="header_icon_right">
+                <%= link_to (image_tag('/images/btn/edit.png')), :controller => :groups, :action => :edit, :section => :about_us %>
+            </div>
+        </div>
+				<div class="content">
+        
+        	<% if @group.profile.organization? %>
+			      <div class="row">
+			        <div class="label">
+			          Organization:
+			        </div>
+			        <div class="field">
+			            <%=h @group.profile.organization %>
+			        </div>
+			      </div>
+          <%end%>
+					<% if @group.profile.city? %>
+            <div class="row">
+              <div class="label">
+              City:
+              </div>
+	            <div class="field">
+	              <%=h @group.profile.city %>
+	              <% if @group.profile.country? %>
+	                , <%=@group.profile.country%>
+	              <%end%>
+			        </div>
+		        </div>
+          <%end%>
+          <% if @group.profile.description? %>
+            <div class="row">
+            	   <div class="label">
+                    Description:
+                </div>
+                <div class="field">
+                    <%=h @group.profile.description %>
+                </div>
+            </div>
+          <%end%>
+					<div class="row">
+                <div class="label">
+                    Group created at:
+                </div>
+                <div class="field">
+                    <%=h h I18n.l @group.created_at, :format => :long %>
+                </div>
+          </div>
+					<div class="row">
+                <div class="label">
+                    Group updated at:
+                </div>
+                <div class="field">
+                    <%=h I18n.l @group.updated_at, :format => :long %>
+                </div>
+          </div>
+				</div>
+			</div>
+			
+					<div class="block" id="contact_info">
+					  <div class="header">
+					    <div class="header_text">
+					      Contact Information
+					    </div>
+					    <div class="header_icon_right">
+					      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :groups, :action => :edit, :section => :contact_info %>
+					    </div>
+					  </div>
+					  <div class="content">
+					   <% if @group.profile.phone? %>
+					     <div class="row">
+					       <div class="label">
+					         Phone
+					       </div>
+					       <div class="field">
+					         <%=h @group.profile.phone %>
+					       </div>
+              </div>
+            <%end%>
+			      <% if @group.profile.mobile? %>
+			        <div class="row">
+			          <div class="label">
+			            Mobile
+			          </div>
+			          <div class="field">
+			            <%=h @group.profile.mobile %>
+			          </div>
+			        </div>
+			      <%end%>
+			      <% if @group.profile.fax? %>
+			        <div class="row">
+			          <div class="label">
+			            Fax
+			          </div>
+			          <div class="field">
+			            <%=h @group.profile.fax %>
+			          </div>
+			        </div>
+			      <%end%>
+			      <% if @group.profile.address? %>
+			        <div class="row">
+			          <div class="label">
+			            Address
+			          </div>
+			          <div class="field">
+			            <%=h @group.profile.address %>
+			          </div>
+			        </div>
+			      <%end%>
+			      <% if @group.profile.website? %>
+			        <div class="row">
+			          <div class="label">
+			            Website
+			          </div>
+			          <div class="field">
+			            <a href="<%=h @group.profile.website %>"><%=h @group.profile.website %></a>
+			          </div>
+			        </div>
+			      <%end%>
+			      <% if @group.email.present? %>
+				      <div class="row">
+				        <div class="label">
+				          E-mail:
+				        </div>
+				        <div class="field">
+				          <%=h @group.email %>
+				        </div>
+				      </div>
+						<%end%>
+          </div>
+				
+      </div>
+    </div>