social_stream 0.3.6 → 0.4.0

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

@@ -8,15 +8,14 @@
     <div id='carousel_container'>
       <div id='left_scroll'><%=image_tag("btn/group_left.png")%></div>
       <div id='carousel_inner'>
-        <ul id='carousel_ul'>
+
     <% else %>
      <div class="space_center"></div>
     <%end%>
-
-    <%= render groups %>
-
+    <ul id='carousel_ul' class="menu_list">
+      <%= render groups %>
+    </ul>
     <% if (groups.count) > 10 %>
-        </ul>
      </div>
      <div id='right_scroll'><%=image_tag("btn/group_right.png")%></div>
     </div>

data/app/views/{users/_middle_index.html.erb → home/_sidebar.html.erb}

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

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

@@ -1,10 +1,8 @@
-<% content_for :middle do %>
-  <%= render :partial => 'middle' %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar' %>
 <% end %>
 
-<% content_for :right do %>
-  <%= render :partial => "right" %>
-<% end %>
+<% toolbar_menu %>
 
 <%= render :partial => 'location' %>
 

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

@@ -4,6 +4,10 @@
 		<li>2010 © </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/_header.erb

@@ -1,42 +1,34 @@
 <div id="headerFront">
-    <div class="banner_top">
-        <div id="header_left">
-          <div id="logo_txt">
-            <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          </div>
-          <% if user_signed_in? %>
-            <%=image_tag("btn/btn_home.png",:class=>"btn_config") %>
-            <div class="txt_config">
-              <%= link_to t('home'), home_path %>
-            </div>
-            <%=image_tag("btn/btn_profile.png",:class=>"btn_config") %>
-            <div class="txt_config">
-              <%= link_to(t('profile.one'), current_subject)%>
-            </div>
-              <%=image_tag("btn/btn_browse.png",:class=>"btn_config") %>
-            <div class="txt_config2">
-              <%=link_to(t('browse'),users_path) %>  &nbsp;
-            </div>
-          <% end %>
+  <div class="banner_top">
+    <div id="header_left">
+      <div id="logo_txt">
+        <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      </div>
+      <% if user_signed_in? %>
+        <div class="menu_list menu_white" id="menu_home">
+          <ul>
+            <li class="btn_menu_home"><%= link_to t('home'), home_path %></li>
+            <li class="pipe">|</li>
+            <li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
+            <li class="pipe"> | </li>
+            <li class="btn_menu_browse"><%=link_to(t('browse'),users_path) %></li>
+          </ul>
         </div>
-
-        <div id="header_right">
-          <% if user_signed_in? %>
-
-          <%=image_tag("btn/btn_config.png",:class=>"btn_config") %>
-          <div class="txt_config">
-            <%= link_to t('account.one'), '#' %>
-          </div>
-
-          <div id="representation">
-            <%= render :partial => 'layouts/representation' %>
-          </div>
-          <%=image_tag("btn/btn_exit.png",:class=>"btn_config") %>
-          <div class="txt_config2">
-            <%= link_to t('sign_out'), destroy_user_session_path %>
-          </div>
-          <% end %>
+      <% end %>
+    </div>
+    <div id="header_right">
+      <% if user_signed_in? %>
+        <div class="menu_list menu_white" id="menu_home">
+          <ul>
+            <li class="btn_menu_config"><%= link_to t('account.one'), '#' %></li>
+            <li class="pipe">|</li>
+            <li class="pipe"><%= render :partial => 'layouts/representation' %></li>
+            <li class="pipe"> | </li>
+            <li class="btn_menu_exit"><%= link_to t('sign_out'), destroy_user_session_path %></li>
+          </ul>
         </div>
+      <% end %>
     </div>
-    <br class="clearfloat" />
+  </div>
+  <br class="clearfloat" />
 </div>

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

@@ -1,6 +1,6 @@
 <%= link_to(image_tag(current_user.logo.url(:tie), :width => 20, :height => 20), current_user) %>
 
-<div class="txt_config">
+<li class="pipe">
   <%= link_to(current_user.name, current_user) %>
 
   <%= t('representation.action') %>
@@ -9,7 +9,7 @@
     <%= f.select :subject_dom_id, current_user.represented.unshift(current_user).map{ |s| [ s.name, dom_id(s) ] } %>
     <%= f.submit t('representation.change') %>
   <% end %>
-</div>
+</li>
 
 <%-# this should be in content_for(:javascript), but the partial is rendered after yield(:javascript) -%>
 <script type="text/javascript" charset="utf-8">

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

