social_stream 0.3.6 → 0.4.0

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

@@ -0,0 +1,73 @@
+<% content_for :headers, stylesheet_link_tag("jqcloud") %>
+
+<div class="space_center"></div>
+
+<div class="block">
+  <div class="header">
+    <%= image_tag('btn/btn_tag.png', :class => "icon", :size => "15x15") %>
+    <div class="header_text">
+      <%= t 'group.cloud' %>
+    </div>
+  </div>
+  <div id="wordcloud" class="content"></div>
+</div>
+
+<% if user_signed_in? %>
+<div class="space_center"></div>
+<%= render :partial => "ties/suggestions" %>
+<div class="space_center"></div>
+<%= render :partial => 'ties/pendings' %>
+
+
+<%= javascript_include_tag "jqcloud-0.1.3.min.js" %>
+<% end %>
+
+<script type="text/javascript">
+  var word_list = new Array(
+    {text: "Lorem", weight: 13, url: "https://github.com/DukeLeNoir/jQCloud"},
+    {text: "Ipsum", weight: 10.5, url: "http://jquery.com/"},
+    {text: "Dolor", weight: 9.4},
+    {text: "Sit", weight: 8},
+    {text: "Amet", weight: 6.2},
+    {text: "Consectetur", weight: 5},
+    {text: "Adipiscing", weight: 5},
+    {text: "Elit", weight: 5},
+    {text: "Nam et", weight: 5},
+    {text: "Leo", weight: 4},
+    {text: "Sapien", weight: 4, url: "http://www.lucaongaro.eu/"},
+    {text: "Pellentesque", weight: 3},
+    {text: "habitant", weight: 3},
+    {text: "morbi", weight: 3},
+    {text: "tristisque", weight: 3},
+    {text: "senectus", weight: 3},
+    {text: "et netus", weight: 3},
+    {text: "et malesuada", weight: 3},
+    {text: "fames", weight: 2},
+    {text: "ac turpis", weight: 2},
+    {text: "egestas", weight: 2},
+    {text: "Aenean", weight: 2},
+    {text: "vestibulum", weight: 2},
+    {text: "elit", weight: 2},
+    {text: "sit amet", weight: 2},
+    {text: "metus", weight: 2},
+    {text: "adipiscing", weight: 2},
+    {text: "ut ultrices", weight: 2},
+    {text: "justo", weight: 1},
+    {text: "dictum", weight: 1},
+    {text: "Ut et leo", weight: 1},
+    {text: "metus", weight: 1},
+    {text: "at molestie", weight: 1},
+    {text: "purus", weight: 1},
+    {text: "Curabitur", weight: 1},
+    {text: "diam", weight: 1},
+    {text: "dui", weight: 1},
+    {text: "ullamcorper", weight: 1},
+    {text: "id vuluptate ut", weight: 1},
+    {text: "mattis", weight: 1},
+    {text: "et nulla", weight: 1},
+    {text: "Sed", weight: 1}
+  );
+  $(document).ready(function() {
+    $("#wordcloud").jQCloud(word_list);
+  });
+</script>

data/app/views/groups/{_middle_show.html.erb → _sidebar_show.html.erb}

@@ -1,5 +1,4 @@
-<div class="space_center">
-</div>
+<div class="space_center"></div>
 
 <% if user_signed_in? %>
   <%= render :partial => "ties/suggestions" %>
@@ -8,3 +7,4 @@
   <%= render :partial => 'ties/pendings' %>
 <% end %>
 
+<%= render :partial => 'profile' %>

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

@@ -1,32 +1,38 @@
-		<div id="tabright" class="widget">
-				<ul class="tabinfo fondo">
-						<li>
-								<a href="#info">Information</a>
-						</li>
-						<li>
-							<a href="#info"><%=(image_tag("btn/btn_tag.png", :alt => "tags"))+t('tags')%></a>
-						</li>
-				</ul>
-				<div id="info" class="tabinfo">
-						Place:
-						<br/>
-						Avendia Complutense 30 
-						<br/>
-						Ciudad Universitaria 
-						<br/>
-						28040 Madrid 
-						<br/>
-						Phone: 
-						<br/>
-						(593-4) 2 269269 
-						<br/>
-						<a href="mailto:info@dit.upm.es">info@dit.upm.es</a>
-						<br/>
-				</div>
-				<!--/popular-->
-				<div id="tag" class="tabinfo">
-						tag1, tag2, tag3, tag4, tag5
-						tag6, tag7, tag8, tag9, tag10
-				</div>
-		</div>
+<% content_for :headers do %>
+  <%= javascript_include_tag 'superfish', 'main', 'jquery-ui-personalized-1.5.2.packed' %>
+<% end %>
+
+
+<div id="tabright" class="widget block">
+    <ul class="tab fondo">
+        <li>
+            <a href="#info">Information</a>
+        </li>
+        <li>
+            <a href="#tag"><img src="/images/btn/btn_tag.png" alt="Tags" />Tags</a>
+        </li>
+    </ul>
+    <div id="info" class="tab">
+        Place:
+        <br/>
+        Avendia Complutense 30
+        <br/>
+        Ciudad Universitaria
+        <br/>
+        28040 Madrid
+        <br/>
+        Phone:
+        <br/>
+        (593-4) 2 269269
+        <br/>
+        <a href="mailto:info@dit.upm.es">info@dit.upm.es</a>
+        <br/>
+    </div>
+    <!--/popular-->
+    <div id="tag" class="tab">
+        tag1, tag2, tag3, tag4, tag5
+        tag6, tag7, tag8, tag9, tag10
+    </div>
+</div>
+
 

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

