Download as
Browse Code »

Commit dd61d0cf17d2498e596b7c62ec7214fa0bf5cffc

Authored by AurelioAHeckert
1 parent db2488c5
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem518: product icons on profile and product category selector 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2211 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 11 changed files with 104 additions and 31 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @dd61d0c
@@ -346,6 +346,30 @@ module ApplicationHelper @@ -346,6 +346,30 @@ module ApplicationHelper
346 sex 346 sex
347 end 347 end
348 348
  349 + def profile_cat_icons( profile )
  350 + if profile.class == Enterprise
  351 + icons =
  352 + profile.product_categories.map{ |c| c.size > 1 ? [c[0],c[1]] : nil }.
  353 + compact.uniq.map{ |c|
  354 + cat_name = (c[0]+'_'+c[1]).gsub( /\s/, '_' )
  355 + cat_icon = "/images/icons-cat/#{cat_name}.png"
  356 + if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
  357 + cat_icon = '/images/icons-cat/undefined.png'
  358 + end
  359 + content_tag 'span',
  360 + content_tag( 'span', c.join(' → ') ),
  361 + :title => c.join(' → '),
  362 + :class => 'product-cat-icon cat_icon_' + cat_name,
  363 + :style => "background-image:url(#{cat_icon})"
  364 + }.join "\n"
  365 + content_tag 'div',
  366 + content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
  367 + :class => 'product-category-icons'
  368 + else
  369 + ''
  370 + end
  371 + end
  372 +
349 # displays a link to the profile homepage with its image (as generated by 373 # displays a link to the profile homepage with its image (as generated by
350 # #profile_image) and its name below it. 374 # #profile_image) and its name below it.
351 def profile_image_link( profile, size=:portrait, tag='li' ) 375 def profile_image_link( profile, size=:portrait, tag='li' )
@@ -360,7 +384,7 @@ module ApplicationHelper @@ -360,7 +384,7 @@ module ApplicationHelper
360 link_to( 384 link_to(
361 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) + 385 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
362 content_tag( 'span', name, :class => ( profile.class == Person ? 'fn' : 'org' ) ) + 386 content_tag( 'span', name, :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
363 - city + profile_sex_icon( profile ), 387 + city + profile_sex_icon( profile ) + profile_cat_icons( profile ),
364 profile.url, 388 profile.url,
365 :class => 'profile_link url', 389 :class => 'profile_link url',
366 :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name ), 390 :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name ),
app/views/blocks/profile_info.rhtml
  Diff comments   View file @dd61d0c
@@ -7,12 +7,14 @@ @@ -7,12 +7,14 @@
7 <span class="profile-info-picture-inner2"> 7 <span class="profile-info-picture-inner2">
8 <%= 8 <%=
9 profile_image(block.owner, :thumb) +"\n"+ 9 profile_image(block.owner, :thumb) +"\n"+
10 - profile_sex_icon( profile ) 10 + profile_sex_icon( profile ) +
  11 + profile_cat_icons( profile )
11 %> 12 %>
12 </span> 13 </span>
13 </div> 14 </div>
14 </div> 15 </div>
15 16
  17 +
16 <ul class="profile-info-data"> 18 <ul class="profile-info-data">
17 <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li> 19 <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
18 <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li> 20 <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li>
app/views/manage_products/_subcategories.rhtml
  Diff comments   View file @dd61d0c
  1 +<div id="category-ajax-selector">
1 <% if !@current_category.nil? and !@current_category.top_level? %> 2 <% if !@current_category.nil? and !@current_category.top_level? %>
2 3
3 - <p><%= _('Current category:') %></p>  
4 - <%= hidden_field_tag 'product[product_category_id]', @current_category.id %>  
5 - <%  
6 - categories = [@current_category]  
7 - categories.push(@current_category) while @current_category = @current_category.parent  
8 - categories.last.name = _('Back')  
9 - %>  
10 - <% if categories.size > 1 %>  
11 - <%= categories.compact.reverse.map{|i|  
12 - link_to_remote(i.name,  
13 - :update => "subcategories",  
14 - :url => { :action => 'update_subcategories', :id => i, :loaded => visual_effect(:highlight, "subcategories") },  
15 - :class => 'select-current-category-link')}.join(' &rarr; ') 4 + <h3 class="box-title"><%= _('Current category:') %></h3>
  5 + <%= hidden_field_tag 'product[product_category_id]', @current_category.id %>
  6 + <%
  7 + categories = [@current_category]
  8 + categories.push(@current_category) while @current_category = @current_category.parent