@@ -1,79 +1,52 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
-    <head>
-        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-        <title><%= yield(:title) || t('socialstream') %></title>
-
-        <%= stylesheet_link_tag "base", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "header", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "index", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "activities", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "right", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "home", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "browse", :media => "screen, projection" %>
-	    <%= stylesheet_link_tag "social_stream", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "boxy", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "middle", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "menu", :media => "screen, projection" %>  
-        <%= stylesheet_link_tag "carousel", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "smoothness/jquery-ui-1.8.4.custom", :media => "screen, projection" %>
-        <%= stylesheet_link_tag "ui.dropdownchecklist", :media => "screen, projection" %>
-		
-		<%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-
-        
-        <%= javascript_include_tag :defaults %>
-       
-        <%= javascript_include_tag 'jquery', 'jquery.livequery','jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.fcbkcomplete.min', 'jquery.ba-url' %>
-
-
-
-        <% if protect_against_forgery? %>
-          <%= csrf_meta_tag %>
-        <% end %>				
-
-        <script type="text/javascript" charset="utf-8">
-          $(document).ready(function() {
-            <%= yield :javascript %>
-          })
-        </script>
-
-        <%= yield :head %>
-    </head>
-    <body>
-        <div id="wrapper">
-            <%= render :partial => "layouts/header" %>
-            <div id="wrapper_body">
-                <div id="content">
-                	
-                	<% flash.each do |name, msg| %>
-                    <div id="<%= name %>">
-                    <%= msg %>
-                    </div>
-                  <% end %>
-				
-                	<%= yield %>
-                </div>
-                <div id="middle">
-                  <div id="middleContent">
-                      <%=  yield :middle %>
-                  </div>
-                </div>
-                <div id="right">
-                  <div id="rightContent">
-                    <div class="space_center">
-                    </div>
-                    <div class="space_center">
-                    </div>
-                    <div class="space_center">
-                    </div>
-                      <%= yield :right %>
-                  </div>
-                </div>
-                <br class="clearfloat" />
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <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'%>
+
+    <%= yield :headers %>
+
+    <link rel="shortcut icon" href="/images/icons/favicon.ico" />
+    <% if protect_against_forgery? %>
+      <%= csrf_meta_tag %>
+    <% end %>
+
+    <script type="text/javascript" charset="utf-8">
+      $(document).ready(function() {
+        <%= yield :javascript %>
+      })
+    </script>
+  </head>
+  <body>
+    <div id="wrapper">
+      <%= render :partial => "layouts/header" %>
+      <div id="wrapper_body">
+        <div id="toolbar">
+          <div id="toolbarContent" class="block">
+            <div class="space_center">
             </div>
-            <%= render :partial => "layouts/footer" %>
+              <%= yield :toolbar %>
+          </div>
         </div>
-
-    </body>
+        <div id="content">
+          <% flash.each do |name, msg| %>
+            <div id="<%= name %>">
+            &laquo; <%= msg %> &raquo;
+            </div>
+          <% end %>
+          <%= yield %>
+        </div>
+        <div id="sidebar">
+          <div id="sidebarContent">
+              <%=  yield :sidebar %>
+          </div>
+        </div>
+        <div class="space_center white"></div>
+      </div>
+      <%= render :partial => "layouts/footer" %>
+    </div>
+  </body>
 </html>

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

@@ -1,51 +1,30 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title><%= yield :title %></title>
-        <%= stylesheet_link_tag "frontpage", :media => "screen, projection" %>
-        <%= javascript_include_tag 'jquery', 'jquery.livequery' %>
-        <script type="text/javascript" charset="utf-8">
-			$(document).ready(function() {
-				<%= yield :javascript%>
-			});
-			
-        </script>		
-		<%= yield :headers %>
-    </head>
-    <body>
-        <div id="site">
-            <%= render :partial => "header" %>
-            <div id="home">
-                <div id="header">
-                    <div class="banner_busqueda">
-                        <div id="espacio_busqueda">
-                            <% flash.each do |name, msg| %>
-                            <div id="<%= name %>">
-                                <%= msg %>
-                            </div>
-                            <% end %>
-                        </div>
-                        <div class="div_busqueda">
-                            <div id="subtexto_busqueda">
-                                <%=link_to t("browse"), groups_path,:class => "show_all_link" %>
-                            </div>
-                            <%= yield :search %>
-                        </div>
-                        <br class="clearfloat" />
-                    </div>
-                </div>
-                <div id="content">
-                    <%= yield %>
-                </div>
-            </div>
-            <div id="sponsor-wrapper">
-                <%= render :partial => "sponsor" %>
-            </div>
-            <div id="footer-wrapper">
-                <%= render :partial => "layouts/footer" %>
-            </div>
-        </div>
-
-    </body>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title><%= yield(:title) || t('socialstream') %></title>
+    <%= stylesheet_link_tag "header","frontpage", "base", "footer",
+                            :media => "screen, projection" %>
+    <%= javascript_include_tag 'jquery', 'jquery.livequery' %>
+    <link rel="shortcut icon" href="/images/icons/favicon.ico" />
+    <% if protect_against_forgery? %>
+      <%= csrf_meta_tag %>
+    <% end %>
+    <script type="text/javascript" charset="utf-8">
+    $(document).ready(function() {
+      <%= yield :javascript%>
+    });
+    </script>
+    <%= yield :headers %>
+  </head>
+  <body>
+    <div id="wrapper">
+      <%= render :partial => "frontpage/header" %>
+      <div id="wrapper_body">
+        <%= yield %>
+      </div>
+      <%= render :partial => "frontpage/sponsor" %>
+      <%= render :partial => "layouts/footer" %>
+    </div>
+  </body>
 </html>

