Merge branch 'master' into rails3

Victor Costa
2 parents af6238af bad8766a
Showing 29 changed files with 61 additions and 65 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/models/article.rb
app/models/forum.rb
app/models/input.rb
app/views/comment/_comment_form.html.erb
app/views/content_viewer/view_page.html.erb
app/views/invite/_dialog_wait_loading.html.erb
app/views/invite/select_friends.html.erb
app/views/manage_products/_add_input.html.erb
app/views/manage_products/_categories_for_selection.html.erb
app/views/manage_products/_certifiers_for_selection.html.erb
app/views/manage_products/_display_name.html.erb
app/views/manage_products/_edit_input.html.erb
app/views/manage_products/_form.html.erb
app/views/manage_products/_price_composition_bar.html.erb
app/views/manage_products/new.html.erb
app/views/profile/report_abuse.html.erb
app/views/search/_image.html.erb
app/views/search/search_page.html.erb
app/views/shared/_dialog_error_messages.html.erb
@@ -33,6 +33,7 @@ class ContentViewerController &lt; ApplicationController
       process_forum_terms_of_use(user, params[:terms_accepted])
     elsif is_a_forum_topic?(@page)
       redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
+      return
     end
     # At this point the page will be showed
@@ -2,7 +2,7 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
   acts_as_having_image
@@ -3,7 +3,7 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
-  attr_accessible :has_terms_of_use, :terms_of_use
+  attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
 class Input < ActiveRecord::Base
-  attr_accessible :product, :product_category
+  attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
   belongs_to :product
   belongs_to :product_category
@@ -46,14 +46,16 @@ function check_captcha(button, confirm_action) {
 }
 </script>
-<% if @comment && @comment.errors.any? %>
+<% @comment ||= Comment.new %>
+
+<% if @comment.errors.any? %>
   <%= error_messages_for :comment %>
 <% end %>
 <div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %>">
   <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link && @comment.reply_of_id.blank? %>
