From dd6b5db71bb4b056982ebd1ab4e3e171504e291b Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 28 Apr 2008 03:15:52 +0000
Subject: [PATCH] ActionItem260: Search formatation apear ok now. May be better, but this is ok.

---
 app/helpers/forms_helper.rb                                     |  12 ++++++++++++
 app/views/consumed_products/new.rhtml                           |  10 ++++++++--
 app/views/layouts/application.rhtml                             |  16 +++++++++-------
 app/views/search/_category.rhtml                                |  22 +---------------------
 app/views/search/_comment.rhtml                                 |  19 +++++++++++++++++--
 app/views/search/_display_results.rhtml                         |  23 ++++++++++++-----------
 app/views/search/_search_form.rhtml                             |  32 ++++++++++++++------------------
 app/views/search/index.rhtml                                    |   5 ++++-
 app/views/search/popup.rhtml                                    |   4 +---
 app/views/shared/categories_menu.rhtml                          |   2 +-
 doc/README_FOR_APP                                              |   2 ++
 public/designs/themes/default/stylesheets/controller_search.css | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 public/stylesheets/common.css                                   |  65 ++++++++++++++++++++++++++++++++++-------------------------------
 public/stylesheets/controller_search.css                        |  21 +++++++++++++++++++++
 public/stylesheets/search.css                                   |  20 +++++++++++++++-----
 15 files changed, 240 insertions(+), 133 deletions(-)

diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index aa1c879..a986af4 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -10,4 +10,16 @@ module FormsHelper
 
   end
 
+  def labelled_radio_button( human_name, name, value, checked = false, options = {} )
+    options[:id] ||= 'radio-' + rand.to_s
+    radio_button_tag( name, value, checked, options ) +
+    content_tag( 'label', human_name, :for => options[:id] )
+  end
+
+  def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
+    options[:id] ||= 'checkbox-' + rand.to_s
+    check_box_tag( name, value, checked, options ) +
+    content_tag( 'label', human_name, :for => options[:id] )
+  end
+
 end
diff --git a/app/views/consumed_products/new.rhtml b/app/views/consumed_products/new.rhtml
index d3131d2..b2eb615 100644
--- a/app/views/consumed_products/new.rhtml
+++ b/app/views/consumed_products/new.rhtml
@@ -3,8 +3,14 @@
 <%= error_messages_for :consumption  %>
 
 <% form_for :consumption, @consumption do |f|  %>
-  <p> <%= _('Product:') %> <%= f.select "product_category_id", ProductCategory.find(:all).map{|pc| [pc.name, pc.id]} %></p>
-  <p> <%= _('Aditional specifications:') %><br> <%= f.text_area "aditional_specifications" %> </p>
+  <p>
+    <%= _('Product:') %>
+    <span class="formfield"> <%= f.select "product_category_id", ProductCategory.find(:all).map{|pc| [pc.name, pc.id]} %> </span>
+  </p>
+  <p>
+    <%= _('Aditional specifications:') %> <br />
+    <span class="formfield"> <%= f.text_area "aditional_specifications", :rows => 5 %> </span>
+  </p>
   <% button_bar do %>
     <%= submit_button('add', _('Add product'), :cancel => {:action => 'index'})  %>
   <% end %>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index edffd3c..8101af4 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -127,21 +127,23 @@
           <% end %>
 
         </div><!-- id="content" -->
-        <div id="footer_content"><!-- Rodape do onteudo -->
+        <div id="footer_content"><!-- Rodape do Conteudo -->
         </div><!-- id="footer_content" -->
       </div><!-- id="frame" -->
     </div><!-- id="wrap" -->
 
     <div id="footer">
-      Um projeto do FBES <br/>
-      F&oacute;rum Brasileiro de Economia Solid&aacute;ria
-      <p/>
+      <a href="http://fbes.org.br" id="footer-esq">
+        <%= _('A FBES project') %> <br/>
+        F&oacute;rum Brasileiro de Economia Solid&aacute;ria
+      </a>
+      <a href="http://colivre.coop.br" id="footer-dir">
+        <%= _('Desenvolvimento Colivre') %> <br/>
+        Cooperativa de Tecnologias Livres
+      </a>
       <%= language_chooser %>
       <p/>
       <%= footer %>