@@ -0,0 +1,12 @@
+<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+
+<div class="center"><%= ties_to(@group) %></div>
+
+<%= render :partial => 'logo' %>
+<div class="space_center"></div>
+<%= render :partial => 'menu/group' %>
+<div class="space_center"></div>
+<%= render :partial => 'tabs' %>
+<div class="space_center"></div>
+
+<%= render :partial => 'subjects/contacts', :locals => { :subject => @group } %>

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

@@ -0,0 +1,136 @@
+<% content_for :toolbar do %>
+<%= render :partial => 'toolbar_show' %>
+<% end %>
+<% content_for :sidebar do %>
+<%= render :partial => 'sidebar_show' %>
+<% end %>
+<% content_for :headers do %>
+<%= stylesheet_link_tag "edit_user", :media => "screen, projection" %>
+<%= javascript_include_tag 'jquery.validate' %>
+<% end %>
+<%= form_for(@group, :remote => true) do |f| %>
+<% if @group.errors.any? %>
+<div id="error_explanation">
+    <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 %>
+<% content_for :javascript do %>
+$(function() { 
+$("#content").css('border-bottom', 'none'); 
+$(".edit_group").validate();  
+}); 
+<% end %>
+<div class="block">
+    <% if !params[:section].present? or params[:section].eql?("about_us") %>
+    <div class="form_row">
+      <h2><%=t('edit.group_info')%></h2>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= f.label :name %>
+        </div>
+				<div class="form_field">
+          <%= f.text_field :name,  :class => "required form_tag" %>
+				</div>
+    </div>
+    <%= f.fields_for :profile do |profile_form| %>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :organization %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :organization , :class => "form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :city %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :city,  :class => "form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :country %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :country,  :class => "form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <%= profile_form.label :description %>
+		</div>
+		<div class="form_row">
+        <%= profile_form.text_area :description, :maxlength => 400, :class => "form_tag" %>
+		</div>
+    
+    <% end %>
+    <% end %>
+    <% if !params[:section].present? or params[:section].eql?("contact_info") %>
+    <% content_for :javascript do %>
+    $(function() {
+    $("#contact_info").addClass('section_highlight');
+    });
+    <% end %>
+    <div class="form_row">
+      <h2><%=t('edit.contact')%></h2>
+    </div>
+    <%= f.fields_for :profile do |profile_form| %>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :phone %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :phone, :class => "phone form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :mobile %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :mobile, :class => "phone form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :fax %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :fax, :class => "phone form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :address %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :address, :class => "form_tag" %>
+				</div>
+    </div>
+    <div class="form_row">
+        <div class="form_label">
+            <%= profile_form.label :website %>
+        </div>
+				<div class="form_field">
+          <%= profile_form.text_field :website, :class => "url form_tag" %>
+				</div>
+    </div>
+    <% end %>
+    <% end %>
+</div>
+<div class="form_row center">
+    <%= f.submit "Update", :class => "button" %>&nbsp;
+    <button class="button" onclick="window.location.href='<%= group_url(@group) %>';">
+        Cancel
+    </button>
+</div>
+<% end %>

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

@@ -1,60 +1,61 @@
-<% content_for :head, stylesheet_link_tag("users") %>
+<% content_for :headers do  -%>
+  <%= stylesheet_link_tag 'smoothness/jquery-ui-1.8.4.custom'  %>
+<% end -%>
+<% javascript_include_tag 'jqcloud-0.1.3.min','ajax.paginate','jquery.min.js' %>
 
-<% content_for :middle do %>
-	<%= render :partial => "groups/middle_index" %>
-<% end %>
+<% toolbar_menu if user_signed_in? %>
 
