From b16df6d9a6fc8c39e42f233455805dacc83e46e0 Mon Sep 17 00:00:00 2001 From: AurelioAHeckert Date: Wed, 25 Jun 2008 02:50:02 +0000 Subject: [PATCH] ActionItem488: better profile list and "search for sellers" box --- app/controllers/public/search_controller.rb | 10 +++++----- app/helpers/application_helper.rb | 18 ++++++++++++++---- app/models/profile_list_block.rb | 14 ++++++++++---- app/views/search/_sellers_form.rhtml | 31 ++++++++++++++++++++++--------- public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css | 47 +++-------------------------------------------- public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css | 13 ++++--------- public/designs/themes/zen3/stylesheets/login-box.css | 2 +- public/stylesheets/blocks/profile-list-block.css | 53 ++++++++++++++++++++++++++++------------------------- 8 files changed, 87 insertions(+), 101 deletions(-) diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index 7a3871e..393cd57 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -177,12 +177,12 @@ class SearchController < 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 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 57a1e6c..c8a0800 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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( '
'+ profile_image(profile, size) +'
'+ profile.name() +'', profile.url, - :class => 'profile_link', - :help => _('Click on this icon to go to the %s\'s home page') % profile.name ) + def profile_image_link( profile, size=:portrait, tag='li' ) + #link_to( '
'+ profile_image(profile, size) +'
'+ profile.name() +'', profile.url, + # :class => 'profile_link', + # :help => _('Click on this icon to go to the %s\'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 %s\'s home page') % profile.name ), + :class => 'vcard' end def text_field_with_local_autocomplete(name, choices, html_options = {}) diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb index 913c921..d4c4c63 100644 --- a/app/models/profile_list_block.rb +++ b/app/models/profile_list_block.rb @@ -64,15 +64,21 @@ class ProfileListBlock < 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+'' : '' ) + }.join("\n ") if list.empty? list = '
'+ _('None') +'
' else - list = content_tag( 'ul', nl +' '+ list + nl ) + list = content_tag 'ul', nl +' '+ list + nl end + block_title(title) + nl + '
' + - nl + block_title(title) + nl + list + nl + - '
' + nl + list + nl + '' end end diff --git a/app/views/search/_sellers_form.rhtml b/app/views/search/_sellers_form.rhtml index ab9c392..f78a8c1 100644 --- a/app/views/search/_sellers_form.rhtml +++ b/app/views/search/_sellers_form.rhtml @@ -1,12 +1,25 @@

<%= _('Search for sellers') %>

+ <% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %> -

<%= _('Search in:') %>

- <%= labelled_radio_button _('Products'), 'asset', 'products', true %>
- <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %>

-

<%= labelled_text_field _('Distance (km): '), 'radius' %>

-

<%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %>

-
- <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %> -
- <%= submit_tag _('Search') %> + +
<%= _('Search in:') %> + + <%= labelled_radio_button _('Products'), 'asset', 'products', true %>
+ <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', false %> + +
+ +
+ <%= labelled_text_field _('Distance (km): '), 'radius' %> +
+
+ <%= labelled_text_field _('From: '), 'region[name]', nil, :id => 'search_region_block' %> +
+ <%= auto_complete_field('search_region_block', :url => {:controller => 'search', :action => 'complete_region'}) %> +
+ +
+ <%= submit_tag _('Search'), :class => 'button with-text icon-search' %> +
+ <% end %> diff --git a/public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css b/public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css index 440be20..21a6b9b 100644 --- a/public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css +++ b/public/designs/themes/ecosol/stylesheets/blocks/profile-list-block.css @@ -1,47 +1,6 @@ -.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; } diff --git a/public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css b/public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css index ea6caa7..192ad0b 100644 --- a/public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css +++ b/public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css @@ -1,16 +1,11 @@ -.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; } diff --git a/public/designs/themes/zen3/stylesheets/login-box.css b/public/designs/themes/zen3/stylesheets/login-box.css index 1a81e7b..fdd2c0f 100644 --- a/public/designs/themes/zen3/stylesheets/login-box.css +++ b/public/designs/themes/zen3/stylesheets/login-box.css @@ -1,6 +1,6 @@ .login-box-content { border: 2px solid #A40000; - background: #fcaf3e; + background: #FCAF3E; } diff --git a/public/stylesheets/blocks/profile-list-block.css b/public/stylesheets/blocks/profile-list-block.css index a800f6f..67b6d9a 100644 --- a/public/stylesheets/blocks/profile-list-block.css +++ b/public/stylesheets/blocks/profile-list-block.css @@ -1,44 +1,47 @@ -.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; } -- libgit2 0.21.2