social_stream 0.4.4 → 0.4.5

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

@@ -0,0 +1,72 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "contacts.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'ui.checkbox'%>
+<% end %>
+
+<%= javascript_tag do %>
+  $(function() {
+    $('input[id^="relation_custom"]').checkBox();
+  })
+	
+  function checkBoxEnable(id) {
+    $('div[contain$=' + id + ']').addClass("checked-option");
+
+    var sphere = $("#"+id).attr("optionOf");
+    $(':checkbox[optionOf$='+sphere+']:checked:not(#'+id+')').checkBox('changeCheckStatus', false);
+  }
+
+  function checkBoxDisable(id) {
+    $('div[contain$='+id+']').removeClass("checked-option");
+  } 
+<% end %>
+
+<div class="dialog_add_contact" id="new_contact">
+  <div class="content_add_user" >
+    <div class="activity_add_contact">
+      
+      <%= form_for @contact, :url => contact_path(@contact.to_param), :html => { :method => :put } do |f| %>  
+        <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>
+        	   
+        <div class="block">
+          <div class="form_row center">
+            <h2><%= t("contact.#{ controller.action_name }.title") %></h2>
+          </div>	
+
+          <div class="two_columns_container">
+            <div class="form_column_left">
+              <p class="colum_field_title"><%= t('message.one') %></p>
+              <%= f.text_area :message, :class =>"new_contact_text_area" %>
+            </div>
+          
+            <div class="form_column_right">
+              <div class="select_relations">	
+                <div id="relationsSelect" class="dropdown">
+                  <dd>
+                    <ul>
+                      <% @contact.sender.spheres.each do |sphere| %>
+                        <li class="sphere_name"><span class="sphere_name"><%= sphere.name %></span></li>
+                        <% sphere.customs.sort.each do |relation| %>
+                          <li>
+                            <div contain="<%= dom_id relation %>">
+                              <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" optionOf="<%= sphere.name %>" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
+                              <label for="<%= dom_id relation %>">
+                                <%= relation.name %>
+                              </label>
+                            </div>
+                          </li>
+                        <% end %>
+                        <% end %>
+                      </ul>
+                    </dd>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form_bottom">
+              <%= submit_tag t("contact.#{ controller.action_name }.submit"), :class => "button" %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+</div>

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

@@ -16,7 +16,7 @@
         <%=link_to(contact.name, contact)%>
       </div>
       <div class="link">
-        <%= ties_to(contact) %>
+        <%= contact_to(contact) %>
       </div>
     </div>
   </div>

data/app/views/{ties → contacts}/_pendings.html.erb

@@ -1,11 +1,11 @@
-<% if current_subject.pending_ties.any? %>
+<% if current_subject.pending_contacts.any? %>
 <div class="block">
   <div class="header">
     <%= image_tag('btn/btn_notifications.png', :class => "header_icon") %>
-    <div class="header_text"><%= t 'tie.pending.other' %></div>
+    <div class="header_text"><%= t 'contact.pending.other' %></div>
   </div>
   <div class="content">
-    <%= render current_subject.pending_ties %>
+    <%= render current_subject.pending_contacts %>
   </div>
 </div>
 <% end -%>

data/app/views/{ties → contacts}/_suggestions.html.erb

@@ -1,10 +1,10 @@
 <% if current_subject.suggestion.present? %>
   <% content_for :javascript do %>
 
