ActionItem488: better profile list and "search for sellers" box

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2091 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem488: better profile list and "search for sellers" box
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2091 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent 2011e00c
Showing 8 changed files with 87 additions and 101 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/models/profile_list_block.rb
app/views/search/_sellers_form.rhtml
public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css
public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css
public/designs/themes/zen3/stylesheets/login-box.css
public/stylesheets/blocks/profile-list-block.css
@@ -177,12 +177,12 @@ class SearchController &lt; ApplicationController
     @results = {}
     @names = {}
     [
-      [ :people, _('Recently registered people'), @finder.recent('people') ],
-      [ :communities, _('Recently created communities'), @finder.recent('communities') ],
-      [ :articles, _('Recent articles'), @finder.recent('articles') ],
+      [ :people, _('Newer profiles'), @finder.recent('people') ],
+      [ :communities, _('Newer communities'), @finder.recent('communities') ],
+      [ :articles, _('Newer articles'), @finder.recent('articles') ],
       [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles ],
-      [ :enterprises, _('Recently created enterprises'), @finder.recent('enterprises') ],
-      [ :events, _('Recently added events'), @finder.current_events(params[:year], params[:month]) ]
+      [ :enterprises, _('Newer enterprises'), @finder.recent('enterprises') ],
+      [ :events, _('Near events TODO'), @finder.current_events(params[:year], params[:month]) ]
     ].each do |key, name, list|
       @results[key] = list
       @names[key] = name
@@ -424,6 +424,8 @@ module ApplicationHelper
   def profile_image(profile, size=:portrait, opt={})
     opt[:alt]   ||= profile.name()
     opt[:title] ||= ''
+    opt[:class] ||= ''
+    opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
     image_tag(profile_icon(profile, size), opt )
   end
@@ -446,10 +448,18 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
-  def profile_image_link(profile, size=:portrait)
-    link_to( '<div>'+ profile_image(profile, size) +'</div><span>'+ profile.name() +'</span>', profile.url,
-             :class => 'profile_link',
-             :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name )
+  def profile_image_link( profile, size=:portrait, tag='li' )
+    #link_to( '<div>'+ profile_image(profile, size) +'</div><span>'+ profile.name() +'</span>', profile.url,
+    #         :class => 'profile_link',
+    #         :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name )
+    content_tag tag,
+        link_to(
+            content_tag( 'span', profile_image(profile, size), :class => 'profile-image' ) +
+            content_tag( 'span', profile.name(), :class => ( profile.class == Person ? 'fn' : 'org' ) ),
+            profile.url,
+            :class => 'profile_link url',
+            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name ),
+        :class => 'vcard'
   end
   def text_field_with_local_autocomplete(name, choices, html_options = {})
@@ -64,15 +64,21 @@ class ProfileListBlock &lt; Block
     title = self.title
     nl = "\n"
     lambda do
-      list = profiles.map {|item| content_tag( 'li', profile_image_link(item) ) }.join("\n  ")
+      #list = profiles.map {|item| content_tag( 'li', profile_image_link(item) ) }.join("\n  ")
+      count=0
+      list = profiles.map {|item|
+               count+=1
+               profile_image_link( item ) #+
+               #( ( count%2 == 0 && count < profiles.size ) ? nl+'</tr><tr>' : '' )
+             }.join("\n  ")
       if list.empty?
         list = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
       else
-        list = content_tag( 'ul', nl +'  '+ list + nl )
+        list = content_tag 'ul', nl +'  '+ list + nl
       end
+      block_title(title) + nl +
       '<div class="common-profile-list-block">' +
-      nl + block_title(title) + nl + list + nl +
-      '</div>'
+      nl + list + nl + '</div>'
     end
   end
 <h3><%= _('Search for sellers') %></h3>
+
 <% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