16 %> 9 %>
17 - <% end %> 10 + <% if categories.size > 1 %>
  11 + <%= categories.compact.reverse.map{|i|
  12 + link_to_remote(i.name,
  13 + :update => "subcategories",
  14 + :url => { :action => 'update_subcategories', :id => i, :loaded => visual_effect(:highlight, "subcategories") },
  15 + :class => 'select-current-category-link')}.join(' &rarr; ')
  16 + %>
  17 + <% end %>
18 18
19 <% end %> 19 <% end %>
20 20
21 <% if @current_category %> 21 <% if @current_category %>
22 - <p><%= _('Select a category:') %></p> 22 + <h3 class="box-title"><%= _('Select a category:') %></h3>
23 <% elsif !@categories.empty? %> 23 <% elsif !@categories.empty? %>
24 - <p><%= _('Select a subcategory:') %></p> 24 + <h3><%= _('Select a subcategory:') %></h3>
25 <% end %> 25 <% end %>
26 26
27 <% for category in @categories do %> 27 <% for category in @categories do %>
@@ -32,3 +32,4 @@ @@ -32,3 +32,4 @@
32 :class => 'select-subcategory-link' 32 :class => 'select-subcategory-link'
33 %> 33 %>
34 <% end %> 34 <% end %>
  35 +</div>
@@ -71,8 +71,8 @@ ActiveRecord::Schema.define(:version =&gt; 45) do @@ -71,8 +71,8 @@ ActiveRecord::Schema.define(:version =&gt; 45) do
71 t.boolean "virtual", :default => false 71 t.boolean "virtual", :default => false
72 end 72 end
73 73
74 - add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"  
75 add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id" 74 add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
  75 + add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
76 76
77 create_table "blocks", :force => true do |t| 77 create_table "blocks", :force => true do |t|
78 t.string "title" 78 t.string "title"
@@ -230,8 +230,8 @@ ActiveRecord::Schema.define(:version =&gt; 45) do @@ -230,8 +230,8 @@ ActiveRecord::Schema.define(:version =&gt; 45) do
230 t.datetime "created_at" 230 t.datetime "created_at"
231 end 231 end
232 232
233 - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"  
234 add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" 233 add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
  234 + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
235 235
236 create_table "tags", :force => true do |t| 236 create_table "tags", :force => true do |t|
237 t.string "name" 237 t.string "name"
public/images/icons-cat/Produtos_Alimentação.png 0 → 100644
View file @dd61d0c

382 Bytes
public/images/icons-cat/Produtos_Software.png 0 → 100644
View file @dd61d0c

408 Bytes
public/images/icons-cat/Produtos_Software_Livre.png 0 → 100644
View file @dd61d0c

408 Bytes
public/images/icons-cat/undefined.png 0 → 100644
View file @dd61d0c

338 Bytes
public/stylesheets/blocks/profile-info-block.css
  Diff comments   View file @dd61d0c