-      <p/>
-      Desenvolvimento Colivre <br/>
-      Cooperativa de Tecnologias Livres
     </div><!-- id="footer" -->
 
     <div id="helpBox" style="display:none">
diff --git a/app/views/search/_category.rhtml b/app/views/search/_category.rhtml
index 187a1f8..0486f9e 100644
--- a/app/views/search/_category.rhtml
+++ b/app/views/search/_category.rhtml
@@ -15,27 +15,7 @@
   <div class="category-innerbox">
     <ul class="recent_on_cat recent_comments">
     <% @recent_comments.each do |comment| %>
-      <li>
-        <% if comment.author %>
-          <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
-              :class => 'comment-picture',
-              :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
-          %>
-        <% else %>
-          <%# unauthenticated user: display gravatar icon %>
-          <%= content_tag 'span', '&nbsp;',
-              :class => 'comment-picture',
-              :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
-          %>
-        <% end %>
-        <strong><%= link_to(comment.title, comment.url) %></strong>
-        <div class="item_meta">
-          <%= _('by %{author} on "%{article}"') % {
-                    :comment => link_to(comment.title, comment.url),
-                    :article => link_to(comment.article.title, comment.article.url),
-                    :author => comment.author_name } %>
-        </div>
-      </li>
+      <%= render :partial => 'comment', :object => comment %>
     <% end %>
     </ul>
   </div><!-- end class="category-innerbox" -->
diff --git a/app/views/search/_comment.rhtml b/app/views/search/_comment.rhtml
index a9e5be7..1cacab1 100644
--- a/app/views/search/_comment.rhtml
+++ b/app/views/search/_comment.rhtml
@@ -1,7 +1,22 @@
 <li>
-  <strong><%= link_to(comment.title, comment.url)%></strong>
+  <%- if comment.author -%>
+    <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
+        :class => 'comment-picture',
+        :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
+    %>
+  <%- else -%>
+    <%# unauthenticated user: display gravatar icon %>
+    <%= content_tag 'span', '&nbsp;',
+        :class => 'comment-picture',
+        :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
+    %>
+  <%- end %>
+  <strong><%= link_to(comment.title, comment.url) %></strong>
   <div class="item_meta">
-    <span class="cat_item_by"><%= _('by %s, on "%s"') % [comment.author_name, link_to(comment.article.name, comment.article.url)] %></span>
+    <%= _('by %{author} on "%{article}"') % {
+              :comment => link_to(comment.title, comment.url),
+              :article => link_to(comment.article.title, comment.article.url),
+              :author => comment.author_name } %>
   </div>
 </li>
 
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 8bc0b71..52ee4d9 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -1,15 +1,15 @@
-<%= render :partial => 'search_form' %>
-
-<div>
-<%= link_to _('Search for "%s" in the whole site') % @query, :controller => 'search', :action => 'index', :category_path => [], :query => @query if @category %>
-</div>
-
-
 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
-<% pos = :odd %>
-<% @results.each do |name,results| %>
+<%
+  pos2 = :odd  # allow to format in a two colons layout
+  pos3 = 3     # allow to format in a thre colons layout
+%>
+<% @results.sort_by { |name,results| @names[name] }.each do |name,results| %>
+  <%
+    pos3 += 1;  pos3 = 1 if pos3 > 3
+    pos2==:odd ? pos2=:even : pos2=:odd
+  %>
   <% if !results.nil? and !results.empty? %>
-    <div class="search-results-<%= name %> search-results-box <%= pos==:odd ? pos=:even : pos=:odd %>">
+    <div class="search-results-<%= name %> search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
       <% if @controller.action_name != 'assets' %>
         <h3><%= @names[name] %></h3>
       <% end %>
@@ -23,7 +23,7 @@
       </div><!-- end class="search-results-innerbox" -->
     </div><!-- end class="search-results-<%= name %>" -->
   <% else %>
-    <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos==:odd ? pos=:even : pos=:odd %>">
+    <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
       <% if @controller.action_name != 'assets' %>
         <h3><%= @names[name] %></h3>
       <% end %>
@@ -35,3 +35,4 @@
 <% end %>
 <br style="clear:both" />
 </div><!-- end id="search-results" -->