-<% content_for :right do %>
-	<%= render :partial => "groups/right_index" %>
+<% content_for :sidebar do %>
+	<%= render :partial => "groups/sidebar_index" %>
 <% end %>
 
-
 <div id="map_location" class="content_size">
-		Your are here ><img src="images/btn/btn_browse.png" class="btn_config"%> <%=t('browse')%>: <span id="name_group"><%= t('group.all')%></span>
-</div>
-<div id="by_options" class="content_size"><%= link_to(t('user.by'), users_path) %> </div>
-<br class="clearfloat" />
-<div class="space_center">
+  Your are here ><img src="images/btn/btn_browse.png" class="btn_config"> <%=t('browse')%>: <span id="name_group"><b><%= t('group.all')%></b></span>, <%= link_to(t('user.by'), users_path) %>
 </div>
 
-<div id="my_conferences">
-		<div id="tabconference_browse" class="widget content_size">
-				<ul class="tabconference_browse">
-					<li>
-							<a href="/groups">All <%= t('group.other')%> (<%=Group.count%>) </a>
-					</li>
-						<li>
-								<a href="#most_popular"> <%= t('group.popular.most')%></a>
-						</li>
-						<li>
-								<a href="#most_voted"> <%= t('group.voted.most')%> </a>
-						</li>
-				</ul>
-				<div id="spaces" class="tabconference_browse">
-						<div class="space_center">
-						</div>
-                                                <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="letters" class="content_size">
-                                                    <% 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>
-                                                <div id="list_users_ajax">
-                                                  <%= render :partial => "groups/index"%>
-                                                </div>
-						<div class="space_center">
-						</div>
-				</div>
-</div>
+<div class="space_center"></div>
+<div class="space_center"></div>
+<div class="space_center"></div>
+<div class="space_center"></div>
+
+<div id="my_conferences" class="block">
+  <div id="tab" class="widget content_size">
+    <ul class="tab">
+      <li>
+          <a href="/groups">All <%= t('group.other')%> (<%=Group.count%>) </a>
+      </li>
+      <li>
+          <a href="#most_popular"> <%= t('group.popular.most')%></a>
+      </li>
+      <li>
+          <a href="#most_voted"> <%= t('group.voted.most')%> </a>
+      </li>
+    </ul>
+    <div id="spaces" class="tab">
+      <div class="space_center"></div>
+      <div class="row">
+        <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">
+          <% for g in Group.distinct_initials %>
+            <%= link_to g.initial,{:letter => g.initial,:page => 1},:class => "user_letter_link" %>
+          <% end %>
+        </div>
+      </div>
+      <div class="space_center"></div>
+      <div id="list_users_ajax" class="tab_content">
+        <%= render :partial => "groups/index"%>
+      </div>
+      <div class="space_center"></div>
+    </div>
+  </div>
 </div>	
 
  
 <br class="clearfloat" />
 <div class="space_center">
 </div>
-<%= javascript_include_tag "ajax.paginate" %>

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

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

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

@@ -1,9 +1,14 @@
-<% content_for :middle do %>
-  <%= render :partial => 'middle_show' %>
+<% content_for :headers do  -%>
+  <%= stylesheet_link_tag 'fcbkComplete' %>
+<% end -%>
+
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar_show' %>
 <% end %>
 
-<% content_for :right do %>
-  <%= render :partial => 'right_show' %>
+<% content_for :toolbar do %>
+  <%= render :partial => 'toolbar_show' %>
 <% end %>
 
 

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

@@ -0,0 +1,39 @@
+
+<% puts "llego al js" %>
+
+  if ($("#notice").length == 0){
+
+    $("#content").prepend('<div id="notice"></div>');
+    
+  } 
+	
+<% if @group.valid? %>
+ 	
+  $("#notice").html("<h2>Form Submitted!</h2><br/>");
+	$("#notice").removeClass('error_explanation');
+  $("#notice").addClass('confirmed');
+  $("#sidebarContent").replaceWith("<%= escape_javascript(render(:partial => 'sidebar_show'))%>");
+	
+  $("#contact_info").addClass('section_normal');
+	$("#personal_info").addClass('section_normal');
+	
+  <% if !params[:section].present? or params[:section].eql?("about_us") %>	                  
+		$("#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%>
+
+	
+<% else %>
+  $("#notice").html("<h2><%= pluralize(@group.errors.count, "error") %> prohibited this user from being saved:</h2>"
+	 +"<ul><% @group.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul><br/>");
+	$("#notice").removeClass('confirmed');
+	$("#notice").addClass('error_explanation'); 
+
+<% end %>
+
+