-<%= remote_form_for(:comment, comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
+<%= remote_form_for(:comment, @comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
   <%= required_fields_message %>
@@ -80,7 +80,7 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments.present? && @comments.count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
     <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
@@ -90,15 +90,15 @@
         <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
       <% end %>
     </div>
-  <% end %>
-  <ul class="article-comments-list">
-    <%= render :partial => 'comment/comment', :collection => @comments %>
-    <%= pagination_links @comments, :param_name => 'comment_page' %>
-  </ul>
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comments %>
+      <%= pagination_links @comments, :param_name => 'comment_page' %>
+    </ul>
+  <% end %>
   <% if @page.accept_comments? %>
-    <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:comment => Comment.new, :url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
+    <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
   <% end %>
 </div><!-- end class="comments" -->
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery(function($) {
     $("#loading-dialog").dialog({
       height: 160,
@@ -32,9 +32,7 @@
   <br/>
-  <%= link_to_function(_('Personalize invitation mail'), nil) do |page|
-    page['invitation-mail_template'].show
-  end %>
+  <%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
   <div id='invitation-mail_template' style='display:none'>
     <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
 <div id='request_result_message' style='display: none'></div>
-<%= form_for(@input,
+<%= form_for(:input,
            :url => {:action => 'add_input', :id => @product},
            :html => {:method => 'post', :id => 'input-category-form'}
            ) do |f| %>
 <%= select_for_categories(categories, level) %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
   $('selected_category_id').value = <%= @category && @category.id %>
   $('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
 <%= select_certifiers(@qualifier) + remove_qualifier_button %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery('#product-qualifiers-list *').removeClass('small-loading')
 <% end %>
@@ -2,7 +2,7 @@
   <h2><%= @product.name_with_unit %></h2>
   <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
 </div>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $$('#display-product-category .hierarchy-category')[0].update('<%=
     escape_javascript(hierarchy_category_navigation(
       @product.product_category,
-<%= form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
+<%= form_for(:input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
             :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
   <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
 <%= error_messages_for :product %> <br/>
-<%= form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
+<%= form_for :product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
   <%= required_fields_message %>
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   var value = <%= @product.price_description_percentage %>;
   var total_cost = <%= @product.total_production_cost %>;
   var price = '<%= @product.formatted_value(:price) %>';
@@ -25,6 +25,6 @@
 <% end %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
 <% end %>
-<%= form_for @abuse_report, :url => {:action => 'register_report'},
+<%= form_for :abuse_report, :url => {:action => 'register_report'},
                            :html => {:onsubmit => "return send_request(this)", :id => 'report-abuse-form'} do |f| %>
   <%= labelled_form_field('* ' + _('Report reasons'), f.text_area(:reason, :rows => 6, :cols => 60, :class => 'required')) %>
   <%= hidden_field_tag(:content_type, params[:content_type]) %>
@@ -5,7 +5,7 @@
     <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
       <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
       <% if image.width && image.height %>
-        <% javascript_tag do %>
+        <%= javascript_tag do %>
           image = jQuery('script').last().parent().find('.search-image-pic');
           des_width = parseInt(image.css('width'));
           des_height = parseInt(image.css('height'));
@@ -11,7 +11,7 @@
 <div style="clear: both"></div>
 <% if @asset == :product %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery('.search-product-price-details').altBeautify();
   <% end %>
 <% end %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   close_loading()
   jQuery('#errorExplanation h2').hide()
   jQuery('#errorExplanation p').hide()
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery(".numbers-only").keypress(function(event) {
     var separator = "<%= environment.currency_separator %>"
     return numbersonly(event, separator)
-<% javascript_tag do %>
+<%= javascript_tag do %>
   update_loading('<%= _('redirecting...') %>')
   redirect_to('<%= url %>')
 <% end %>
@@ -34,11 +34,12 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I should not see "identifier-change-confirmation"
-    When I fill in "Address" with "banda-o-rappa"
-    And I should see "identifier-change-confirmation"
+    And I go to o-rappa's control panel
+    When I follow "Community Info and settings"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
   @selenium
   Scenario: Confirm url change
@@ -46,12 +47,13 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
+    And I go to o-rappa's control panel
     And I follow "Community Info and settings"
-    When I fill in "Address" with "banda-o-rappa"
-    Then I should see "identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
     When I follow "Yes"
-    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
   @selenium
   Scenario: Cancel url change
@@ -59,9 +61,10 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
+    And I go to o-rappa's control panel
     And I follow "Community Info and settings"
-    When I fill in "Address" with "banda-o-rappa"
-    Then I should see "identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
     When I follow "No"
-    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
@@ -14,7 +14,9 @@ Feature: forum
   Scenario: create a forum
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Forum"
     When I follow "Forum"
     And I fill in "Title" with "My Forum"
     And I press "Save"
@@ -97,6 +99,7 @@ Feature: forum
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Topic"
     And I press "Save"
@@ -249,6 +252,7 @@ Feature: forum
     And I am logged in as "mariasilva"
     And I go to /sample-community/forum
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test"
     And I press "Save"
@@ -274,11 +278,13 @@ Feature: forum
     And I am logged in as "mariasilva"
     And I go to /sample-community/forum
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test"
     And I press "Save"
     And I go to /sample-community/forum/test
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test inside the topic page"
     And I press "Save"
@@ -58,6 +58,7 @@ Feature: check all manage fields
     Given I follow "Community's fields"
     And I check "community_active"
     And I press "save_community_fields"
+    And I follow "Community's fields"
     And I uncheck "community_active"
     And I press "save_community_fields"
     When I go to mycommunity's control panel
@@ -69,6 +70,7 @@ Feature: check all manage fields
     Given I follow "Enterprise's fields"
     And I check "enterprise_active"
     And I press "save_enterprise_fields"
+    And I follow "Enterprise's fields"
     And I uncheck "enterprise_active"
     And I press "save_enterprise_fields"
     When I go to paper-street's control panel
@@ -58,6 +58,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Add the inputs or raw material used by this product"
+    And I should see "Cancel" within "#categories_selection_actionbar"
     And I follow "Cancel" within "#categories_selection_actionbar"
     Then I should see "Abbey Road"
     And I should see "Add the inputs or raw material used by this product"
@@ -199,6 +200,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Edit" within ".input-details"
+    And I should see "Cancel" within ".edit_input"
     And I follow "Cancel" within ".edit_input"
     And I follow "Edit" within ".input-details"
     Then I should see "Amount used"
@@ -218,25 +220,6 @@ Feature: manage inputs
     And I confirm the browser dialog
     Then I should see "Add the inputs or raw material used by this product"
-  @selenium
-  Scenario: Remember in which tab I was
-    Given the following products
-      | owner      | category | name         |
-      | redemoinho | Music    | Depeche Mode |
-      | redemoinho | Music    | Manu Chao    |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Depeche Mode
-    Then I should see "Add some description to your product"
-    And "Add the inputs or raw material used by this product" should not be visible within "#show_product"
-    When I follow "Inputs and raw material"
-    Then I should see "Add the inputs or raw material used by this product"
-    And "Add some description to your product" should not be visible within "#show_product"
-    When I go to Rede Moinho's page of product Manu Chao
-    Then I should see "Add some description to your product"
-    When I go to Rede Moinho's page of product Depeche Mode
-    Then I should see "Add the inputs or raw material used by this product"
-    And "Add some description to your product" should not be visible within "#show_product"
-
   @selenium-fixme
   Scenario: Order input list
     Given the following product_category
 Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
   identifier = Community.find_by_name(community).identifier
   visit("/myprofile/#{identifier}/profile_members")
-  click_link('Invite your friends to join 26 Bsslines')
+  first(:link, "Invite your friends to join #{community}").click
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
   click_link('Personalize invitation mail')
@@ -4,7 +4,8 @@ Given /^the following users?$/ do |table|
     person_data = item.dup
     person_data.delete("login")
     category = Category.find_by_slug person_data.delete("category")
-    user = User.create!(:login => item[:login], :password => '123456', :password_confirmation => '123456', :email => item[:login] + "@example.com", :person_data => person_data)
+    email = item[:email] || item[:login] + "@example.com"
+    user = User.create!(:login => item[:login], :password => '123456', :password_confirmation => '123456', :email => email, :person_data => person_data)
     user.activate
     p = user.person
     p.categories << category if category
@@ -131,4 +131,4 @@ packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debi
 run sudo apt-get -y install $packages
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
-run bundle --local
+run bundle install
	@@ -33,6 +33,7 @@ class ContentViewerController < ApplicationController		@@ -33,6 +33,7 @@ class ContentViewerController < ApplicationController
33	process_forum_terms_of_use(user, params[:terms_accepted])	33	process_forum_terms_of_use(user, params[:terms_accepted])
34	elsif is_a_forum_topic?(@page)	34	elsif is_a_forum_topic?(@page)
35	redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)	35	redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
		36	+ return
36	end	37	end
37		38
38	# At this point the page will be showed	39	# At this point the page will be showed
	@@ -2,7 +2,7 @@ require 'hpricot'		@@ -2,7 +2,7 @@ require 'hpricot'
2		2
3	class Article < ActiveRecord::Base	3	class Article < ActiveRecord::Base
4		4
5	- attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions	5	+ attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
6		6
7	acts_as_having_image	7	acts_as_having_image
8		8
	@@ -3,7 +3,7 @@ class Forum < Folder		@@ -3,7 +3,7 @@ class Forum < Folder
3	acts_as_having_posts :order => 'updated_at DESC'	3	acts_as_having_posts :order => 'updated_at DESC'
4	include PostsLimit	4	include PostsLimit
5		5
6	- attr_accessible :has_terms_of_use, :terms_of_use	6	+ attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
7		7
8	settings_items :terms_of_use, :type => :string, :default => ""	8	settings_items :terms_of_use, :type => :string, :default => ""
9	settings_items :has_terms_of_use, :type => :boolean, :default => false	9	settings_items :has_terms_of_use, :type => :boolean, :default => false
1	class Input < ActiveRecord::Base	1	class Input < ActiveRecord::Base
2		2
3	- attr_accessible :product, :product_category	3	+ attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
4		4
5	belongs_to :product	5	belongs_to :product
6	belongs_to :product_category	6	belongs_to :product_category
1	-<% javascript_tag do %>	1	+<%= javascript_tag do %>
2	jQuery(function($) {	2	jQuery(function($) {
3	$("#loading-dialog").dialog({	3	$("#loading-dialog").dialog({
4	height: 160,	4	height: 160,
	@@ -32,9 +32,7 @@		@@ -32,9 +32,7 @@
32		32
33	<br/>	33	<br/>
34		34
35	- <%= link_to_function(_('Personalize invitation mail'), nil) do \|page\|
36	- page['invitation-mail_template'].show
37	- end %>	35	+ <%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
38		36
39	<div id='invitation-mail_template' style='display:none'>	37	<div id='invitation-mail_template' style='display:none'>
40	<%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>	38	<%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
1	<div id='request_result_message' style='display: none'></div>	1	<div id='request_result_message' style='display: none'></div>
2		2
3	-<%= form_for(@input,	3	+<%= form_for(:input,
4	:url => {:action => 'add_input', :id => @product},	4	:url => {:action => 'add_input', :id => @product},
5	:html => {:method => 'post', :id => 'input-category-form'}	5	:html => {:method => 'post', :id => 'input-category-form'}
6	) do \|f\| %>	6	) do \|f\| %>
1	<%= select_for_categories(categories, level) %>	1	<%= select_for_categories(categories, level) %>
2		2
3	-<% javascript_tag do %>	3	+<%= javascript_tag do %>
4	jQuery('#categories_container_wrapper').scrollTo('100%', 1000)	4	jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
5	$('selected_category_id').value = <%= @category && @category.id %>	5	$('selected_category_id').value = <%= @category && @category.id %>
6	$('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')	6	$('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
1	<%= select_certifiers(@qualifier) + remove_qualifier_button %>	1	<%= select_certifiers(@qualifier) + remove_qualifier_button %>
2	-<% javascript_tag do %>	2	+<%= javascript_tag do %>
3	jQuery('#product-qualifiers-list *').removeClass('small-loading')	3	jQuery('#product-qualifiers-list *').removeClass('small-loading')
4	<% end %>	4	<% end %>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<h2><%= @product.name_with_unit %></h2>	2	<h2><%= @product.name_with_unit %></h2>
3	<%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>	3	<%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
4	</div>	4	</div>
5	-<% javascript_tag do %>	5	+<%= javascript_tag do %>
6	$$('#display-product-category .hierarchy-category')[0].update('<%=	6	$$('#display-product-category .hierarchy-category')[0].update('<%=
7	escape_javascript(hierarchy_category_navigation(	7	escape_javascript(hierarchy_category_navigation(
8	@product.product_category,	8	@product.product_category,