+
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
index f679676..a3cbac7 100644
--- a/app/views/search/_search_form.rhtml
+++ b/app/views/search/_search_form.rhtml
@@ -1,4 +1,6 @@
-<% form_tag({:action => 'index', :category_path => (@category ? @category.explode_path : [])}, :method => 'get') do%>
+<% form_tag( { :action => 'index', :category_path => ( @category ? @category.explode_path : [] ) },
+               :method => 'get', :class => 'search_form' ) do %>
+  <%= '<h3>%s</h3>' % form_title if defined? form_title %>
 
   <div class="search-field">
     <span class="formfield">
@@ -9,36 +11,30 @@
   </div>
 
   <% if @category %>
-    <h3><%= _('Search in:') %></h3>
+  <div class="search-options search-in">
+    <h4><%= _('Search in:') %></h4>
     <ul>
-      <li>
-      <%= radio_button_tag :search_whole_site, 'no', true %>
-      <span><%= _('Only in %{category}') % { :category => @category.full_name } %></span>
-      </li>
-      <li>
-      <%= radio_button_tag :search_whole_site, 'yes' %>
-      <span><%= _('Whole site') %></span>
-      </li>
+      <li><%= labelled_radio_button _('Only in %s') % @category.full_name(' &rarr; '), :search_whole_site, 'no', true %></li>
+      <li><%= labelled_radio_button _('Whole site'), :search_whole_site, 'yes' %></li>
     </ul>
+  </div><!-- fim class="search-options" -->
   <% end %>
 
-  <div class="search-options">
-    <h3><%= _('Search for:') %></h3>
+  <div class="search-options search-for">
+    <h4><%= _('Search for:') %></h4>
     <ul>
       <% @search_in.map { |t,n| [t,gettext(n)] } .
                     sort_by(&:last).each do |thing, name| %>
         <li>
-        <%= check_box_tag 'find_in[]', thing.to_s, true %>
-        <span><%= name %></span>
+        <%= labelled_check_box name, 'find_in[]', thing.to_s, true %>
         </li>
       <% end %>
     </ul>
     <br style="clear:both" />
   </div><!-- fim class="search-options" -->
 
-  <% button_bar do %>
-    <%= submit_button(:search, _('Search')) %>
-    <%= lightbox_close_button(_('Close')) if lightbox? %>
-  <% end %>
+  <% if lightbox?; button_bar do %>
+  <%= lightbox_close_button _('Close') %>
+  <% end; end %>
 
 <% end %>
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 438d875..174c953 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -1,4 +1,7 @@
-<h2> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h2>
+<h1> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h1>
 
 <%= render :partial => 'display_results' %>
 
+<%= render :partial => 'search_form', :locals => { :form_title => _("Filter your search") } %>
+<br style="clear:both" />
+
diff --git a/app/views/search/popup.rhtml b/app/views/search/popup.rhtml
index 3386919..a221dca 100644
--- a/app/views/search/popup.rhtml
+++ b/app/views/search/popup.rhtml
@@ -1,8 +1,6 @@
 <div id="search-popup">
 
-<h2><%= _('Search %s') % @environment.name %></h2>
-
-<%= render :partial => 'search_form' %>
+<%= render :partial => 'search_form', :locals => { :form_title => _('Search %s') % @environment.name } %>
 
 <script type='text/javascript'>
   $('query').focus();
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
index 2473edb..1e4624c 100644
--- a/app/views/shared/categories_menu.rhtml
+++ b/app/views/shared/categories_menu.rhtml
@@ -6,7 +6,7 @@
       <ul>
         <% item.all_children.each do |child| %>
           <% if (@controller.controller_name == 'search') && (@controller.action_name == 'assets') %>
-            <li><%=h link_to(content_tag('span', child.name), :controller => 'search', :action => 'assets', :asset => params[:asset], :category_path => child.explode_path) %></li>
+            <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'assets', :asset => params[:asset], :category_path => child.explode_path) %></li>
           <% else %>
             <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'category_index', :category_path => child.explode_path) %></li>
           <% end %>
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index bd3ab83..a1c218d 100644
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -49,6 +49,8 @@ commands and make sure you understand what you are doing):
  rake makemo
  # create some test data:
  ./script/populate
+ # install the test dependences:
+ aptitude install libtidy-ruby libhpricot-ruby
  # run the automated test suite to make sure your environment is sane:
  rake test
 