@@ -71,10 +71,6 @@ @@ -71,10 +71,6 @@
71 display: none; 71 display: none;
72 } 72 }
73 73
74 -.product-categories {  
75 - clear: both;  
76 -}  
77 -  
78 .profile-info-data { 74 .profile-info-data {
79 width: 110px; 75 width: 110px;
80 font-size: 10px; 76 font-size: 10px;
public/stylesheets/common.css
  Diff comments   View file @dd61d0c
@@ -224,12 +224,8 @@ table { @@ -224,12 +224,8 @@ table {
224 } 224 }
225 th, td { 225 th, td {
226 font-size: 14px; 226 font-size: 14px;
227 - border: 1px solid #999999;  
228 - padding: 2px;  
229 } 227 }
230 th { 228 th {
231 - background: #f0f0f0;  
232 - color: black;  
233 font-weight: bold; 229 font-weight: bold;
234 } 230 }
235 231
@@ -293,3 +289,57 @@ div.sitemap-item a:hover { @@ -293,3 +289,57 @@ div.sitemap-item a:hover {
293 color: red; 289 color: red;
294 } 290 }
295 291
  292 +
  293 +/* * * icons for product category on profile * * */
  294 +
  295 +#content .product-category-icons {
  296 + position: absolute;
  297 + top: 1px;
  298 + right: 1px;
  299 +}
  300 +#content .profile-list-block .product-category-icons,
  301 +#content .search-results-innerbox .product-category-icons {
  302 + top: 3px;
  303 + right: 3px;
  304 +}
  305 +
  306 +#content .product-category-icons .header,
  307 +#content .product-cat-icon span {
  308 + display: none;
  309 +}
  310 +
  311 +#content .product-cat-icon {
  312 + display: block;
  313 + width: 13px;
  314 + height: 13px;
  315 + margin-bottom: 1px;
  316 +}
  317 +
  318 +
  319 +/* * * category ajax selector * * */
  320 +
  321 +#category-ajax-selector {
  322 + border: 1px solid #AAA;
  323 + background: #EEE;
  324 + padding: 15px 0px 15px 20px;
  325 + margin: 30px 0px 0px 0px;
  326 + position: relative;
  327 +}
  328 +
  329 +#category-ajax-selector h3 {
  330 + margin: 10px 0px;
  331 + font-size: 100%;
  332 +}
  333 +
  334 +#category-ajax-selector .box-title {
  335 + position: absolute;
  336 + top: -30px;
  337 + left: 30px;
  338 + line-height: 19px;
  339 + padding: 0px 10px;
  340 + border: 1px solid #AAA;
  341 + border-bottom: none;
  342 + background: #EEE;
  343 + float: left;
  344 +}
  345 +
test/functional/manage_products_controller_test.rb
  Diff comments   View file @dd61d0c
@@ -118,7 +118,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase @@ -118,7 +118,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
118 category2 = ProductCategory.create!(:name => 'Category 2', :environment => environment, :parent => category1) 118 category2 = ProductCategory.create!(:name => 'Category 2', :environment => environment, :parent => category1)
119 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2) 119 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2)
120 get :new, :profile => @enterprise.identifier 120 get :new, :profile => @enterprise.identifier
121 - assert_tag :tag => 'p', :content => /Select a category:/, :sibling => { :tag => 'a', :content => /#{category2.name}/ } 121 + assert_tag :tag => 'h3', :content => /Select a category:/, :sibling => { :tag => 'a', :content => /#{category2.name}/ }
122 end 122 end
123 123
124 should 'show current category' do 124 should 'show current category' do
@@ -127,7 +127,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase @@ -127,7 +127,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
127 category2 = ProductCategory.create!(:name => 'Category 2', :environment => environment, :parent => category1) 127 category2 = ProductCategory.create!(:name => 'Category 2', :environment => environment, :parent => category1)
128 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2) 128 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2)
129 get 'update_subcategories', :profile => @enterprise.identifier, :id => category2.id 129 get 'update_subcategories', :profile => @enterprise.identifier, :id => category2.id
130 - assert_tag :tag => 'p', :content => /Current category:/, :sibling => { :tag => 'a', :content => /#{category3.name}/ } 130 + assert_tag :tag => 'h3', :content => /Current category:/, :sibling => { :tag => 'a', :content => /#{category3.name}/ }
131 end 131 end
132 132
133 should 'show subcategories list' do 133 should 'show subcategories list' do
@@ -137,7 +137,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase @@ -137,7 +137,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
137 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2) 137 category3 = ProductCategory.create!(:name => 'Category 3', :environment => environment, :parent => category2)
138 get 'update_subcategories', :profile => @enterprise.identifier, :id => category2.id 138 get 'update_subcategories', :profile => @enterprise.identifier, :id => category2.id
139 assert !assigns(:categories).empty? 139 assert !assigns(:categories).empty?
140 - assert_tag :tag => 'p', :content => /Select a subcategory:/, :sibling => { :tag => 'a', :attributes => { :href => '#' }, :content => /#{category2.name}/ } 140 + assert_tag :tag => 'h3', :content => /Select a subcategory:/, :sibling => { :tag => 'a', :attributes => { :href => '#' }, :content => /#{category2.name}/ }
141 end 141 end
142 142
143 should 'update subcategories' do 143 should 'update subcategories' do