-  <p class="search-in-opt"><%= _('Search in:') %><dir>
-     <%= labelled_radio_button _('Products'), 'asset', 'products', true %><br />
-     <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %></dir></p>
-   <p class="search-distance-opt"><%= labelled_text_field _('Distance (km): '), 'radius' %></p>
-  <p class="search-from-opt"><%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %></p>
-  <div id='search_region_block_auto_complete' class='auto-complete'></div>
-  <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %>
-  <br/>
-  <%= submit_tag _('Search') %>
+
+  <div class="search-in-opt"><%= _('Search in:') %>
+    <dir>
+      <%= labelled_radio_button _('Products'), 'asset', 'products', true %><br />
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %>
+    </dir>
+  </div>
+
+  <div class="formfield search-distance-opt">
+    <%= labelled_text_field _('Distance (km): '), 'radius' %>
+  </div>
+  <div class="formfield search-from-opt">
+    <%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %>
+    <div id="search_region_block_auto_complete" class="auto-complete"></div>
+    <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %>
+  </div>
+
+  <div class="button-bar">
+    <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>
+  </div>
+
 <% end %>
-.common-profile-list-block {
-  color: #B8CFE7;
-}
-
-#content .common-profile-list-block .block-title {
-  font-size: 14px;
-}
-
-.common-profile-list-block li a {
-  border: 2px solid #FFF;
-}
-
-.common-profile-list-block li a:hover {
-  border: 2px solid #2A5896;
-  background: #B8CFE7;
-  color: #035;
-}
-
-.enterprises-block .block-footer-content,
-.friends-block .block-footer-content,
-.communities-block .block-footer-content {
-  text-align: center;
-  font-size: 80%;
-  padding: 5px 0px 0px 0px;
-}
-.msie .enterprises-block .block-footer-content,
-.msie .friends-block .block-footer-content,
-.msie .communities-block .block-footer-content {
-  padding: 0px;
-  margin-top: -5px;
-}
-
-.common-profile-list-block-none {
-  font-style: italic;
-  margin-bottom: -10px;
-}
-.msie .common-profile-list-block-none {
-  margin-bottom: 0px;
-  padding-bottom: 10px;
-}
-
-.common-profile-list-block .button-bar {
-  padding-top: 15px;
-  clear: left;
+.common-profile-list-block .vcard a {
+  -moz-border-radius: 10px;
+  color: #026;
 }
-.common-profile-list-block li a {
-  border: 2px solid transparent;
-  color: #C00;
-  -moz-border-radius: 4px;
-}
-.msie6 .common-profile-list-block li a {
-  border: 2px solid #FFF;
+.common-profile-list-block .vcard a {
+  -moz-border-radius: 10px;
 }
-.common-profile-list-block li a:hover {
+.common-profile-list-block .vcard a:hover {
   border: 2px solid #C00;
-  background: #fcaf3e;
+  background: #FCAF3E;
   color: #FFF;
 }
 .login-box-content {
   border: 2px solid #A40000;
-  background: #fcaf3e;
+  background: #FCAF3E;
 }
-.common-profile-list-block {
-  text-align: center;
-}
-.common-profile-list-block ul {
+#content .common-profile-list-block ul,
+#content .common-profile-list-block li {
   margin: 0px;
   padding: 0px;
+  list-style: none;
+  display: inline;
 }
-#content .common-profile-list-block li {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
+.common-profile-list-block .vcard a {
+  width: 92px;
+  height: 95px;
+  max-height: 92px;
+  padding-top: 3px;
+  margin: 0px 2px;
   float: left;
+  border: 2px solid transparent;
+  text-align: center;
+  overflow: hidden;
+  font-size: 11px;
+  text-decoration: none;
+  color: #000;
+}
+.msie6 .common-profile-list-block .vcard a {
+  border: 2px solid #FFF;
+}
+.common-profile-list-block .vcard a:hover {
+  border: 2px solid #2A5896;
+  background: #B8CFE7;
 }
-.common-profile-list-block li a {
+.common-profile-list-block span {
   display: block;
-  height: 100px;
-  padding-top: 2px;
-  width: 96px;
   overflow: hidden;
-  text-decoration: none;
-  font-size: 9px;
-}
-.msie .common-profile-list-block li a {
-  line-height: 10px;
-  cursor: pointer;
 }
-.common-profile-list-block li div {
+.common-profile-list-block .profile-image {
   width: 96px;
+  display: table-cell;
+  vertical-align: middle;
   height: 64px;
 }
-.common-profile-list-block li span {
-  display: block;
-  width: 92px;
-}
-
-.common-profile-list-block li img {
+.common-profile-list-block img {
   border: none;
 }
1	<h3><%= _('Search for sellers') %></h3>	1	<h3><%= _('Search for sellers') %></h3>
		2	+
2	<% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>	3	<% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
3	- <p class="search-in-opt"><%= _('Search in:') %><dir>
4	- <%= labelled_radio_button _('Products'), 'asset', 'products', true %><br />
5	- <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %></dir></p>
6	- <p class="search-distance-opt"><%= labelled_text_field _('Distance (km): '), 'radius' %></p>
7	- <p class="search-from-opt"><%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %></p>
8	- <div id='search_region_block_auto_complete' class='auto-complete'></div>
9	- <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %>
10	- <br/>
11	- <%= submit_tag _('Search') %>	4	+
		5	+ <div class="search-in-opt"><%= _('Search in:') %>
		6	+ <dir>
		7	+ <%= labelled_radio_button _('Products'), 'asset', 'products', true %><br />
		8	+ <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %>
		9	+ </dir>
		10	+ </div>
		11	+
		12	+ <div class="formfield search-distance-opt">
		13	+ <%= labelled_text_field _('Distance (km): '), 'radius' %>
		14	+ </div>
		15	+ <div class="formfield search-from-opt">
		16	+ <%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %>
		17	+ <div id="search_region_block_auto_complete" class="auto-complete"></div>
		18	+ <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %>
		19	+ </div>
		20	+
		21	+ <div class="button-bar">
		22	+ <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>
		23	+ </div>
		24	+
12	<% end %>	25	<% end %>
1		1
2	-.common-profile-list-block {
3	- color: #B8CFE7;
4	-}
5	-
6	-#content .common-profile-list-block .block-title {
7	- font-size: 14px;
8	-}
9	-
10	-.common-profile-list-block li a {
11	- border: 2px solid #FFF;
12	-}
13	-
14	-.common-profile-list-block li a:hover {
15	- border: 2px solid #2A5896;
16	- background: #B8CFE7;
17	- color: #035;
18	-}
19	-
20	-.enterprises-block .block-footer-content,
21	-.friends-block .block-footer-content,
22	-.communities-block .block-footer-content {
23	- text-align: center;
24	- font-size: 80%;
25	- padding: 5px 0px 0px 0px;
26	-}
27	-.msie .enterprises-block .block-footer-content,
28	-.msie .friends-block .block-footer-content,
29	-.msie .communities-block .block-footer-content {
30	- padding: 0px;
31	- margin-top: -5px;
32	-}
33	-
34	-.common-profile-list-block-none {
35	- font-style: italic;
36	- margin-bottom: -10px;
37	-}
38	-.msie .common-profile-list-block-none {
39	- margin-bottom: 0px;
40	- padding-bottom: 10px;
41	-}
42	-
43	-.common-profile-list-block .button-bar {
44	- padding-top: 15px;
45	- clear: left;	2	+.common-profile-list-block .vcard a {
		3	+ -moz-border-radius: 10px;
		4	+ color: #026;
46	}	5	}
47		6
1		1
2	.login-box-content {	2	.login-box-content {
3	border: 2px solid #A40000;	3	border: 2px solid #A40000;
4	- background: #fcaf3e;	4	+ background: #FCAF3E;
5	}	5	}
6		6