diff --git a/public/designs/themes/default/stylesheets/controller_search.css b/public/designs/themes/default/stylesheets/controller_search.css
index ec39bac..8b9ec8b 100644
--- a/public/designs/themes/default/stylesheets/controller_search.css
+++ b/public/designs/themes/default/stylesheets/controller_search.css
@@ -1,4 +1,51 @@
 
+#view-category,
+#search-results {
+  padding: 0% 2% 10px 2%;
+}
+
+#view-category a,
+#search-results a {
+  text-decoration: none;
+}
+#view-category a:hover,
+#search-results .search-results-type-comment a:hover,
+#search-results .search-results-type-article a:hover,
+#search-results .search-results-type-product a:hover {
+  text-decoration: underline;
+}
+
+#content .search_form {
+  margin: 0px;
+  padding: 0% 10%;
+}
+
+body.category1 .search-options {
+  border: 1px solid #E26B00;
+}
+body.category2 .search-options {
+  border: 1px solid #58A80A;
+}
+body.category3 .search-options {
+  border: 1px solid #694371;
+}
+body.category4 .search-options {
+  border: 1px solid #B80000;
+}
+
+.search-results-box {
+  width: 32.5%;
+}
+
+.search-results-box.odd {
+  margin-left: 0px;
+}
+
+.search-results-box.col2_of3,
+.search-results-box.col3_of3 {
+  margin-left: 1.25%;
+}
+
 .category-innerbox,
 .search-results-innerbox {
   padding: 10px 0px 10px 10px;
@@ -7,14 +54,17 @@
   background: #B8CFE7;
   -moz-border-radius: 15px;
 }
-
-.search-results-type-article a,
-.search-results-type-product a {
-  text-decoration: none;
+body.category1 .search-results-innerbox {
+  background: #FDD79E;
 }
-.search-results-type-article a:hover,
-.search-results-type-product a:hover {
-  text-decoration: underline;
+body.category2 .search-results-innerbox {
+  background: #C4F099;
+}
+body.category3 .search-results-innerbox {
+  background: #D6BFD3;
+}
+body.category4 .search-results-innerbox {
+  background: #F79494;
 }
 
 .search-results-type-product li li a {
@@ -38,12 +88,41 @@
   padding: 0px 0px 5px 0px;
 }
 
-/* * * Category Page * * * * * * * * * * * * */
+.search-results-type-profile.common-profile-list-block a {
+  width: 90px;
+}
+.search-results-type-profile.common-profile-list-block li div {
+  width: 88px;
+  height: 64px;
+}
+.search-results-type-profile.common-profile-list-block li span {
+  display: block;
+  width: 82px;
+}
 
-.category_itens ul a {
-  text-decoration: none;
+.search-results-type-profile.common-profile-list-block li a {
+  color: #000;
+}
+
+body.category1 .search-results-type-profile.common-profile-list-block li a {
+  background: #FDD79E;
+}
+body.category2 .search-results-type-profile.common-profile-list-block li a {
+  border: 2px solid #C4F099 !important;
+}
+body.category2 .search-results-type-profile.common-profile-list-block li a:hover {
+  border: 2px solid #61B60E !important;
+  background: #D0F8A0 !important;
+}
+body.category3 .search-results-type-profile.common-profile-list-block li a {
+  background: #D6BFD3;
+}
+body.category4 .search-results-type-profile.common-profile-list-block li a {
+  background: #F79494;
 }
 
+/* * * Category Page * * * * * * * * * * * * */
+
 #view-category h2 {
   font-size: 16px;
   line-height: 20px;
@@ -60,18 +139,6 @@
   float: left;
 }
 
-#category-comments {
-  margin-left: 55%;
-}
-
-#content #category-comments ul,
-#content #category-comments li {
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  color: #888;
-}
-
 .category-innerbox {
   height: 170px;
 }
@@ -119,14 +186,5 @@ body.category4 .category-innerbox {
 
 #category-childs a {
   font-weight: bold;
-  text-decoration: none;
-}
-
-/* * * Comments on Category Page * * * * * * */
-
-#view-category .comment-picture {
-  width: 20px;
-  height: 20px;
-  margin: -2px 5px 0px 0px;
 }
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index e01c959..45f258d 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -1,7 +1,7 @@
 body {
   padding: 0px;
   margin: 0px;
-  font-family: Verdana, Sans-Serif;
+  font-family: Verdana, sans-serif;
   font-size: 14px;
 }
 