data/app/views/layouts/test.html

@@ -0,0 +1,44 @@
+<!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>
+</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>
+</body>
+</html>

data/app/views/likes/create.js.erb

@@ -1,2 +1,2 @@
-$(".verb_like#like_activity_<%= @like.parent.id %>").html("<%= escape_javascript(link_like(@like.parent) ) %>");
+$(".verb_like#like_activity_<%= @like.activity.id %>").html("<%= escape_javascript(link_like(@like.activity) ) %>");
 

data/app/views/likes/destroy.js.erb

@@ -1 +1 @@
-$(".verb_like#like_<%= dom_id(@like.parent) %>").html("<%= escape_javascript(link_like(@like.parent) ) %>");
+$(".verb_like#like_<%= dom_id(@like.activity) %>").html("<%= escape_javascript(link_like(@like.activity) ) %>");

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

@@ -0,0 +1,33 @@
+
+<% content_for :javascript do %>
+
+
+$('#new_logoA_form')
+    .bind("ajax:complete", function(evt, data, status, xhr){
+
+      // Insert response partial into page below the form.
+      $('#prueba').append(xhr.responseText);
+
+    });
+
+<%end%>
+
+
+<%= form_for :logo, @logo,:url => logos_path, :html => { :multipart => true, :id=>'new_logo_form' }, :remote => false do |f| %>
+  <% if @logo.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@logo.errors.count, "error") %> prohibited this logo from being saved:</h2>
+
+      <ul>
+      <% @logo.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <%= f.file_field :logo %>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+  <div id= "prueba"></div>
+<% end %>

data/app/views/logos/_precrop.html.erb

@@ -0,0 +1,48 @@
+Crop your image:
+
+
+<% my_file_name = File.basename(@logo.logo.queued_for_write[:original].path) %>
+<div style="width:100px;height:100px;overflow:hidden;margin-left:5px;"> 
+		<%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
+</div>
+<div id="precropDiv">
+	<%= image_tag "tmp/#{my_file_name}",:id=>"cropImage" %>
+</div>
+
+<% precrop_dimensions = @logo.image_dimensions(my_file_name) %>
+
+<% content_for :javascript do %>
+        jQuery('#cropImage').Jcrop({
+            bgColor:     'clear',
+            bgOpacity:   .6,
+            setSelect:   [ 0, 0, 200, 200 ],
+            aspectRatio: 1 ,
+            onChange: update_crop,
+            onSelect: update_crop
+        });
+
+function update_crop(coords) {
+  var rx = 100/coords.w;
+  var ry = 100/coords.h;
+  $('#preview').css({
+    width: Math.round(rx * <%= precrop_dimensions[:width] %>) + 'px',
+    height: Math.round(ry * <%= precrop_dimensions[:height] %>) + 'px',
+    marginLeft: '-' + Math.round(rx * coords.x) + 'px',
+    marginTop: '-' + Math.round(ry * coords.y) + 'px'
+  });
+  var ratio = <%= precrop_dimensions[:width] %> / <%= precrop_dimensions[:height] %>;
+  $("#crop_x").val(Math.round(coords.x * ratio));
+  $("#crop_y").val(Math.round(coords.y * ratio));
+  $("#crop_w").val(Math.round(coords.w * ratio));
+  $("#crop_h").val(Math.round(coords.h * ratio));
+}
+<% end %>
+
+<%= form_for :logo, @logo,:url => logos_path, :html => { :multipart => true } do |f| %>
+
+  <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
+    <%= f.text_field attribute, :id => attribute %>
+  <% end %>
+  <p><%= f.submit "Crop" %></p>
+<% end %>
+