-    $(".suggestions .tie_close").livequery("click",function(){
+    $(".suggestions .contact_close").livequery("click",function(){
     temp = $(this);
-    $.get("<%=suggestion_ties_path%>", function(data) {
-    temp.parents(".tie").replaceWith(data);
+    $.get("<%=suggestion_contacts_path%>", function(data) {
+    temp.parents(".contact").replaceWith(data);
     });
 
     });
@@ -15,12 +15,12 @@
     <div class="header">
       <%= image_tag('btn/notifications.png', :class => "header_icon") %>
       <div class="header_text">
-        <%=t('tie.suggestion.one') %>
+        <%=t('contact.suggestion.one') %>
       </div>
     </div>
     <div class="content">
       <% if (sgs = current_subject.suggestions(2)).present? %>
-        <%= render :partial => '/ties/tie', :collection => sgs %>
+        <%= render :partial => 'contacts/contact', :collection => sgs %>
       <%end%>
     </div>
   </div>

data/app/views/contacts/_suggestions_and_pendings.html.erb

@@ -0,0 +1,6 @@
+<% if user_signed_in? %>
+  <div class="space_center"></div>
+  <%= render :partial => "contacts/suggestions" %>
+  <div class="space_center"></div>
+  <%= render :partial => 'contacts/pendings' %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
+<% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
+                    t('contact.edit.title'), edit_contact_path(@contact.to_param)) %>
+
+<%= render :partial => 'form' %>

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

@@ -20,7 +20,7 @@
         <%= link_to t('contact.all_n', :count => current_subject.contacts(:direction => :sent).count), contacts_path %> -
         <% Actor.distinct_initials.
                  contacted_from(current_subject).
-                 merge(Tie.related_by(current_subject.relations.find_by_id(params[:relation]))).
+                 merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).
                  distinct_initials.
                  each do |l| %>
           <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>

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

@@ -0,0 +1,5 @@
+<% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
+<% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
+                    t('contact.new.title'), new_contact_path(:id => @contact.to_param)) %>
+
+<%= render :partial => 'form' %>

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

@@ -26,7 +26,7 @@
 </div>
 <% unless @box.eql?'trash' %>
 <div class="action">
-	<%= link_to(image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"),
+	<%= link_to(image_tag('btn/btn_delete.png', :alt => "Delete", :title => "Delete"),
 	conversation_path(conversation, :location => @box, :box => @box, :page => params[:page]),
 	:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',
 	:method => :delete, :remote => true) %>

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

@@ -1,8 +1,3 @@
-<%= location(
-	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
-) %>
-
-
 
 <br class="clearfloat" />
 <div class="space_center">

data/app/views/conversations/_show.html.erb

@@ -1,9 +1,8 @@
-
-
 <%= location(
 	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true),
 	link_to(image_tag("btn/message_conversation.png", :class => "menu_icon")+ truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
 ) %>
+
 <br class="clearfloat" />
 <div class="space_center">
 </div>

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

@@ -14,6 +14,10 @@
   $('.pagination a').attr('data-remote', 'true');
 <% end %>
 
+<%= location(
+    link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
+) %>
+
 <% toolbar :option => :messages %>
 
 <%= render :partial => 'index' %>

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

@@ -1,4 +1,5 @@
 $("#content").html("<%=escape_javascript(render :partial => 'index') %>");
+<%= location(link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)) %>
 
 $('.pagination a').attr('data-remote', 'true');
 	  

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

@@ -3,10 +3,9 @@
 <%end%>
 
 <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>

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

@@ -12,8 +12,12 @@
         <div class="name black" >
           <%= link_to group.name, group %>
         </div>
+        <div class="brief">
+          <%= t 'follower.n', :count => group.follower_count %>,
+          <%= t 'like.n',     :count => group.like_count %>
+        </div>
         <div class="link">
-          <%= ties_to(group) %>
+          <%= contact_to(group) %>
         </div>
       </div>
     </div>

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

@@ -18,9 +18,10 @@
 <% end %>
 
 <%= location(
-  link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), groups_path),
-  link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path('group' => { '_founder' => current_subject.slug }))
-) %>
+    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), groups_path),
+    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path('group' => { '_founder' => current_subject.slug }))
+  ) %>
+
 <div class="space_center"></div>
 
 <%= form_for @group do |f| %>

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

@@ -10,18 +10,11 @@
     </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' %>
+</div
 
+<%= render :partial => 'contacts/suggestions_and_pendings' %>
 
 <%= javascript_include_tag "jqcloud-0.1.3.min.js" %>
-<% end %>
-
 
 <% tags = ActivityObject.tag_counts %>
 
@@ -35,4 +28,4 @@
   $(document).ready(function() {
     $("#wordcloud").jQCloud(word_list);
   });
-</script>
+</script>

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

@@ -1,11 +1,3 @@
 <div class="space_center"></div>
 
-<% if user_signed_in? %>
-  <%= render :partial => "ties/suggestions" %>
-  <div class="space_center">
-  </div>
-  <%= render :partial => 'ties/pendings' %>
-<% end %>
-
-
-
+<%= render :partial => 'contacts/suggestions_and_pendings' %>

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

@@ -11,11 +11,9 @@
 <% 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"><b><%= t('group.all')%></b></span>, <%= link_to(t('user.by'), users_path) %>
-</div>
-
+<%= location(image_tag("btn/btn_browse.png", :class=>"btn_config") + t('browse') +": "+ 
+             link_to(t('user.by'), users_path) + ", "+ 
+             content_tag(:b,content_tag(:span, t('group.all'), :id=>'name_group')))%>
 
 <div class="space_center"></div>
 <div class="space_center"></div>
@@ -26,13 +24,13 @@
   <div id="tab" class="widget content_size">
     <ul class="tab">
       <li>
-          <a href="/groups">All <%= t('group.other')%> (<%=Group.count%>) </a>
+        <%= link_to t('group.all_n', :count => Group.count), :most => nil %>
       </li>
       <li>