@@ -88,41 +88,58 @@ div#errorExplanation h2 {
   text-align: center;
 }
 
-div#footer {
-  background: #ffffff url("../images/bg_footer.png") repeat-x !important;
+#footer_content {
+  clear: both;
+}
+
+#footer {
+  background: #ffffff url("../images/bg_footer.png") repeat-x;
   background-position: 0px 0px;
-  font-family: Verdana, Arial, Serif-sans;
-  margin: 0px !important;
-  padding: 5px !important;
-  text-align: center !important;
-  clear: both !important;
-  font-size: 10px !important;
-  color: #545454 !important;
+  margin: 0px;
+  padding: 10px;
+  text-align: center;
+  clear: both;
+  font-size: 10px;
+  color: #777;
 }
 
-div#footer a {
-  color: #545454;
+#footer a {
+  color: #777;
   text-decoration: none;
-  border-bottom: 1px dotted #545454;
+  border-bottom: 1px dotted #777;
 }
 
-div#footer a:hover {
-  color: #000000;
+#footer a:hover {
+  color: #555;
   border: 0px;
 }
 
-div#footer ul {
+#footer ul {
   margin: 0px;
   padding: 0px;
 }
 
-div#footer li {
+#footer li {
   display: block;
   float: right;
   margin-right: 20px;
   height: 20px;
 }
 
+#footer a#footer-esq {
+  padding: 5px 0px 0px 10px;
+  float: left;
+  text-align: left;
+  border: none;
+}
+
+#footer a#footer-dir {
+  padding: 5px 10px 0px 0px;
+  float: right;
+  text-align: right;
+  border: none;
+}
+
 
 /*********************************************************/
 
@@ -135,20 +152,6 @@ div#footer li {
   top: 200px;
 }
 
-#footer_content {
-clear: both;
-}
-
-#footer {
-  clear: both;
-  text-align: center;
-  font-size: smaller;
-  color: #333;
-  margin: 0px;
-  padding: 5px;
-}
-
-
 /* Notice */ 
 
 div#notice {
diff --git a/public/stylesheets/controller_search.css b/public/stylesheets/controller_search.css
index 4f34d9e..14bc1e6 100644
--- a/public/stylesheets/controller_search.css
+++ b/public/stylesheets/controller_search.css
@@ -52,6 +52,27 @@
   color: #888;
 }
 
+#category-comments {
+  margin-left: 55%;
+}
+
+#content .search-results-comments ul,
+#content .search-results-comments li,
+#content #category-comments ul,
+#content #category-comments li {
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  color: #888;
+}
+
+.search-results-comments .comment-picture,
+#category-comments .comment-picture {
+  width: 20px;
+  height: 20px;
+  margin: -2px 5px 0px 0px;
+}
+
 #content .search-results-type-product ul,
 #content .search-results-type-product li {
   margin: 0px;
diff --git a/public/stylesheets/search.css b/public/stylesheets/search.css
index 080855e..ffa7f5c 100644
--- a/public/stylesheets/search.css
+++ b/public/stylesheets/search.css
@@ -15,11 +15,11 @@
 
 /***** search-popup ***************************/
 
-#search-popup h2 {
+#search-popup h3 {
   color: #2A5896;
   font-size: 20px;
 }
-#search-popup h3 {
+#search-popup h4 {
   color: #2A5896;
   font-size: 16px;
 }
@@ -28,8 +28,8 @@
   text-align: center;
 }
 
-.search-options ul,
-.search-options li {
+#content .search-options ul, .search-options ul,
+#content .search-options li, .search-options li {
   margin: 0px;
   padding: 0px;
   list-style: none;
@@ -44,7 +44,8 @@
   margin-top: 20px;
 }
 
-.search-options h3 {
+.search-options h4,
+#content .search-options h4 {
   float: left;
   margin: -10px 0px 0px 0px;
   background: #FFF;
@@ -57,8 +58,17 @@
   padding: 2px 0px;
 }
 
+.search-in li {
+  float: none;
+  width: auto;
+}
+.search-in br {
+  clear: none;
+}
+
 #search-popup .button-bar {
   clear: left;
   padding-top: 0px;
+  margin-bottom: -20px;
 }
 
--
libgit2 0.21.2