-          <a href="#most_popular"> <%= t('group.popular.most')%></a>
+        <%= link_to t('group.most.followed'), :most => :followed %>
       </li>
       <li>
-          <a href="#most_voted"> <%= t('group.voted.most')%> </a>
+        <%= link_to t('group.most.liked'), :most=> :liked %>
       </li>
     </ul>
     <div id="spaces" class="tab">

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

@@ -1,18 +1,25 @@
 <% content_for :title do %>
   <%= @group.name%>
 <% end %>
-<% content_for :description do %>
-  <%= @group.profile.description%>
+
+<% if @group.profile.description? %>
+  <% content_for :description do %>
+    <%= @group.profile.description%>
+  <% end %>
 <% end %>
 
+<% content_for :keywords do %>
+  <%= @group.profile.subject.tag_list%>
+<% end %>
 <% content_for :sidebar do %>
   <%= render :partial => 'sidebar_show' %>
 <% end %>
 
+<%= location(link_to(image_tag("btn/btn_group.png", :class => "btn_config")+t('group.one')+": "+
+                      content_tag(:span, ( sanitize @group.name), :class=>"name_group")))%>
+                      
 <% toolbar :profile => @group %>
 
-<%= render :partial => 'location' %>
-
 <br class="clearfloat" />
 <div class="space_center">
 </div>

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

@@ -1,16 +1,2 @@
-<div class="space_center"></div>
-<%= render :partial => "ties/suggestions" %>
-<div class="space_center"></div>
-<%= render :partial => 'ties/pendings' %>
+<%= render :partial => 'contacts/suggestions_and_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

@@ -2,10 +2,11 @@
   <% render :partial => 'sidebar' %>
 <% end %>
 
+<%= location(link_to(image_tag("btn/btn_home.png", :class => "btn_config")+t('home')+": "+
+                      content_tag(:span, ( sanitize current_subject.name), :class=>"name_group")))%>
+                      
 <% toolbar %>
 
-<%= render :partial => 'location' %>
-
 <br class="clearfloat" />
 <div class="space_center">
 </div>

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

@@ -9,7 +9,7 @@
         <%= link_to 'Notifications', '#' %>
       </li>
       <li class="current">
-        <%= link_to 'Privacy', '#' %>
+        <%= link_to 'Privacy', spheres_path %>
       </li>
     </ul>
   </li>

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

@@ -0,0 +1,5 @@
+<% flash.each do |name, msg| %>
+  <div class="<%= name %>">
+    <%= msg %>
+  </div>
+<% end %>

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

@@ -1,13 +1,14 @@
 <div id="footerFront">
 	<div id="footer">
+    <div class="rowfooter">
+      <%= link_to(image_tag('HTML5.png'), 'http://validator.w3.org/check?uri=referer') %>
+      <%= link_to(image_tag('HTML5_Styling.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
+      <%= link_to(image_tag('HTML5_Semantics.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
+    </div>
 	  <ul>
 		<li>2011 © </li>
 		<li id="trade_mark"><%= link_to t('socialstream'), 'http://social-stream.dit.upm.es/' %></li>
 	  </ul>
-    <div class="row">
-      <%= link_to(image_tag('w3c_xhtml.png'), 'http://validator.w3.org/check?uri=referer') %> -
-      <%= link_to(image_tag('w3c_css.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
-    </div>
 	</div>
 </div>
 

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

@@ -1,14 +1,12 @@
 <div id="current_user_info">
   <%= link_to(image_tag(current_user.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon'), current_user) %>
   <%= link_to(current_user.name, current_user) %>
+
   <%= t('representation.action') %>
 </div>
-<%= 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) ] }, :class=>"button sf-menu" %>
-  <%= f.submit t('representation.change') %>
-<% end %>
-<% representations = current_user.represented.unshift(current_user) %>
-<% representations.delete(current_subject) %>
+
+<% representations = current_user.represented.unshift(current_user) - [current_subject] %>
+
 <div id="representations_menu">
   <ul class="sf-menu" >
     <li id="representation_li">
@@ -16,15 +14,10 @@
       <ul>
         <% representations.each do |representation| %>
         <li>
-          <%= link_to  representation.name , representation_path(:representation => {:subject_dom_id => dom_id(representation)}),:method => :post,:hola => "yes", :style => "background: transparent url('#{representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;"%>
+        <%= link_to representation.name, { :s => representation.slug }, { :style => "background: transparent url('#{representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
        </li>
         <% end %>
       </ul>
     </li>
   </ul>
 </div>
-<%-# this should be in content_for(:javascript), but the partial is rendered after yield(:javascript) -%>
-<script type="text/javascript" charset="utf-8">
- $("#new_representation").hide();
- $("#representation_li").show();
-</script>