Merge branch 'master' into rails-2.3.5

Conflicts: features/step_definitions/noosfero_steps.rb

Merge branch 'master' into rails-2.3.5
Conflicts: features/step_definitions/noosfero_steps.rb
Antonio Terceiro
2 parents 8665815d 8d889f08
Showing 78 changed files with 2512 additions and 374 deletions Show diff stats
app/controllers/my_profile/manage_products_controller.rb
app/controllers/public/catalog_controller.rb
app/helpers/application_helper.rb
app/helpers/catalog_helper.rb
app/helpers/display_helper.rb
app/helpers/manage_products_helper.rb
app/models/enterprise.rb
app/models/enterprise_homepage.rb
app/models/environment.rb
app/models/image.rb
app/models/input.rb
app/models/price_detail.rb
app/models/product.rb
app/models/production_cost.rb
app/views/catalog/index.rhtml
app/views/content_viewer/_enterprise_homepage.rhtml
app/views/content_viewer/view_page.rhtml
app/views/layouts/_javascript.rhtml
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
@@ -111,6 +111,36 @@ class ManageProductsController &lt; ApplicationController
     end
   end
  
+  def manage_product_details
+    @product = @profile.products.find(params[:id])
+    if request.post?
+      @product.update_price_details(params[:price_details]) if params[:price_details]
+      render :partial => 'display_price_details'
+    else
+      render :partial => 'manage_product_details'
+    end
+  end
+
+  def remove_price_detail
+    @product = @profile.products.find(params[:product])
+    @price_detail = @product.price_details.find(params[:id])
+    @product = @price_detail.product
+    if request.post?
+      @price_detail.destroy
+      render :nothing => true
+    end
+  end
+
+  def display_price_composition_bar
+    @product = @profile.products.find(params[:id])
+    render :partial => 'price_composition_bar'
+  end
+
+  def display_inputs_cost
+    @product = @profile.products.find(params[:id])
+    render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
+  end
+
   def destroy
     @product = @profile.products.find(params[:id])
     if @product.destroy
@@ -167,4 +197,18 @@ class ManageProductsController &lt; ApplicationController
     end
   end
  
+  def create_production_cost
+    cost = @profile.production_costs.create(:name => params[:id])
+    if cost.valid?
+      cost.save
+      render :text => {:name => cost.name,
+                       :id => cost.id,
+                       :ok => true
+                      }.to_json
+    else
+      render :text => {:ok => false,
+                       :error_msg => _(cost.errors['name']) % {:fn => _('Name')}
+                      }.to_json
+    end
+  end
 end
@@ -4,10 +4,11 @@ class CatalogController &lt; PublicController
   before_filter :check_enterprise_and_environment
  
   def index
-    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
+    @products = @profile.products.paginate(:order => 'name asc', :per_page => 9, :page => params[:page])
   end
  
   protected
+
   def check_enterprise_and_environment
     unless @profile.kind_of?(Enterprise) && !@profile.environment.enabled?('disable_products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
@@ -1254,25 +1254,27 @@ module ApplicationHelper
     task.information[:message] % values
   end
  
+  def add_zoom_to_article_images
+    add_zoom_to_images if environment.enabled?(:show_zoom_button_on_article_images)
+  end
+
   def add_zoom_to_images
-    if environment.enabled?(:show_zoom_button_on_article_images)
-      stylesheet_link_tag('fancybox') +
-      javascript_include_tag('jquery.fancybox-1.3.4.pack') +
-      javascript_tag("jQuery(function($) {
-        $(window).load( function() {
-          $('#article .article-body img').each( function(index) {
-            var original = original_image_dimensions($(this).attr('src'));
-            if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-              $(this).wrap('<div class=\"zoomable-image\" />');
-              $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-              $(this).attr('style', '');
-              $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-            }
-          });
-          $('.zoomify-image').fancybox();
+    stylesheet_link_tag('fancybox') +
+    javascript_include_tag('jquery.fancybox-1.3.4.pack') +
+    javascript_tag("jQuery(function($) {
+      $(window).load( function() {
+        $('#article .article-body img').each( function(index) {
+          var original = original_image_dimensions($(this).attr('src'));
+          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
+            $(this).wrap('<div class=\"zoomable-image\" />');
+            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
+            $(this).attr('style', '');
+            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
+          }
         });
-      });" % _('Zoom in'))
-    end
+        $('.zoomify-image').fancybox();
+      });
+    });" % _('Zoom in'))
   end
  
   def render_dialog_error_messages(instance_name)
 module CatalogHelper
  
-include DisplayHelper
-include ManageProductsHelper
+  include DisplayHelper
+  include ManageProductsHelper
  
-  def display_products_list(profile, products)
-    data = ''
-    extra_content = []
-    extra_content_list = []
-    products.each { |product|
-      extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) } if @plugins
-      extra_content_list = @plugins.map(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } if @plugins
-      data << content_tag('li',
-        link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) +
-        content_tag('h3', link_to_product(product)) +
-        content_tag('ul',
-          (product.price ? content_tag('li', _('Price: %s') % ( "%.2f" % product.price), :class => 'product_price') : '') +
-          content_tag('li', product_category_name(profile, product.product_category), :class => 'product_category') +
-          extra_content_list.map { |content| content_tag('li', content)}.join("\n")
-        ) +
-        (product.description ? content_tag('div',
-                                           txt2html(product.description),
-                                           :class => 'description') : tag('br',
-                                           :style => 'clear:both')) +
-        extra_content.join("\n"),
-        :class => 'product')
-    }
-    content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
-  end
-
-  private
-
-  def product_category_name(profile, product_category)
-    if profile.enabled?
-      link_to_product_category(product_category)
-    else
-      product_category ? product_category.full_name(' &rarr; ') : _('Uncategorized product')
-    end
-  end
 end
@@ -8,6 +8,20 @@ module DisplayHelper
             opts
   end
  
+  def image_link_to_product(product, opts={})
+    return _('No product') unless product
+    target = product_path(product)
+    link_to image_tag(product.default_image(:big), :alt => product.name),
+            target,
+            opts
+  end
+
+  def price_span(price, options = {})
+    content_tag 'span',
+      number_to_currency(price, :unit => environment.currency_unit, :delimiter => environment.currency_delimiter, :separator => environment.currency_separator),
+      options
+  end
+
   def product_path(product)
     product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
   end
@@ -271,4 +271,23 @@ module ManageProductsHelper
     return input_amount_used if input.unit.blank?
     n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', input.unit.singular, :class => 'input-unit'), :plural_unit => content_tag('span', input.unit.plural, :class => 'input-unit') }
   end
+
+  def select_production_cost(product,selected=nil)
+    url = url_for( :controller => 'manage_products', :action => 'create_production_cost' )
+    prompt_msg = _('Insert the name of the new cost:')
+    error_msg = _('Something went wrong. Please, try again')
+    select_tag('price_details[][production_cost_id]',
+               '<option value="" disabled="disabled">' + _('Select...') + '</option>' +
+               options_for_select(product.available_production_costs.map {|item| [truncate(item.name, 10, '...'), item.id]} + [[_('Other cost'), '']], selected),
+               {:class => 'production-cost-selection',
+                :onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
+  end
+
+  def price_composition_progressbar_text(product, args = {})
+    currency = environment.currency_unit
+    production_cost = args[:production_cost_value] || product.formatted_value(:total_production_cost)
+    product_price = args[:product_price] || product.formatted_value(:price)
+
+    _("%{currency} %{production_cost} of %{currency} %{product_price}") % {:currency => currency, :production_cost => content_tag('span', production_cost, :class => 'production_cost'), :product_price => content_tag('span', product_price, :class => 'product_price')}
+  end
 end
@@ -6,6 +6,7 @@ class Enterprise &lt; Organization
  
   has_many :products, :dependent => :destroy, :order => 'name ASC'
   has_many :inputs, :through => :products
+  has_many :production_costs, :as => :owner
  
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
  
@@ -12,18 +12,13 @@ class EnterpriseHomepage &lt; Article
     profile.nil? ? _('Homepage') : profile.name
   end
  
-  # FIXME isn't this too much including just to be able to generate some HTML?
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionController::UrlWriter
-  include ActionView::Helpers::AssetTagHelper
-  include EnterpriseHomepageHelper
-  include CatalogHelper
-
-  def to_html(options ={})
-    products = self.profile.products
-    display_profile_info(self.profile) + content_tag('div', self.body || '') +
-    (self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))
+  def to_html(options = {})
+    enterprise_homepage = self
+    lambda do
+      extend EnterpriseHomepageHelper
+      @products = profile.products.paginate(:order => 'id asc', :per_page => 9, :page => 1)
+      render :partial => 'content_viewer/enterprise_homepage', :object => enterprise_homepage
+    end
   end
  
   def can_display_hits?
@@ -174,6 +174,7 @@ class Environment &lt; ActiveRecord::Base
   acts_as_accessible
  
   has_many :units, :order => 'position'
+  has_many :production_costs, :as => :owner
  
   def superior_intances
     [self, nil]
@@ -9,15 +9,15 @@ class Image &lt; ActiveRecord::Base
   has_attachment :content_type => :image, 
                  :storage => :file_system, 
                  :path_prefix => 'public/image_uploads',
-                 :resize_to => '320x200>',
+                 :resize_to => '800x600>',
                  :thumbnails => { :big      => '150x150',
                                   :thumb    => '100x100',
                                   :portrait => '64x64',
                                   :minor    => '50x50',
                                   :icon     => '20x20!' },
-                 :max_size => 500.kilobytes # remember to update validate message below
+                 :max_size => 5.megabytes # remember to update validate message below
  
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 500.0 KB")
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB")
  
   delay_attachment_fu_thumbnails
  
@@ -45,6 +45,18 @@ class Input &lt; ActiveRecord::Base
     %w[price_per_unit amount_used].each do |field|
       return true unless self.send(field).blank?
     end
-    return false
+    false
+  end
+
+  def has_all_price_details?
+    %w[price_per_unit unit amount_used].each do |field|
+      return false if self.send(field).blank?
+    end
+    true
+  end
+
+  def cost
+    return 0 if self.amount_used.blank? || self.price_per_unit.blank?
+    self.amount_used * self.price_per_unit
   end
 end
@@ -0,0 +1,27 @@
+class PriceDetail < ActiveRecord::Base
+
+  belongs_to :product
+  validates_presence_of :product_id
+
+  belongs_to :production_cost
+  validates_presence_of :production_cost_id
+  validates_uniqueness_of :production_cost_id, :scope => :product_id
+
+  def price
+    self[:price] || 0
+  end
+
+  include FloatHelper
+  def price=(value)
+    if value.is_a?(String)
+      super(decimal_to_float(value))
+    else
+      super(value)
+    end
+  end
+
+  def formatted_value(value)
+    ("%.2f" % self[value]).to_s.gsub('.', product.enterprise.environment.currency_separator) if self[value]
+  end
+
+end
@@ -5,6 +5,8 @@ class Product &lt; ActiveRecord::Base
   has_many :product_qualifiers
   has_many :qualifiers, :through => :product_qualifiers
   has_many :inputs, :dependent => :destroy, :order => 'position'
+  has_many :price_details, :dependent => :destroy
+  has_many :production_costs, :through => :price_details
  
   validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
   validates_presence_of :product_category_id
@@ -101,12 +103,13 @@ class Product &lt; ActiveRecord::Base
     enterprise.public_profile
   end
  
-  def formatted_value(value)
-    ("%.2f" % self[value]).to_s.gsub('.', enterprise.environment.currency_separator) if self[value]
+  def formatted_value(method)
+    value = self[method] || self.send(method)
+    ("%.2f" % value).to_s.gsub('.', enterprise.environment.currency_separator) if value
   end
  
   def price_with_discount
-    price - discount if discount
+    discount ? (price - discount) : price
   end
  
   def price=(value)
@@ -125,6 +128,23 @@ class Product &lt; ActiveRecord::Base
     end
   end
  
+  # Note: will probably be completely overhauled for AI1413
+  def inputs_prices?
+    return false if self.inputs.count <= 0
+    self.inputs.each do |input|
+      return false if input.has_price_details? == false
+    end
+    true
+  end
+
+  def any_inputs_details?
+    return false if self.inputs.count <= 0
+    self.inputs.each do |input|
+      return true if input.has_all_price_details? == true
+    end
+    false
+  end
+
   def has_basic_info?
     %w[unit price discount].each do |field|
       return true if !self.send(field).blank?
@@ -153,4 +173,43 @@ class Product &lt; ActiveRecord::Base
     true
   end
  
+  def inputs_cost
+    return 0 if inputs.empty?
+    inputs.map(&:cost).inject { |sum,price| sum + price }
+  end
+
+  def total_production_cost
+    return inputs_cost if price_details.empty?
+    inputs_cost + price_details.map(&:price).inject { |sum,price| sum + price }
+  end
+
+  def price_described?
+    return false if price.nil?
+    (price - total_production_cost).zero?
+  end
+
+  def update_price_details(price_details)
+    self.price_details.destroy_all
+    price_details.each do |price_detail|
+      self.price_details.create(price_detail)
+    end
+  end
+
+  def price_description_percentage
+    total_production_cost * 100 / price
+  end
+
+  def available_production_costs
+    self.enterprise.environment.production_costs + self.enterprise.production_costs
+  end
+
+  include ActionController::UrlWriter
+  def price_composition_bar_display_url
+    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_price_composition_bar', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+  end
+
+  def inputs_cost_update_url
+    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+  end
+
 end
@@ -0,0 +1,8 @@
+class ProductionCost < ActiveRecord::Base
+
+  belongs_to :owner, :polymorphic => true
+  validates_presence_of :owner
+  validates_presence_of :name
+  validates_length_of :name, :maximum => 30, :allow_blank => true
+  validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
+end
-<%= display_products_list @profile, @products %>
+<% extra_content = [] %>
+<% extra_content_list = [] %>
  
-<%= pagination_links @products %>
+<ul id="product-list">
+  <li><h1><%= _('Products/Services') %></h1></li>
+
+  <% @products.each do |product| %>
+    <% extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
+    <% extra_content_list = @plugins.map(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
+
+    <li class="product <%= "not-available" unless product.available %>">
+      <ul>
+        <li class="product-image-link">
+          <% if product.image %>
+            <div class="zoomable-image">
+              <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
+              <%= link_to content_tag(:span, _('Zoom in')), product.default_image(:big).gsub('_big',''), :class => 'zoomify-image' %>
+            </div>
+          <% else %>
+            <div class="no-image"><%= _('No image') %></div>
+          <% end %>
+          <div class="catalog-item-extras"><%= extra_content.join("\n") %></div>
+        </li>
+
+        <li class="product-link"><%= link_to_product product %></li>
+
+        <li class="product-price-line">
+          <% unless product.discount.blank? or product.discount == 0 %>
+            <span class="product-discount">
+              <span><%= _('from ') + price_span(product.price) %></span>
+              <span class="product-discount-by"><%= _('by ') %></span>
+            </span>
+          <% end %>
+          <% unless product.price.blank? or product.price == 0 %>
+            <span class="product-price">
+              <%= price_span product.price_with_discount, :class => "product-price #{'with-discount' unless product.discount}" %>
+              <span class="product-unit"><%= _(' / ') + (product.unit ? product.unit.singular : _('unit')) %></span>
+            </span>
+          <% end %>
+          <div style="clear: both"></div>
+        </li>
+
+        <% if product.description %>
+          <li class="product-description expand-box">
+            <span id="product-description-button"><%= _('description') %></span>
+            <div>
+              <div class="arrow"></div>
+              <div class="content" id="product-description"><%= txt2html(product.description || '') %></div>
+            </div>
+          </li>
+        <% end %>
+
+        <% if product.price_described? %>
+          <li class="product-price-composition expand-box">
+            <span id="product-price-composition-button"><%= _('price composition') %></span>
+            <div>
+              <div class="arrow"></div>
+              <div class="content" id="product-price-composition">
+                <% product.inputs.each do |i| %>
+                  <div class="search-product-input-dots-to-price">
+                    <div class="search-product-input-name"><%= i.product_category.name %></div>
+                    <%= price_span i.cost, :class => 'search-product-input-price' %>
+                  </div>
+                <% end %>
+                <% product.price_details.each do |i| %>
+                  <div class="search-product-input-dots-to-price">
+                    <div class="search-product-input-name"><%= i.production_cost.name %></div>
+                    <%= price_span i.price, :class => 'search-product-input-price' %>
+                  </div>
+                <% end %>
+              </div>
+            </div>
+          </li>
+        <% end %>
+
+        <% if product.inputs.count > 0 %>
+          <li class="product-inputs expand-box">
+            <span id="inputs-button"><%= _('inputs and raw materials') %></span>
+            <div>
+              <div class="arrow"></div>
+              <div class="content" id="inputs-description">
+                <% product.inputs.each do |i| %>
+                  <div>
+                    <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
+                    <%= i.product_category.name %>
+                  </div>
+                <% end %>
+              </div>
+            </div>
+          </li>
+        <% end %>
+
+        <% unless product.qualifiers.blank? %>
+          <li class="product-qualifiers">
+            <span><%= _('qualifiers') if product.product_qualifiers.count > 0 %></span>
+            <div><%= render :partial => 'shared/product/qualifiers', :locals => {:product => product} %></div>
+        <% end %>
+
+        <% extra_content_list.map do |content| %>
+          <li class="catalog-list-item-extras"><%= content %></li>
+        <% end %>
+
+        <li class="product-unavailable"><%= _('product unavailable') unless product.available %></li>
+      </ul>
+    </li>
+  <% end %>
+</ul>
+
+<%= pagination_links @products, :params => {:controller => :catalog, :action => :index, :profile => profile.identifier} %>
+
+<%= add_zoom_to_images %>
+
+<br style="clear:both"/>
@@ -0,0 +1,3 @@
+<%= display_profile_info enterprise_homepage.profile %>
+<div><%= enterprise_homepage.body %></div>
+<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
@@ -91,4 +91,4 @@
 </div><!-- end class="comments" -->
  
 </div><!-- end id="article" -->
-<%= add_zoom_to_images %>
+<%= add_zoom_to_article_images %>
-<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', :cache => 'cache-general' %>
+<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 'manage-products', :cache => 'cache-general' %>
 <% language = FastGettext.locale %>
 <%= javascript_include_tag 'jquery-validation/localization/messages_'+language, 'jquery-validation/localization/methods_'+language %>
@@ -11,13 +11,13 @@
     <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
     <%= stylesheet_link_tag template_stylesheet_path %>
     <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-    <%= stylesheet_link_tag theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
     <% @plugins.enabled_plugins.each do |plugin| %>
       <% if plugin.stylesheet? %>
         <%= stylesheet_tag plugin.class.public_path('style.css'), {} %>
       <% end %>
     <% end %>
+    <%= stylesheet_link_tag theme_stylesheet_path %>
  
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
@@ -30,7 +30,7 @@
     <%=
       @plugins.map(:head_ending).collect do |content|
         content.respond_to?(:call) ? content.call : content
-      end.join('\n')
+      end.join("\n")
     %>
   </head>
   <body class="<%=
@@ -45,7 +45,7 @@
     <%=
       @plugins.map(:body_beginning).collect do |content|
         content.respond_to?(:call) ? content.call : content
-      end.join('\n')
+      end.join("\n")
     %>
  
     <div id="wrap-1">
@@ -27,11 +27,8 @@
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
     <%= javascript_tag('render_all_jquery_ui_widgets()') %>
-    <script type="text/javascript">
-       jQuery(".numbers-only").keypress(function(event) {
-          return numbersonly(event, '<%= environment.currency_separator %>')
-       });
-    </script>
+
+    <%= render :partial => 'shared/numbers_only_javascript' %>
   </head>
  
   <body class='noosfero category<%= category_color %><%=
@@ -0,0 +1,18 @@
+<div id='display-manage-price-details'></div>
+
+<div id='display-price-details'>
+  <ul class='price-details-list'>
+    <li>
+      <div class='price-detail-name'><%= _('Inputs:') %></div>
+      <div class='price-detail-price inputs-cost'>
+        <span><%= float_to_currency(@product.inputs_cost) %></span>
+      </div>
+    </li>
+    <% @product.price_details.each do |price_detail| %>
+      <li>
+        <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>
+        <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
+      </li>
+    <% end %>
+  </ul>
+</div>
@@ -49,15 +49,12 @@
     <%= hidden_field_tag "product[qualifiers_list]" %>
   <% end %>
  
+  <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>
+
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'info') %>
   <% end %>
 <% end %>
  
-<% javascript_tag do %>
-  jQuery(".numbers-only").keypress(function(event) {
-    var separator = "<%= environment.currency_separator %>"
-    return numbersonly(event, separator)
-  });
-<% end %>
+<%= render :partial => 'shared/numbers_only_javascript' %>
 <% 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' %>
+  <%= hidden_field_tag 'inputs-cost-update-url', @input.product.inputs_cost_update_url %>
+
   <table>
     <tr>
       <td><%= f.label :amount_used, label_amount_used(@input), :class => 'formlabel' %></td>
@@ -0,0 +1,14 @@
+<% price_details.each do |price_detail| %>
+  <tr id='<%= "price-detail-#{price_detail.id}" %>'>
+    <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
+    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>
+    <td>
+      <%= link_to_remote(_('Remove'),
+                         :update => "price-detail-#{price_detail.id}",
+                         :complete => "calculateValuesForBar();",
+                         :confirm => _('Are you sure that you want to remove this cost?'),
+                         :url => { :action => 'remove_price_detail', :id => price_detail, :product => @product }) %>
+  </tr>
+<% end %>
+
+<%= render :partial => 'shared/numbers_only_javascript' %>
@@ -0,0 +1,43 @@
+<div id='price-composition-bar'>
+  <%= render :partial => 'price_composition_bar' %>
+</div>
+
+<% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %>
+  <div>
+    <table id='display-product-price-details'>
+      <tr>
+        <td><%= _('Inputs') %></td>
+        <td class='inputs-cost'>
+          <span><%= float_to_currency(@product.inputs_cost) %></span>
+        </td>
+        <td>
+          <small><%= _('This value is composed by the total value of registered inputs') %></small>
+        </td>
+      </tr>
+      <%= render :partial => 'edit_price_details', :locals => {:price_details => @product.price_details} %>
+    </table>
+  </div>
+
+  <%= hidden_field(:product, :inputs_cost) %>
+  <%= hidden_field(:product, :price) %>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save'), :disabled => '', :class => 'disabled' %>
+    <%= button(:cancel, _('Cancel'), '#', :class => 'cancel-price-details', 'data-confirm' => _('If you leave, you will lose all unsaved information. Are you sure you want to quit?')) %>
+    <%= button(:add, _('New cost'), '#', :id => 'add-new-cost') %>
+    <span class='loading-area'></span>
+  <% end %>
+
+<% end %>
+
+<div style='display:none'>
+  <table id='new-cost-fields'>
+    <tr>
+      <td><%= select_production_cost(@product) %></td>
+      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>
+      <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
+    </tr>
+  </table>
+</div>
+
+<%= render :partial => 'shared/numbers_only_javascript' %>
@@ -0,0 +1,22 @@
+<% javascript_tag do %>
+  var value = <%= @product.price_description_percentage %>;
+  var total_cost = <%= @product.total_production_cost %>;
+  var price = '<%= @product.formatted_value(:price) %>';
+  var described = false;
+  var currency_format = { separator : '<%= environment.currency_separator %>', delimiter : '<%= environment.currency_delimiter %>', unit : '<%= environment.currency_unit %>' };
+  if (<%= @product.price_described? %>) {
+    var described = true;
+  }
+  priceCompositionBar(value,described,total_cost,price);
+<% end %>
+
+<div id="price-details-info">
+  <div id="details-progressbar">
+    <div id='progressbar'></div>
+    <div id='progressbar-text'>
+      <%= price_composition_progressbar_text(@product) %>
+    </div>
+  </div>
+  <div id='progressbar-icon' class='ui-icon ui-icon-info' data-price-not-described-message='<%= _("The production cost of your product is not described yet. If you want to display the price composition, please add all the costs") %>' data-price-described-message='<%= _("The production cost of your product is fully described and will be displayed on your product's page") %>' data-price-described-notice='<%= _("Congratulations! Now the price is open to the public") %>'>
+</div>
+</div>
@@ -0,0 +1,10 @@
+<%= edit_ui_button(
+  _('Describe here the cost of production'),
+  {:action => 'manage_product_details', :id => @product.id},
+  :id => 'manage-product-details-button',
+  'data-primary-icon' => 'ui-icon-pencil',
+  'data-secondary-icon' => 'ui-icon-triangle-1-s',
+  :title => _('Describe details about how the price was defined')
+) %>
+<%= javascript_tag("render_jquery_ui_buttons('manage-product-details-button')") %>
+<span class='loading-area'></span>
@@ -23,7 +23,7 @@
  
   <br style='clear: both'/>
  
-  <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty?) %>
+  <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
     <div class='ui-tabs' id='product-<%= @product.id %>-tabs'>
       <ul>
         <% if !@product.description.blank? || @allowed_user %>
@@ -32,6 +32,9 @@
         <% if !@product.inputs.empty? || @allowed_user %>
           <li class='tab'><a href='#product-inputs'><%= _('Inputs and raw material') %></a></li>
         <% end %>
+        <% if @product.price_described? || @allowed_user %>
+          <li class='tab'><a href='#product-price-details'><%= _('Price composition') %></a></li>
+        <% end %>
       </ul>
       <div id='product-description'>
         <%= render :partial => 'manage_products/display_description' %>
@@ -39,6 +42,12 @@
       <div id='product-inputs'>
         <%= render :partial => 'manage_products/display_inputs' %>
       </div>
+      <% if @product.price_described? || @allowed_user %>
+        <div id='product-price-details'>
+          <%= render :partial => 'manage_products/display_price_details' %>
+          <%= render :partial => 'manage_products/price_details_button' %>
+        </div>
+      <% end %>
     </div>
   <% end %>
  
@@ -0,0 +1,6 @@
+<% javascript_tag do %>
+  jQuery(".numbers-only").keypress(function(event) {
+    var separator = "<%= environment.currency_separator %>"
+    return numbersonly(event, separator)
+  });
+<% end %>
@@ -0,0 +1,10 @@
+<% product.product_qualifiers.each do |pq| %>
+  <% if pq.qualifier %>
+    <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
+  <% end %>
+  <% if pq.certifier %>
+    <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
+  <% end %>
+
+  <div style="clear: both"></div>
+<% end %>
@@ -0,0 +1,13 @@
+class CreateProductionCost < ActiveRecord::Migration
+  def self.up
+    create_table :production_costs do |t|
+      t.string :name
+      t.references :owner, :polymorphic => true
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :production_costs
+  end
+end
@@ -0,0 +1,14 @@
+class CreatePriceDetails < ActiveRecord::Migration
+  def self.up
+    create_table :price_details do |t|
+      t.decimal :price, :default => 0
+      t.references :product
+      t.references :production_cost
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :price_details
+  end
+end
@@ -323,6 +323,14 @@ ActiveRecord::Schema.define(:version =&gt; 20111004184104) do
     t.datetime "updated_at"
   end
  
+  create_table "price_details", :force => true do |t|
+    t.decimal  "price",              :default => 0.0
+    t.integer  "product_id"
+    t.integer  "production_cost_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "product_categorizations", :force => true do |t|
     t.integer  "category_id"
     t.integer  "product_id"
@@ -342,6 +350,14 @@ ActiveRecord::Schema.define(:version =&gt; 20111004184104) do
     t.datetime "updated_at"
   end
  
+  create_table "production_costs", :force => true do |t|
+    t.string   "name"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "products", :force => true do |t|
     t.integer  "enterprise_id"
     t.integer  "product_category_id"
@@ -43,7 +43,7 @@ Feature: manage categories
     When I follow "Show"
     Then I should see "Vegetarian"
     And I should see "Steak"
-    When I follow "Hide"
+    When I follow "Hide" and sleep 1 second
     Then I should not see "Vegetarian"
     And I should not see "Steak"
  
@@ -0,0 +1,309 @@
+Feature: browse catalogs
+  As a noosfero visitor
+  I want to browse catalogs of products
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following enterprises
+      | identifier | owner     | name                               | enabled |
+      | artebonito | joaosilva | Associação de Artesanato de Bonito | true    |
+    And feature "disable_products_for_enterprises" is disabled on environment
+    And the following product_categories
+      | name   |
+      | categ1 |
+      | food   |
+    And I am on /catalog/artebonito
+
+  Scenario: display titles
+    Then I should see "Associação de Artesanato de Bonito"
+    And I should see "Products/Services" within "#product-list"
+
+  Scenario: display the simplest possible product
+    Given the following products
+      | owner      | category |
+      | artebonito | categ1   |
+    And I am on /catalog/artebonito
+    Then I should see "categ1" within "li.product-link"
+    And I should see "No image" within ".no-image"
+    And I should not see "unit" within "#product-list"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: display a simple product without price
+    Given the following products
+      | owner      | category | name     |
+      | artebonito | categ1   | Produto1 |
+    And I am on /catalog/artebonito
+    Then I should see "Produto1" within "li.product-link"
+    And I should see "No image" within ".no-image"
+    And I should not see "unit" within "#product-list"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: display a simple product without details
+    Given the following products
+      | owner      | category | name     | price |
+      | artebonito | categ1   | Produto1 | 50.00 |
+    And I am on /catalog/artebonito
+    Then I should see "Produto1" within "li.product-link"
+    And I should see "50.00" within "span.product-price"
+    And I should see "unit" within "span.product-unit"
+    And I should see "No image" within ".no-image"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: don't display the price when it's $0.00
+    Given the following products
+      | owner      | category | name     | price |
+      | artebonito | categ1   | Produto1 | 0.00 |
+    And I am on /catalog/artebonito
+    Then I should see "Produto1" within "li.product-link"
+    And I should not see "0.00"
+    And I should see "No image" within ".no-image"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: product name links to product page
+    Given the following products
+      | owner      | category | name     | price |
+      | artebonito | categ1   | Produto1 | 50.00 |
+    And I am on /catalog/artebonito
+    When I follow "Produto1" within "li.product-link"
+    Then I should be taken to "Produto1" product page
+
+  Scenario: display product with custom image
+    Given the following products
+      | owner      | category | name    | price | img     |
+      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
+    And I am on /catalog/artebonito
+    Then I should see "Agrotox" within "li.product-link"
+    And I should see "12.34" within "span.product-price"
+    And I should see "unit" within "span.product-unit"
+    And I should not see "No image"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: display "zoom in" button
+    Given the following products
+      | owner      | category | name    | price | img     |
+      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
+    And I am on /catalog/artebonito
+    And I should not see "No image"
+    And I should see "Zoom in" within ".zoomify-image"
+
+  Scenario: image links to product page
+    Given the following products
+      | owner      | category | name    | price | img     |
+      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
+    And I am on /catalog/artebonito
+    When I follow "Agrotox" within ".product-image-link"
+    Then I should be taken to "Agrotox" product page
+
+  Scenario: display product with discount
+    Given the following products
+      | owner      | category | name        | price | discount | img         |
+      | artebonito | categ1   | Semterrinha | 99.99 | 12.34    | semterrinha |
+    And I am on /catalog/artebonito
+    Then I should see "Semterrinha" within "li.product-link"
+    And I should see "99.99" within "span.product-discount"
+    And I should see "87.65" within "span.product-price"
+    And I should not see "No image"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  @selenium
+  Scenario: display description button when needed (but not the description)
+    Given the following products
+      | owner      | category | name     | price | description                                           |
+      | artebonito | categ1   | Produto2 | 12.34 | A small description for a product that doesn't exist. |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    Then I should see "Produto2" within "li.product-link"
+    And I should see "12.34" within "span.product-price"
+    And I should see "description" within "#product-description-button"
+    And the "product-description-button" should be visible
+    And I should see "A small description" within "#product-description"
+    And the "product-description" should not be visible
+
+  @selenium
+  Scenario: display description when button is clicked
+    Given the following products
+      | owner      | category | name     | price | description                                           |
+      | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    When I click "product-description-button"
+    Then I should see "A small description" within "#product-description"
+    And the "product-description" should be visible
+
+  @selenium
+  Scenario: hide description
+    Given the following products
+      | owner      | category | name     | price | description                                           |
+      | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    When I click "product-description-button"
+    Then I should see "A small description" within "#product-description"
+    And the "product-description" should be visible
+    When I click "product-list"
+    Then the "product-description" should not be visible
+
+  Scenario: display unavailable product
+    Given the following products
+      | owner      | category | name  | price | available |
+      | artebonito | categ1   | Prod3 | 12.34 | false     |
+    And I am on /catalog/artebonito
+    Then I should see "Prod3" within "li.not-available"
+    And I should see "12.34" within "li.not-available"
+    And I should see "product unavailable" within "li.product-unavailable"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
+  Scenario: display qualifiers
+    Given the following qualifiers
+      | name    |
+      | Organic |
+    And the following certifiers
+      | name    | qualifiers |
+      | Colivre | Organic    |
+    And the following products
+      | owner      | category | name   | price | qualifier |
+      | artebonito | categ1   | Banana | 0.99  | Organic   |
+    And I am on /catalog/artebonito
+    Then I should see "Banana" within "li.product-link"
+    And I should see "0.99" within "span.product-price"
+    And I should see "qualifiers" within "li.product-qualifiers"
+    And I should see "Organic" within "span.search-product-qualifier"
+    And I should not see "price composition"
+
+  @selenium
+  Scenario: not display price composition button if price is not described
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Bananada | 10.00 |
+    And the following input
+      | product  | category | price_per_unit | amount_used |
+      | Bananada | food     | 0.99           | 5           |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    Then I should see "Bananada" within "li.product-link"
+    And I should see "10.00" within "span.product-price"
+    And the "#product-price-composition-button" should not be visible
+
+  @selenium
+  Scenario: display price composition button (but not inputs)
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Bananada | 10.00 |
+    And the following input
+      | product  | category | price_per_unit | amount_used |
+      | Bananada | food     | 2.00           | 5           |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    Then I should see "Bananada" within "li.product-link"
+    And I should see "10.00" within "span.product-price"
+    And I should see "price composition" within "#product-price-composition-button"
+    And the "#product-price-composition-button" should be visible
+    And I should see "food" within "#product-price-composition"
+    And I should see "10.00" within "#product-price-composition"
+
+  @selenium
+  Scenario: display price composition when button is clicked
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Bananada | 10.88 |
+    And the following input
+      | product  | category | price_per_unit | amount_used |
+      | Bananada | food     | 2.72           | 4           |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    When I click "#product-price-composition-button"
+    Then the "#product-price-composition" should be visible
+    And I should see "food" within "#product-price-composition"
+    And I should see "10.88" within "#product-price-composition"
+
+  @selenium
+  Scenario: display inputs and raw materials button when not completely filled
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Vitamina | 17.99 |
+    And the following unit
+      | name  | plural |
+      | Liter | Liters |
+    And the following input
+      | product  | category |
+      | Vitamina | food     |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    Then the "#inputs-button" should be visible
+    And I should see "inputs and raw materials" within "#inputs-button"
+
+  @selenium
+  Scenario: display inputs and raw materials button
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Vitamina | 17.99 |
+    And the following unit
+      | name  | plural |
+      | Liter | Liters |
+    And the following input
+      | product  | category | price_per_unit | amount_used | unit  |
+      | Vitamina | food     | 1.45           | 7           | Liter |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    Then I should see "Vitamina" within "li.product-link"
+    And I should see "17.99" within "span.product-price"
+    And the "#inputs-button" should be visible
+    And I should see "inputs and raw materials" within "#inputs-button"
+    And the "#inputs-description" should not be visible
+    And I should see "7.0 Liter of food" within "#inputs-description"
+
+  @selenium
+  Scenario: display inputs and raw materials description
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Vitamina | 17.99 |
+    And the following unit
+      | name  | plural |
+      | Liter | Liters |
+    And the following input
+      | product  | category | price_per_unit | amount_used | unit  |
+      | Vitamina | food     | 1.45           | 7           | Liter |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    When I click "#inputs-button"
+    Then the "#inputs-description" should be visible
+    And I should see "7.0 Liter of food" within "#inputs-description"
+
+  @selenium
+  Scenario: hide inputs and raw materials
+    Given the following product
+      | owner      | category | name     | price |
+      | artebonito | food     | Vitamina | 17.99 |
+    And the following unit
+      | name  | plural |
+      | Liter | Liters |
+    And the following input
+      | product  | category | price_per_unit | amount_used | unit  |
+      | Vitamina | food     | 1.45           | 7           | Liter |
+    And I am on /catalog/artebonito
+    And I reload and wait for the page
+    When I click "#inputs-button"
+    Then the "#inputs-description" should be visible
+    And I should see "7.0 Liter of food" within "#inputs-description"
+    When I click "#product-list"
+    Then the "#inputs-description" should not be visible
@@ -0,0 +1,40 @@
+Feature: browse enterprises
+  As a noosfero user
+  I want to browse enterprises
+
+Background:
+  Given the following enterprises
+    | identifier | name       |
+    | shop1      | Shoes Shop |
+  And feature "disable_products_for_enterprises" is disabled on environment
+  And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+
+Scenario: show all enterprises
+  Given the following enterprises
+    | identifier | name        |
+    | shop2      | Fruits Shop |
+  Given I am on /assets/enterprises
+  Then I should see "Enterprises"
+  And I should see "Shoes Shop"
+  And I should see "Fruits Shop"
+
+Scenario: show profile links button
+  Given I am on /assets/enterprises
+  Then I should see "Profile links" within "a.enterprise-trigger"
+  And I should not see "Members"
+  And I should not see "Agenda"
+
+@selenium
+Scenario: show profile links when clicked
+  Given I am on /assets/enterprises
+  When I follow "Profile links"
+  Then I should see "Products" within "ul.menu-submenu-list"
+  And I should see "Members" within "ul.menu-submenu-list"
+  And I should see "Agenda" within "ul.menu-submenu-list"
+
+@selenium
+Scenario: go to catalog when click on products link
+  Given I am on /assets/enterprises
+  When I follow "Profile links"
+  And I follow "Products" and wait
+  Then I should be exactly on /catalog/shop1
@@ -0,0 +1,38 @@
+# These tests were originally unit tests, but they were moved here since they are view tests. The originals have been kept just in case somebody wants to review them, but should be removed shortly.
+
+Feature: enterprise homepage
+  As a noosfero visitor
+  I want to browse an enterprise's homepage
+  In order to know more information about the enterprise
+
+  Background:
+    Given the following users
+      | login       | name         |
+      | durdentyler | Tyler Durden |
+    And the following enterprises
+      | identifier | owner       | name                  | contact_email        | contact_phone  | enabled |
+      | mayhem     | durdentyler | Paper Street Soap Co. | queen@workerbees.org | (288) 555-0153 | true    |
+    And the following enterprise homepage
+      | enterprise | name             |
+      | mayhem     | article homepage |
+    And the following product_category
+      | name |
+      | soap |
+    And the following product
+      | name             | category | owner  |
+      | Natural Handmade | soap     | mayhem |
+
+
+  Scenario: display profile info
+    When I go to /mayhem/homepage
+    Then I should see "queen@workerbees.org"
+    And I should see "(288) 555-0153"
+
+  Scenario: display products list
+    When I go to /mayhem/homepage
+    Then I should see "Natural Handmade"
+
+  Scenario: display link to product
+    When I go to /mayhem/homepage
+    And I follow "Natural Handmade"
+    Then I should be taken to "Natural Handmade" product page
@@ -0,0 +1,178 @@
+Feature: manage product price details
+  As an enterprise owner
+  I want to manage the details of product's price
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And the following enterprises
+      | identifier | owner | name | enabled |
+      | redemoinho | joaosilva | Rede Moinho | true |
+    Given the following product_category
+      | name  |
+      | Music |
+    And the following product_categories
+      | name | parent  |
+      | Rock | music   |
+      | CD Player | music   |
+    And the following product
+      | owner      | category | name       | price |
+      | redemoinho | rock     | Abbey Road | 80.0  |
+    And feature "disable_products_for_enterprises" is disabled on environment
+    And the following inputs
+      | product    | category  | price_per_unit | amount_used |
+      | Abbey Road | Rock      | 10.0           | 2           |
+      | Abbey Road | CD Player | 20.0           | 2           |
+    And the following production cost
+      | name  | owner       |
+      | Taxes | environment |
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: list total value of inputs as price details
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    Then I should see "Inputs"
+    And I should see "60.0" within ".inputs-cost"
+
+  @selenium
+  Scenario: return to product after save
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I press "Save"
+    Then I should be on Rede Moinho's page of product Abbey Road
+
+  @selenium
+  Scenario: add first item on price details
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I follow "New cost"
+    And I select "Taxes"
+    And I fill in "$" with "5.00"
+    And I leave the ".price-details-price" field
+    And I press "Save"
+    Then I should not see "Save"
+    And I should see "Describe here the cost of production"
+
+  @selenium
+  Scenario: edit a production cost
+    Given the following production cost
+      | name  | owner       |
+      | Energy | environment |
+    When I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I follow "New cost"
+    And I select "Taxes"
+    And I fill in "$" with "20.00"
+    And I leave the ".price-details-price" field
+    And I press "Save"
+    Then I should not see "Save"
+    And I should see "Taxes" within "#display-price-details"
+    When I follow "Describe here the cost of production"
+    And I select "Energy"
+    And I leave the ".price-details-price" field
+    And I press "Save"
+    And I should not see "Taxes" within "#display-price-details"
+    And I should see "Energy" within "#display-price-details"
+
+  Scenario: not display product detail button if product does not have input
+    Given the following product
+      | owner      | category | name             |
+      | redemoinho | rock     | Yellow Submarine |
+    And the following user
+      | login      | name        |
+      | mariasouza | Maria Souza |
+    And I am logged in as "mariasouza"
+    When I go to Rede Moinho's page of product Yellow Submarine
+    And I follow "Price composition"
+    Then I should not see "Describe here the cost of production"
+
+  Scenario: not display price details if price is not fully described
+    Given I am not logged in
+    And I go to Rede Moinho's page of product Abbey Road
+    Then I should not see "60.0"
+
+   @selenium
+   Scenario: display price details if price is fully described
+     Given I go to Rede Moinho's page of product Abbey Road
+     And I follow "Price composition"
+     And I follow "Describe here the cost of production"
+     And I follow "New cost"
+     And I select "Taxes"
+     And I fill in "$" with "20.00"
+     And I press "Save"
+     Then I should see "Inputs" within ".price-detail-name"
+     And I should see "60.0" within ".price-detail-price"
+
+  @selenium
+  Scenario: create a new cost clicking on select
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I follow "New cost"
+    And I want to add "Energy" as cost
+    And I select "Other cost"
+    And I fill in "$" with "10.00"
+    And I leave the ".price-details-price" field
+    And I press "Save"
+    When I follow "Describe here the cost of production"
+    Then I should see "Energy" within ".production-cost-selection"
+
+  @selenium
+  Scenario: add created cost on new-cost-fields
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I want to add "Energy" as cost
+    And I select "Other cost"
+    Then I should see "Energy" within "#new-cost-fields"
+
+  @selenium
+  Scenario: remove price detail
+    Given the following price detail
+      | product    | production_cost | price |
+      | Abbey Road | Taxes           | 20.0  |
+    And I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    And I should see "Taxes" within "#manage-product-details-form"
+    When I follow "Remove" within "#manage-product-details-form"
+    And I confirm
+    And I press "Save"
+    And I follow "Describe here the cost of production"
+    Then I should not see "Taxes" within "#manage-product-details-form"
+
+  Scenario: display progressbar
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
+
+  @selenium
+  Scenario: update value on progressbar after addition of new cost
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
+    And I follow "New cost"
+    And I fill in "$" with "10.00"
+    And I leave the ".price-details-price" field
+    Then I should see "$ 70.00 of $ 80.00" within "#progressbar-text"
+
+  @selenium
+  Scenario: update value on progressbar after editing an input
+    Given I go to Rede Moinho's page of product Abbey Road
+    And I follow "Price composition"
+    And I follow "Describe here the cost of production"
+    Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
+    When I follow "Inputs"
+    And I follow "Edit" within ".input-details"
+    And I fill in "Price" with "23.31"
+    And I press "Save"
+    Then I follow "Price composition"
+    And I should see "$ 86.62 of $ 80.00" within "#progressbar-text"
@@ -35,19 +35,20 @@ Feature: manage products
       | redemoinho | bicycle  | Bike J | bicycle 10 |
       | redemoinho | bicycle  | Bike K | bicycle 11 |
     When I go to /catalog/redemoinho
-    Then I should see "Bike A" within "#product_list"
-    And I should see "Bike B" within "#product_list"
-    And I should see "Bike C" within "#product_list"
-    And I should see "Bike D" within "#product_list"
-    And I should see "Bike E" within "#product_list"
-    And I should see "Bike F" within "#product_list"
-    And I should see "Bike G" within "#product_list"
-    And I should see "Bike H" within "#product_list"
-    And I should see "Bike I" within "#product_list"
-    And I should see "Bike J" within "#product_list"
-    And I should not see "Bike K" within "#product_list"
+    Then I should see "Bike A" within "#product-list"
+    And I should see "Bike B" within "#product-list"
+    And I should see "Bike C" within "#product-list"
+    And I should see "Bike D" within "#product-list"
+    And I should see "Bike E" within "#product-list"
+    And I should see "Bike F" within "#product-list"
+    And I should see "Bike G" within "#product-list"
+    And I should see "Bike H" within "#product-list"
+    And I should see "Bike I" within "#product-list"
+    And I should not see "Bike J" within "#product-list"
+    And I should not see "Bike K" within "#product-list"
     When I follow "Next"
-    Then I should see "Bike K" within "#product_list"
+    Then I should see "Bike J" within "#product-list"
+    Then I should see "Bike K" within "#product-list"
  
   Scenario: listing products and services
     Given I am logged in as "joaosilva"
 Feature: domain for profile
+
   As a user
   I want access a profile by its own domain
  
@@ -150,8 +150,16 @@ Given /^the following products?$/ do |table|
     data = item.dup
     owner = Enterprise[data.delete("owner")]
     category = Category.find_by_slug(data.delete("category").to_slug)
-    img = Image.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    product = Product.create!(data.merge(:enterprise => owner, :product_category => category, :image_id => img.id))
+    data.merge!(:enterprise => owner, :product_category => category)
+    if data[:img]
+      img = Image.create!(:uploaded_data => fixture_file_upload('/files/'+data.delete("img")+'.png', 'image/png'))
+      data.merge!(:image_id => img.id)
+    end
+    if data[:qualifier]
+      qualifier = Qualifier.find_by_name(data.delete("qualifier"))
+      data.merge!(:qualifiers => [qualifier])
+    end
+    product = Product.create!(data)
   end
 end
  
@@ -214,6 +222,22 @@ Given /^the following certifiers$/ do |table|
   end
 end
  
+Given /^the following production costs?$/ do |table|
+  table.hashes.map{|item| item.dup}.each do |item|
+    owner_type = item.delete('owner')
+    owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
+    ProductionCost.create!(item.merge(:owner => owner))
+  end
+end
+
+Given /^the following price details?$/ do |table|
+  table.hashes.map{|item| item.dup}.each do |item|
+    product = Product.find_by_name item.delete('product')
+    production_cost = ProductionCost.find_by_name item.delete('production_cost')
+    product.price_details.create!(item.merge(:production_cost => production_cost))
+  end
+end
+
 Given /^I am logged in as "(.+)"$/ do |username|
   visit('/account/logout')
   visit('/account/login')
@@ -493,3 +517,32 @@ end
 When 'I log off' do
   visit '/account/logout'
 end
+
+Then /^I should be taken to "([^\"]*)" product page$/ do |product_name|
+  product = Product.find_by_name(product_name)
+  path = url_for(product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product, :only_path => true))
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    URI.parse(response.selenium.get_location).path.should == path_to(path)
+  else
+    URI.parse(current_url).path.should == path_to(path)
+  end
+end
+
+When /^I reload and wait for the page$/ do
+  response.selenium.refresh
+  selenium.wait_for_page
+end
+
+Given /^the following enterprise homepages?$/ do |table|
+  # table is a Cucumber::Ast::Table
+  table.hashes.each do |item|
+    data = item.dup
+    home = EnterpriseHomepage.new(:name => data[:name])
+    ent = Enterprise.find_by_identifier(data[:enterprise])
+    ent.articles << home
+  end
+end
+
+And /^I want to add "([^\"]*)" as cost$/ do |string|
+  selenium.answer_on_next_prompt(string)
+end
@@ -117,3 +117,17 @@ Then /^the select for category &quot;([^\&quot;]*)&quot; should be visible$/ do |name|
   category = Category.find_by_name(name)
   selenium.is_visible(string_to_element_locator("option=#{category.id}")).should be_true
 end
+
+When /^I follow "([^\"]*)" and sleep ([^\"]*) seconds?$/ do |link, time|
+  click_link(link)
+  sleep time.to_i
+end
+
+When /^I follow "([^\"]*)" and wait for jquery$/ do |link|
+  click_link(link)
+  selenium.wait_for(:wait_for => :ajax, :javascript_framework => framework)
+end
+
+When /^I leave the "([^\"]+)" field$/ do |field|
+   selenium.fire_event("css=#{field}", "blur")
+end
@@ -19,6 +19,7 @@ end
 When /^I visit "([^\"]*)" and wait$/ do |page_name|
   visit path_to(page_name)
   selenium.wait_for_page_to_load(10000)
+#  selenium.wait_for_page
 end
  
 When /^I press "([^\"]*)"$/ do |button|
@@ -118,7 +118,7 @@ class ShoppingCartPluginProfileController &lt; ProfileController
       session[:cart][:visibility] = true
       render :text => {
         :ok => true,
-        :message => _('Cart displayed.'),
+        :message => _('Basket displayed.'),
         :error => {:code => 0}
       }.to_json
     rescue Exception => exception
@@ -137,7 +137,7 @@ class ShoppingCartPluginProfileController &lt; ProfileController
       session[:cart][:visibility] = false
       render :text => {
         :ok => true,
-        :message => _('Cart Hidden.'),
+        :message => _('Basket hidden.'),
         :error => {:code => 0}
       }.to_json
     rescue Exception => exception
@@ -173,7 +173,7 @@ class ShoppingCartPluginProfileController &lt; ProfileController
         :ok => false,
         :error => {
         :code => 2,
-        :message => _("There is no cart.")
+        :message => _("There is no basket.")
       }
       }.to_json
       return false
@@ -203,7 +203,7 @@ class ShoppingCartPluginProfileController &lt; ProfileController
         :ok => false,
         :error => {
         :code => 4,
-        :message => _("The cart doesn't have this product.")
+        :message => _("The basket doesn't have this product.")
       }
       }.to_json
       return false
@@ -4,17 +4,17 @@ require_dependency &#39;shopping_cart_plugin/ext/person&#39;
 class ShoppingCartPlugin < Noosfero::Plugin
  
   def self.plugin_name
-    "Shopping Cart"
+    "Shopping Basket"
   end
  
   def self.plugin_description
-    _("A shopping cart feature for enterprises")
+    _("A shopping basket feature for enterprises")
   end
  
   def add_to_cart_button(item, enterprise = context.profile)
     if enterprise.shopping_cart && item.available
        lambda {
-         link_to(_('Add to cart'), "add:#{item.name}",
+         link_to(_('Add to basket'), "add:#{item.name}",
            :class => 'cart-add-item',
            :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false"
          )
@@ -41,10 +41,10 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   def control_panel_buttons
     buttons = []
     if context.profile.enterprise?
-      buttons << { :title => 'Shopping cart', :icon => 'shopping_cart_icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
+      buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
     end
     if context.profile.enterprise? && context.profile.shopping_cart
-      buttons << { :title => 'Purchase reports', :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
+      buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
     end
  
     buttons
@@ -62,7 +62,7 @@ function Cart(config) {
         '<div class="item-price">' +
         '<input size="1" value="'+item.quantity+'" />'+ (item.price ? '&times; '+ item.price : '') +'</div>' +
         ' <a href="remove:'+item.name+'" onclick="Cart.removeItem(\''+this.enterprise+'\', '+item.id+'); return false"' +
-        ' class="button icon-delete"><span>remove</span></a>'
+        ' class="button icon-remove"><span>remove</span></a>'
        ).appendTo(li);
       var input = $("input", li)[0];
       input.lastValue = input.value;
@@ -304,6 +304,10 @@ function Cart(config) {
     });
   }
  
+  Cart.colorbox_close = function() {
+    $.colorbox.close();
+  }
+
   $(function(){
     $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} })
   });
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg3362"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icone.svg">
+  <defs
+     id="defs3364" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="278.97361"
+     inkscape:cy="689.0069"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     inkscape:window-x="-3"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3367">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g5575-7"
+       transform="matrix(0.07006136,0,0,0.07006136,-271.48534,-209.48041)"
+       style="fill:#d38d5f">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-9-6"
+         d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-3-6-2"
+         d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-8-6-2"
+         d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-7-4-7"
+         d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-2-8"
+         d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-1-9"
+         d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-4-4-1"
+         d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-7-7-7"
+         d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-7-4-6-5"
+         d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-7-4-3-3-0"
+         d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-7-4-2-3-8"
+         d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5245-5-4-7-4-3-5-8-2"
+         d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
+         style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
@@ -14,7 +14,7 @@
    height="48"
    id="svg2"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="purchase-report.svg"
    inkscape:export-filename="/home/aurium/purchase-report.png"
    inkscape:export-xdpi="90"
@@ -352,10 +352,10 @@
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="827"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     inkscape:window-x="-3"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -419,120 +419,17 @@
        ry="0" />
     <g
        id="g4873"
-       mask="url(#mask4922)">
-      <g
-         transform="translate(6,1)"
-         id="g4757">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
-           id="path2839"
-           transform="translate(0,1004.3622)"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="cccccc"
-           id="path3619"
-           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
-           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" />
-        <path
-           transform="translate(7.5,1000.8622)"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           sodipodi:ry="1.5"
-           sodipodi:rx="1.5"
-           sodipodi:cy="16"
-           sodipodi:cx="7"
-           id="path3647"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4776"
-           sodipodi:cx="7"
-           sodipodi:cy="16"
-           sodipodi:rx="1.5"
-           sodipodi:ry="1.5"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           transform="translate(-1,1000.8622)" />
-      </g>
-      <g
-         id="g4778"
-         transform="translate(6,15)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           transform="translate(0,1004.3622)"
-           id="path4780"
-           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
-           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-        <path
-           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0"
-           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
-           id="path4782"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4784"
-           sodipodi:cx="7"
-           sodipodi:cy="16"
-           sodipodi:rx="1.5"
-           sodipodi:ry="1.5"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           transform="translate(7.5,1000.8622)" />
-        <path
-           transform="translate(-1,1000.8622)"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           sodipodi:ry="1.5"
-           sodipodi:rx="1.5"
-           sodipodi:cy="16"
-           sodipodi:cx="7"
-           id="path4786"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-      </g>
-      <g
-         transform="translate(6,29)"
-         id="g4788">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
-           id="path4790"
-           transform="translate(0,1004.3622)"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="cccccc"
-           id="path4792"
-           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
-           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" />
-        <path
-           transform="translate(7.5,1000.8622)"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           sodipodi:ry="1.5"
-           sodipodi:rx="1.5"
-           sodipodi:cy="16"
-           sodipodi:cx="7"
-           id="path4794"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4796"
-           sodipodi:cx="7"
-           sodipodi:cy="16"
-           sodipodi:rx="1.5"
-           sodipodi:ry="1.5"
-           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-           transform="translate(-1,1000.8622)" />
-      </g>
+       mask="url(#mask4922)"
+       transform="translate(0,1.7382813e-5)">
       <path
          sodipodi:nodetypes="cccccc"
          d="m 29.5,1015.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
          style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         id="path4802" />
+         id="path4802"
+         inkscape:connector-curvature="0" />
       <path
          transform="translate(0,1004.3622)"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          sodipodi:ry="1"
          sodipodi:rx="1"
          sodipodi:cy="5.5"
@@ -548,11 +445,11 @@
          sodipodi:cy="5.5"
          sodipodi:rx="1"
          sodipodi:ry="1"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          transform="translate(0,1007.3622)" />
       <path
          transform="translate(0,1010.3622)"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          sodipodi:ry="1"
          sodipodi:rx="1"
          sodipodi:cy="5.5"
@@ -564,7 +461,8 @@
          id="path4811"
          style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
          d="m 29.5,1029.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
-         sodipodi:nodetypes="cccccc" />
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:type="arc"
          style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -573,11 +471,11 @@
          sodipodi:cy="5.5"
          sodipodi:rx="1"
          sodipodi:ry="1"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          transform="translate(0,1018.3622)" />
       <path
          transform="translate(0,1021.3622)"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          sodipodi:ry="1"
          sodipodi:rx="1"
          sodipodi:cy="5.5"
@@ -593,15 +491,16 @@
          sodipodi:cy="5.5"
          sodipodi:rx="1"
          sodipodi:ry="1"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          transform="translate(0,1024.3622)" />
       <path
          id="path4827"
          style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0" />
+         d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0"
+         inkscape:connector-curvature="0" />
       <path
          transform="translate(0,1033.3622)"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          sodipodi:ry="1"
          sodipodi:rx="1"
          sodipodi:cy="5.5"
@@ -617,11 +516,11 @@
          sodipodi:cy="5.5"
          sodipodi:rx="1"
          sodipodi:ry="1"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          transform="translate(0,1036.3622)" />
       <path
          transform="translate(0,1039.3622)"
-         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
          sodipodi:ry="1"
          sodipodi:rx="1"
          sodipodi:cy="5.5"
@@ -629,6 +528,201 @@
          id="path4833"
          style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          sodipodi:type="arc" />
+      <g
+         id="g5575-7"
+         transform="matrix(0.01545762,0,0,0.01545762,-84.564216,932.96399)"
+         style="fill:#d38d5f">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-9-6"
+           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-3-6-2"
+           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-8-6-2"
+           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-7-4-7"
+           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-2-8"
+           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-1-9"
+           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-4-4-1"
+           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-7-7"
+           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-6-5"
+           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-3-0"
+           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-2-3-8"
+           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-5-8-2"
+           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      </g>
+      <g
+         id="g5575-7-8"
+         transform="matrix(0.01545762,0,0,0.01545762,-84.486184,947.26528)"
+         style="fill:#d38d5f">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-9-6-5"
+           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-3-6-2-0"
+           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-8-6-2-9"
+           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-7-4-7-6"
+           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-2-8-3"
+           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-1-9-8"
+           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-4-4-1-5"
+           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-7-7-6"
+           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-6-5-1"
+           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-3-0-1"
+           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-2-3-8-5"
+           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-5-8-2-9"
+           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      </g>
+      <g
+         id="g5575-7-8-8"
+         transform="matrix(0.01545762,0,0,0.01545762,-84.564216,961.96398)"
+         style="fill:#d38d5f">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-9-6-5-4"
+           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-3-6-2-0-8"
+           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-8-6-2-9-1"
+           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-7-4-7-6-0"
+           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-2-8-3-3"
+           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-1-9-8-0"
+           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-4-4-1-5-4"
+           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-7-7-6-4"
+           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-6-5-1-4"
+           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-3-0-1-4"
+           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-2-3-8-5-7"
+           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect5245-5-4-7-4-3-5-8-2-9-6"
+           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
+           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
+      </g>
     </g>
     <g
        id="g4835"
 @import url(colorbox/colorbox.css);
  
-.cart-add-item {
-  position: absolute;
-  right: 5px;
-  top: 5px;
+.cart-add-item .ui-icon-cart {
+      background: url("images/button-icon.png") no-repeat scroll left center transparent;
+          width: 22px;
+        }
+         .cart-buy .ui-icon-cart {
+                 background: url("images/button-icon.png") no-repeat scroll left center transparent;
+                           width: 22px;
+                                   }
+.cart-add-item .ui-button-text {
+  padding-left: 2.6em;
 }
  
 .product-item .cart-add-item {
@@ -13,16 +19,15 @@
 .cart {
   position: fixed;
   right: 20px;
-  top: 0px;
+  bottom: 0px;
   width: 200px;
   z-index: 1000;
   border: 1px solid #777;
-  border-top: none;
-  background: rgba(200,200,200,0.6);
+  background: rgba(100,100,100,0.8);
 }
  
 .cart h3 {
-  color: #888;
+  color: #000;
   margin: 0px 0px 0px 5px;
 }
  
@@ -108,7 +113,7 @@
   padding: 0px 5px;
 }
 .cart-toggle:hover {
-  color: #555;
+  color: #fff;
 }
  
 #cart-request-box {
@@ -120,6 +125,15 @@
   float: left;
 }
  
+#cart-request-box .cart-box-close {
+  position: absolute;
+  right: 10px;
+  bottom: 10px;
+  width: 16px;
+  height: 16px;
+  background-repeat: no-repeat;
+}
+
 #cart-form-main {
   border: 2px solid #FFF;
   padding: 0px 10px;
@@ -171,8 +185,8 @@ label.error {
  
 .controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)}
 .controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)}
-.controller-profile_editor a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.png)}
-.controller-profile_editor .msie6 a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.gif)}
+.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.png)}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.gif)}
  
 .action-shopping_cart_plugin_myprofile-reports td.order-info {
   padding: 0px;
 <div id="cart1" class="cart" style="display:none"
   data-l10nRemoveItem="<%=_('Are you sure you want to remove this item?')%>"
-  data-l10nCleanCart="<%=_('Are you sure you want to clean your cart?')%>">
+  data-l10nCleanCart="<%=_('Are you sure you want to clean your basket?')%>">
   <div class="cart-inner">
     <div class="cart-content">
-      <h3><%= _("Cart") %></h3>
-      <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean cart')%></a>
+      <h3><%= _("Basket") %></h3>
+      <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
       <a href="cart:buy" class="cart-buy"><%=_('Shopping checkout')%></a>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
-      <span class="str-show"><%=_('Show cart')%></span>
-      <span class="str-hide" style="display:none"><%=_('Hide cart')%></span>
+      <span class="str-show"><%=_('Show basket')%></span>
+      <span class="str-hide" style="display:none"><%=_('Hide basket')%></span>
     </a>
   </div>
 </div>
-<h1> <%= _('Cart options') %> </h1>
+<h1> <%= _('Basket options') %> </h1>
  
 <% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
   <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %>
@@ -17,6 +17,7 @@
     </div>
   <% end %>
   <%= items_table(session[:cart][:items], profile) %>
+  <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
 </div>
  
 <script type="text/javascript">
@@ -255,7 +255,7 @@ function toggleSubmenu(trigger, title, link_list) {
       if (!hide) {
         var direction = 'down';
         if (submenu.hasClass('up')) direction = 'up';
-        submenu.show('slide', { 'direction' : direction }, 'slow');
+        jQuery(submenu).fadeIn();
       }
     }
     return false;
@@ -283,18 +283,18 @@ function toggleSubmenu(trigger, title, link_list) {
   content.append(list);
   submenu.append(header).append(content).append(footer);
   jQuery(trigger).before(submenu);
-  submenu.show('slide', { 'direction' : direction }, 'slow');
+  jQuery(submenu).fadeIn();
 }
  
 function toggleMenu(trigger) {
   hideAllSubmenus();
-  jQuery(trigger).siblings('.simplemenu-submenu').toggle('slide', {direction: 'up'}, 'slow').toggleClass('opened');
+  jQuery(trigger).siblings('.simplemenu-submenu').toggle().toggleClass('opened');
 }
  
 function hideAllSubmenus() {
-  jQuery('.menu-submenu.up:visible').hide('slide', { 'direction' : 'up' }, 'slow');
-  jQuery('.simplemenu-submenu:visible').hide('slide', { 'direction' : 'up' }, 'slow').toggleClass('opened');
-  jQuery('.menu-submenu.down:visible').hide('slide', { 'direction' : 'down' }, 'slow');
+  jQuery('.menu-submenu.up:visible').fadeOut('slow');
+  jQuery('.simplemenu-submenu:visible').hide().toggleClass('opened');
+  jQuery('.menu-submenu.down:visible').fadeOut('slow');
   jQuery('#chat-online-users-content').hide();
 }
  
@@ -694,3 +694,14 @@ jQuery(function() {
     target: "#ajax-form-message-area"
   })
 });
+
+// from http://jsfiddle.net/naveen/HkxJg/
+// Function to get the Max value in Array
+Array.max = function(array) {
+  return Math.max.apply(Math, array);
+};
+// Function to get the Min value in Array
+Array.min = function(array) {
+  return Math.min.apply(Math, array);
+};
+
@@ -0,0 +1,47 @@
+(function($) {
+
+$('#product-list .product .expand-box').live('click', function () {
+  $('.expand-box').each(function(index, element){ this.clicked = false; toggle_expandbox(this); });
+  this.clicked = !this.clicked;
+  toggle_expandbox(this);
+  $.each($(this).siblings('.expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
+
+  return false;
+});
+
+$(document).live('click', function() {
+  $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
+});
+
+$(document).click(function (event) {
+   if ($(event.target).parents('.expand-box').length == 0) {
+     $('.expand-box').each(function(index, element){
+       $(element).removeClass('open');
+       $(element).children('div').toggle(false);
+     });
+   }
+});
+
+var rows = {};
+$('#product-list .product').each(function (index, element) {
+  obj = rows[$(element).offset().top] || {};
+
+  obj.heights = obj.heights || [];
+  obj.elements = obj.elements || [];
+  obj.heights.push($(element).height());
+  obj.elements.push(element);
+
+  rows[$(element).offset().top] = obj;
+});
+
+$.each(rows, function(top, obj) {
+  maxWidth = Array.max(obj.heights);
+  $(obj.elements).height(maxWidth);
+});
+
+})(jQuery);
+
+function toggle_expandbox(e) {
+  jQuery(e).toggleClass('open', e.clicked);
+  jQuery(e).children('div').toggle(e.clicked).css({left: jQuery(e).position().left-180, top: jQuery(e).position().top-10});
+}
@@ -0,0 +1,183 @@
+(function($) {
+
+  $("#manage-product-details-button").live('click', function() {
+    $("#product-price-details").find('.loading-area').addClass('small-loading');
+    url = $(this).attr('href');
+    $.get(url, function(data){
+      $("#manage-product-details-button").hide();
+      $("#display-price-details").hide();
+      $("#display-manage-price-details").html(data);
+      $("#product-price-details").find('.loading-area').removeClass('small-loading');
+    });
+    return false;
+  });
+
+  $(".cancel-price-details").live('click', function() {
+    if ( !$(this).hasClass('form-changed') ) {
+      cancelPriceDetailsEdition();
+    } else {
+      if (confirm($(this).attr('data-confirm'))) {
+        cancelPriceDetailsEdition();
+      }
+    }
+    return false;
+  });
+
+  $("#manage-product-details-form").live('submit', function(data) {
+     var form = this;
+     $(form).find('.loading-area').addClass('small-loading');
+     $(form).css('cursor', 'progress');
+     $.post(form.action, $(form).serialize(), function(data) {
+       $("#display-manage-price-details").html(data);
+       $("#manage-product-details-button").show();
+     });
+     if ($('#progressbar-icon').hasClass('ui-icon-check')) {
+       display_notice($('#progressbar-icon').attr('data-price-described-notice'));
+     }
+     return false;
+  });
+
+  $("#add-new-cost").live('click', function() {
+    $('#display-product-price-details tbody').append($('#new-cost-fields tbody').html());
+    return false;
+  });
+
+  $(".cancel-new-cost").live('click', function() {
+    $(this).parents('tr').remove();
+    calculateValuesForBar();
+    return false;
+  });
+
+  $("#product-info-form").live('submit', function(data) {
+    var form = this;
+    updatePriceCompositionBar(form);
+  });
+
+  $("form.edit_input").live('submit', function(data) {
+    var form = this;
+    inputs_cost_update_url = $(form).find('#inputs-cost-update-url').val();
+    $.get(inputs_cost_update_url, function(data){
+      $(".inputs-cost span").html(data);
+    });
+    updatePriceCompositionBar(form);
+    return false;
+  });
+
+  $("#manage-product-details-form .price-details-price").live('blur', function(data) { calculateValuesForBar(); });
+
+  function cancelPriceDetailsEdition() {
+    $("#manage-product-details-button").show();
+    $("#display-price-details").show();
+    $("#display-manage-price-details").html('');
+  };
+
+})(jQuery);
+
+function updatePriceCompositionBar(form) {
+  bar_url = jQuery(form).find('.bar-update-url').val();
+  jQuery.ajax({
+    url : bar_url,
+    success : function(data) {
+      jQuery("#price-composition-bar").html(data);
+    },
+    complete : function() {
+      jQuery('form #product_price').val(currencyToFloat(jQuery('#progressbar-text .product_price').html(), currency_format.separator, currency_format.delimiter));
+      jQuery('form #product_inputs_cost').val(currencyToFloat(jQuery('#display-product-price-details .inputs-cost span').html(), currency_format.separator, currency_format.delimiter, currency_format.unit));
+      calculateValuesForBar();
+    }
+  });
+};
+
+function enablePriceDetailSubmit() {
+  jQuery('#manage-product-details-form input.submit').removeAttr("disabled").removeClass('disabled');
+}
+
+function calculateValuesForBar() {
+  jQuery('.cancel-price-details').addClass('form-changed');
+  var product_price = parseFloat(jQuery('form #product_price').val());
+  var total_cost = parseFloat(jQuery('form #product_inputs_cost').val());
+
+  jQuery('form .price-details-price').each(function() {
+    var this_val = parseFloat(jQuery(this).val().replace(currency_format.separator, '.')) || 0;
+    total_cost = total_cost + this_val;
+  });
+  enablePriceDetailSubmit();
+
+  var described = (product_price - total_cost) == 0;
+  var percentage = total_cost * 100 / product_price;
+  priceCompositionBar(percentage, described, total_cost, product_price);
+}
+
+function addCommas(nStr) {
+  nStr += '';
+  var x = nStr.split('.');
+  var x1 = x[0];
+  var x2 = x.length > 1 ? '.' + x[1] : '';
+  var rgx = /(\d+)(\d{3})/;
+  while (rgx.test(x1)) {
+    x1 = x1.replace(rgx, '$1' + ',' + '$2');
+  }
+  return x1 + x2;
+}
+
+function floatToCurrency(value, sep, del, cur) {
+  var ret = '';
+  if (cur) ret = cur + ' ';
+  if (!sep) sep = '.';
+  if (!del) del = ',';
+  return ret + addCommas(parseFloat(value).toFixed(2).toString()).replace('.', '%sep%').replace(',', del).replace('%sep%', sep);
+}
+
+function currencyToFloat(value, sep, del, cur) {
+  var val = value;
+  if (cur) val = val.replace(cur + ' ', '');
+  if (!sep) sep = '.';
+  if (!del) del = ',';
+  return parseFloat(val.replace(del, '').replace(sep, '.'));
+}
+
+function productionCostTypeChange(select, url, question, error_msg) {
+  if (select.value == '') {
+    var newType = prompt(question);
+    if (newType) {
+      jQuery.ajax({
+        url: url + "/" + newType,
+        dataType: 'json',
+        success: function(data, status, ajax){
+          if (data.ok) {
+            var opt = jQuery('<option value="' + data.id + '">' + newType + '</option>');
+            opt.insertBefore(jQuery("option:last", select));
+            select.selectedIndex = select.options.length - 2;
+            opt.clone().insertBefore('#new-cost-fields .production-cost-selection option:last');
+          } else {
+            alert(data.error_msg);
+          }
+        },
+        error: function(ajax, status, error){
+          alert(error_msg);
+        }
+      });
+    }
+  }
+}
+
+function priceCompositionBar(value, described, total_cost, price) {
+  jQuery(function($) {
+    var bar_area = $('#price-composition-bar');
+    $(bar_area).find('#progressbar').progressbar({
+      value: value
+    });
+    $(bar_area).find('.production_cost').html(floatToCurrency(total_cost, currency_format.separator, currency_format.delimiter));
+    $(bar_area).find('.product_price').html(floatToCurrency(price, currency_format.separator, currency_format.delimiter));
+    if (described) {
+      $(bar_area).find('#progressbar-icon').addClass('ui-icon-check');
+      $(bar_area).find('#progressbar-icon').attr('title', $('#progressbar-icon').attr('data-price-described-message'));
+      $(bar_area).find('div.ui-progressbar-value').addClass('price-described');
+    } else {
+      $(bar_area).find('#progressbar-icon').removeClass('ui-icon-check');
+      $(bar_area).find('#progressbar-icon').attr('title', $('#progressbar-icon').attr('data-price-not-described-message'));
+      $(bar_area).find('div.ui-progressbar-value').removeClass('price-described');
+
+    }
+  });
+}
@@ -1075,10 +1075,12 @@ code input {
   text-align: left;
   background: transparent url(/images/black-alpha-pixel.png);
   border-bottom: 1px solid #333;
+  text-decoration: none;
 }
  
 .zoomable-image:hover .zoomify-image {
   display: block;
+  text-decoration: none;
 }
  
 #article .zoomify-image {
@@ -1093,6 +1095,7 @@ code input {
   border-bottom: 1px solid #eee;
   display: block;
   background: transparent url(/images/zoom.png) left center no-repeat;
+  color: #fff;
 }
  
 #article pre {
@@ -2962,71 +2965,228 @@ div#activation_enterprise div {
  
 /* ==> public/stylesheets/controller_catalog.css <== */
 /* ==> @import url('products.css'); <== */
+/* * * Products catalog * * * * * * * * * * * * */
  
-/* * * List Products * * * * * * * * * * * * */
-
-#product_list {
+#product-list {
+  line-height: 20px;
   margin: 0px;
   padding: 0px;
 }
-
-#product_list ul {
+#product-list ul {
   margin: 0px;
   padding: 0px;
 }
-
-#content #product_list li {
+#product-list li {
   margin: 0px;
   padding: 0px;
   list-style: none;
 }
-
-#content #product_list li.product {
-  border: 1px solid #888;
+#product-list li.product {
+  width: 200px;
+  min-height: 280px;
+  float: left;
+  padding: 10px 30px 10px 0;
   margin-bottom: 10px;
-  padding: 5px 10px;
-  position: relative;
 }
-
-#product_list .product-pic {
+#product-list .expand-box:hover {
+  background-color: #28F091;
+}
+#product-list .expand-box {
+  background-color: #1EB46D;
+  margin-bottom: 3px;
+  -moz-border-radius: 10px 0px 0px 10px;
+  -webkit-border-radius: 10px 0px 0px 10px;
+  border-radius: 10px 0px 0px 10px;
+  width: 202px;
+}
+#product-list .expand-box > span {
+  padding-left: 20px;
+  font-size: 0.70em;
+  color: white;
+  font-weight: bold;
+  background: url(/images/catalog-expanders.png) no-repeat;
   display: block;
-  width: 64px;
-  height: 64px;
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
+  line-height: 15px;
+  background-position: left 100%;
+  cursor: pointer;
+}
+#product-list .expand-box.open > span {
+  background-position: left top;
+}
+#product-list .expand-box-corner {
+}
+#product-list li.product .product-qualifiers {
+  font-size: 9px;
+  line-height: normal;
+}
+#product-list li.product .product-qualifiers > span {
+  font-weight: bold;
+  display: block;
+  margin-top: 8px;
+}
+#product-list li.product .product-qualifiers > span,
+#product-list li.product .expand-box > span {
+  text-transform: uppercase;
+}
+#product-list li.product .expand-box > div {
+  display: none;
+  position: absolute;
+  z-index: 10;
+}
+#product-list li.product .expand-box .content {
+  font-size: 11px;
+  padding: 6px 5px;
+  overflow: auto;
+  max-height: 200px;
+  width: 160px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  background: #DCFFD7;
+  border: 2px solid #1EB46D;
+  min-height: 30px;
   float: left;
-  margin-right: 15px;
-  position: relative; /* work arround msie bug */
+  text-align: left;
+}
+#product-list li.product .expand-box .arrow {
+  border-left: 6px solid #1EB46D;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  margin-top: 13px;
+  float: right;
 }
  
-#product_list .product-pic span {
-  display: none;
+#product-list li.product.not-available .expand-box {
+  background-color: #DCF3E9;
+}
+#product-list li.product.not-available .product-link a,
+#product-list li.product.not-available .product-qualifiers,
+#product-list li.product.not-available .product-price-line,
+#product-list li.product.not-available .product-price,
+#product-list li.product.not-available .product-unit {
+  color: #ACACAC !important;
+}
+#product-list .product-link {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  color: #006672;
+  font-weight: bold;
+  text-align: left;
+}
+#product-list .prop {
+  float:right;
+  width:1px;
+}
+#product-list .min50px {
+  height:50px;
+}
+#product-list .product-row-clear {
+  clear:both;
+  height:1px;
+  overflow:hidden;
 }
  
-#content #product_list h3 {
-  margin: 0px;
-  padding: 0px;
-  font-size: 120%;
+#product-list .product-price-line {
+  margin: 0 0 8px;
+  display: block;
+  clear: both;
 }
-.msie #content #product_list h3 {
-  margin-top: -15px;
+#product-list .product-price {
+  font-weight: bold;
 }
-#product_list h3 a {
-  text-decoration: none;
+#product-list .product-price,
+#product-list .product-unit {
+  color: #0194C7;
+}
+#product-list .product-unit,
+#product-list .product-discount,
+#product-list .product-discount-by {
+  font-size: 9px;
+  margin-right: 3px;
+}
+#product-list .product-discount,
+#product-list .product-price {
+  float: left;
+  line-height: 15px;
+  margin-right: 3px;
+}
+#product-list .product-discount span {
+  text-decoration: line-through;
+}
+#product-list .product-discount-by {
+  text-decoration: none !important;
 }
  
-#product_list .product_category {
-  font-size: 11px;
+#product-list .search-product-input-dots-to-price {
+  width: 100%;
+  margin: 0;
+}
+#product-list .search-product-input-name {
+  background-color: #DCFFD7;
+  max-width: 101px;
+}
+#product-list .search-product-input-price {
+  background-color: #DCFFD7;
 }
  
-#product_list .description {
-  clear: left;
-  font-size: 11px;
-  text-align: justify;
-  padding: 5px 10px 0px 10px;
+#product-list .catalog-item-extras {
+  position: absolute;
+  bottom: 0px;
+  right: 0px;
+}
+#product-list .product-big {
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+  display: block;
+  width: 200px;
+  height: 160px;
+}
+#product-list .ui-button {
+  margin: 0;
+}
+#product-list .ui-button-text {
+  color: #D38D5F;
+  font-size: 0.8em;
+  padding: 0.1em 0.3em 0.1em 3em;
+}
+#product-list .product-big span {
+  display: none;
+}
+#product-list .product-image-link {
+  position: relative;
+  width: 200px;
+  height: 160px;
+  border: 1px solid #BFBFBF;
+  position: relative; /* work arround msie bug */
+  text-align: center;
+  vertical-align: middle;
 }
-.msie #product_list .description {
-  padding: 5px 10px 10px 10px;
+#product-list .product-image-link .no-image {
+  line-height: 145px;
+  text-align: center;
+  color: #777;
+  font-size: 9px;
+  font-weight: bold;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  user-select: none;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+}
+#product-list li.product-unavailable {
+  text-transform: uppercase;
+  color: #FF6261;
+  font-weight: bold;
+  line-height: 40px;
+}
+#product-list h3 {
+  margin: 0px;
+  padding: 0px;
+  font-size: 120%;
+}
+.msie #product-list h3 {
+  margin-top: -15px;
 }
  
 /* * * Show Product * * * * * * * * * * * * */
@@ -3223,6 +3383,86 @@ div#activation_enterprise div {
   font-weight: bold;
 }
  
+/* * * * * * Price details  * * * * * */
+
+#display-price-details .price-details-list {
+  padding-left: 0px;
+}
+
+#display-price-details .price-details-list li {
+  list-style: none;
+}
+
+#display-price-details .price-details-list li .price-detail-name {
+  width: 200px;
+}
+
+#display-price-details .price-details-list li .price-detail-name,
+#display-price-details .price-details-list li .price-detail-price {
+  display: inline-block;
+}
+
+#manage-product-details-form .formlabel,
+#manage-product-details-form .formfield {
+  display: inline-block;
+}
+
+#manage-product-details-form #add-new-cost {
+  float: right;
+}
+
+/* * * Progress bar on price details edition * * */
+
+#display-manage-price-details .ui-widget-content {
+  border: 1px solid #DDD;
+}
+
+#display-manage-price-details .ui-progressbar {
+  height: 20px;
+}
+
+#display-manage-price-details .ui-progressbar .ui-progressbar-value {
+  margin: 0px;
+  background-color: #A40000;
+  filter:alpha(opacity=70);
+  -moz-opacity: 0.7;
+  opacity: 0.7;
+}
+
+#display-manage-price-details .ui-progressbar .ui-progressbar-value.price-described {
+  background-color: #4E9A06;
+}
+
+#display-manage-price-details #price-details-info {
+  margin: 10px 0px;
+}
+
+#display-manage-price-details #details-progressbar {
+  position: relative;
+  width: 410px;
+  display: inline-block;
+}
+
+#display-manage-price-details #progressbar-text {
+  position: absolute;
+  top: 5px;
+  right: 7px;
+  font-size: 11px;
+}
+
+#display-manage-price-details #progressbar-icon {
+  display: inline-block;
+  cursor: pointer;
+}
+
+#display-manage-price-details #details-progressbar .ui-corner-left,
+#display-manage-price-details #details-progressbar .ui-corner-right {
+  -moz-border-radius-bottomleft: 0px;
+  -moz-border-radius-bottomright: 0px;
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 0px;
+}
+
 /* ==> public/stylesheets/controller_cms.css <== */
  
  
@@ -18,29 +18,29 @@
     Change the following styles to modify the appearance of ColorBox.  They are
     ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
+#cboxOverlay{background:url(/stylesheets/colorbox/images/overlay.png) repeat 0 0;}
 #colorbox{}
-    #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -100px 0;}
-    #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -129px 0;}
-    #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -100px -29px;}
-    #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -129px -29px;}
-    #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}
-    #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}
-    #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}
-    #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}
+    #cboxTopLeft{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -100px 0;}
+    #cboxTopRight{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -129px 0;}
+    #cboxBottomLeft{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -100px -29px;}
+    #cboxBottomRight{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -129px -29px;}
+    #cboxMiddleLeft{width:21px; background:url(/stylesheets/colorbox/images/controls.png) left top repeat-y;}
+    #cboxMiddleRight{width:21px; background:url(/stylesheets/colorbox/images/controls.png) right top repeat-y;}
+    #cboxTopCenter{height:21px; background:url(/stylesheets/colorbox/images/border.png) 0 0 repeat-x;}
+    #cboxBottomCenter{height:21px; background:url(/stylesheets/colorbox/images/border.png) 0 -29px repeat-x;}
     #cboxContent{background:#fff; overflow:hidden;}
         #cboxError{padding:50px; border:1px solid #ccc;}
         #cboxLoadedContent{margin-bottom:28px;}
         #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
         #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
         #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
-        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
         #cboxPrevious.hover{background-position:-75px -25px;}
-        #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxNext{position:absolute; bottom:0; left:27px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
         #cboxNext.hover{background-position:-50px -25px;}
-        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
-        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
-        #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxLoadingOverlay{background:url(/stylesheets/colorbox/images/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(/stylesheets/colorbox/images/loading.gif) no-repeat center center;}
+        #cboxClose{position:absolute; bottom:0; right:0; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
         #cboxClose.hover{background-position:-25px -25px;}
  
 /*
@@ -61,14 +61,14 @@
 /*
   The following provides PNG transparency support for IE6
 */
-.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}
-.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}
-.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}
-.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}
-.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}
-.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}
-.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}
-.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}
+.cboxIE6 #cboxTopLeft{background:url(/stylesheets/colorbox/images/ie6/borderTopLeft.png);}
+.cboxIE6 #cboxTopCenter{background:url(/stylesheets/colorbox/images/ie6/borderTopCenter.png);}
+.cboxIE6 #cboxTopRight{background:url(/stylesheets/colorbox/images/ie6/borderTopRight.png);}
+.cboxIE6 #cboxBottomLeft{background:url(/stylesheets/colorbox/images/ie6/borderBottomLeft.png);}
+.cboxIE6 #cboxBottomCenter{background:url(/stylesheets/colorbox/images/ie6/borderBottomCenter.png);}
+.cboxIE6 #cboxBottomRight{background:url(/stylesheets/colorbox/images/ie6/borderBottomRight.png);}
+.cboxIE6 #cboxMiddleLeft{background:url(/stylesheets/colorbox/images/ie6/borderMiddleLeft.png);}
+.cboxIE6 #cboxMiddleRight{background:url(/stylesheets/colorbox/images/ie6/borderMiddleRight.png);}
  
 .cboxIE6 #cboxTopLeft,
 .cboxIE6 #cboxTopCenter,
@@ -98,7 +98,7 @@ end
 done
  
 print "Activating users: "
-User.all(:conditions => ['login NOT LIKE "%%_template"']).each do |user|
+User.all(:conditions => ["login NOT LIKE '%%_template'"]).each do |user|
   user.activate
   print '.'
 end
@@ -449,4 +449,12 @@ module Noosfero::Factory
     { :singular => 'Litre', :plural => 'Litres', :environment_id => 1 }
   end
  
+  ###############################################
+  # Production Cost
+  ###############################################
+
+  def defaults_for_production_cost
+    { :name => 'Production cost ' + factory_num_seq.to_s }
+  end
+
 end
@@ -46,7 +46,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
  
     assert_equal 12, @enterprise.products.count
     get :index, :profile => @enterprise.identifier
-    assert_equal 10, assigns(:products).count
+    assert_equal 9, assigns(:products).count
     assert_tag :a, :attributes => {:class => 'next_page'}
   end
  
@@ -63,21 +63,13 @@ class CatalogControllerTest &lt; ActionController::TestCase
   should 'not show product price when listing products if not informed' do
     prod = @enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
     get :index, :profile => @enterprise.identifier
-    assert_no_tag :tag => 'li', :attributes => { :class => 'product_price' }, :content => /Price:/
+    assert_no_tag :tag => 'span', :attributes => { :class => 'product-price with-discount' }, :content => /50.00/
   end
  
   should 'show product price when listing products if informed' do
     prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => @product_category)
     get :index, :profile => @enterprise.identifier
-    assert_tag :tag => 'li', :attributes => { :class => 'product_price' }, :content => /Price:/
-  end
-
-  should 'link to assets products wiht product category in the link to product category on index' do
-    pc = ProductCategory.create!(:name => 'some product', :environment => enterprise.environment)
-    prod = enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => pc)
-
-    get :index, :profile => enterprise.identifier
-    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
+    assert_tag :tag => 'span', :attributes => { :class => 'product-price with-discount' }, :content => /50.00/
   end
  
   should 'add an zero width space every 4 caracters of comment urls' do
@@ -468,4 +468,47 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
     assert_response 403
   end
  
+  should 'remove price detail of a product' do
+    product = fast_create(Product, :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    detail = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+
+    assert_equal [detail], product.price_details
+
+    post :remove_price_detail, :id => detail.id, :product => product, :profile => @enterprise.identifier
+    product.reload
+    assert_equal [], product.price_details
+  end
+
+  should 'create a production cost for enterprise' do
+    get :create_production_cost, :profile => @enterprise.identifier, :id => 'Taxes'
+
+    assert_equal ['Taxes'], Enterprise.find(@enterprise.id).production_costs.map(&:name)
+    resp = ActiveSupport::JSON.decode(@response.body)
+    assert_equal 'Taxes', resp['name']
+    assert resp['id'].kind_of?(Integer)
+    assert resp['ok']
+    assert_nil resp['error_msg']
+  end
+
+  should 'display error if production cost has no name' do
+    get :create_production_cost, :profile => @enterprise.identifier
+
+    resp = ActiveSupport::JSON.decode(@response.body)
+    assert_nil resp['name']
+    assert_nil resp['id']
+    assert !resp['ok']
+    assert_match /blank/, resp['error_msg']
+  end
+
+  should 'display error if name of production cost is too long' do
+    get :create_production_cost, :profile => @enterprise.identifier, :id => 'a'*60
+
+    resp = ActiveSupport::JSON.decode(@response.body)
+    assert_nil resp['name']
+    assert_nil resp['id']
+    assert !resp['ok']
+    assert_match /too long/, resp['error_msg']
+  end
+
 end
@@ -625,13 +625,18 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     env = Environment.default
     env.stubs(:enabled?).with(:show_zoom_button_on_article_images).returns(false)
     stubs(:environment).returns(env)
-    assert_nil add_zoom_to_images
+    assert_nil add_zoom_to_article_images
   end
  
   should 'return code when :show_zoom_button_on_article_images is enabled in environment' do
     env = Environment.default
     env.stubs(:enabled?).with(:show_zoom_button_on_article_images).returns(true)
     stubs(:environment).returns(env)
+    assert_not_nil add_zoom_to_article_images
+  end
+
+  should 'return code when add_zoom_to_images' do
+    env = Environment.default
     assert_not_nil add_zoom_to_images
   end
  
@@ -16,43 +16,9 @@ class EnterpriseHomepageTest &lt; ActiveSupport::TestCase
     assert_kind_of String, EnterpriseHomepage.description
   end
  
-  should 'display profile info' do
-    e = Enterprise.create!(:name => 'my test enterprise', :identifier => 'mytestenterprise', :contact_email => 'ent@noosfero.foo.bar', :contact_phone => '5555 5555')
-    a = EnterpriseHomepage.new(:name => 'article homepage')
-    e.articles << a
-    result = a.to_html
-    assert_match /ent@noosfero.foo.bar/, result
-    assert_match /5555 5555/, result
-  end
-
-  should 'display products list' do
-    ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'Test enteprise')
-    prod = ent.products.create!(:name => 'Product test', :product_category => @product_category)
-    a = EnterpriseHomepage.new(:name => 'article homepage')
-    ent.articles << a
-    result = a.to_html
-    assert_match /Product test/, result
-  end
-
-  should 'not display products list if environment do not let' do
-    e = Environment.default
-    e.enable('disable_products_for_enterprises')
-    e.save!
-    ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'Test enteprise', :environment_id => e.id)
-    prod = ent.products.create!(:name => 'Product test', :product_category => @product_category)
-    a = EnterpriseHomepage.new(:name => 'article homepage')
-    ent.articles << a
-    result = a.to_html
-    assert_no_match /Product test/, result
-  end
-
-  should 'display link to product' do
-    ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'Test enteprise')
-    prod = ent.products.create!(:name => 'Product test', :product_category => @product_category)
-    a = EnterpriseHomepage.new(:name => 'article homepage')
-    ent.articles << a
-    result = a.to_html
-    assert_match /\/test_enterprise\/manage_products\/show\/#{prod.id}/, result
+  should 'return a valid body' do
+    e = EnterpriseHomepage.new(:name => 'sample enterprise homepage')
+    assert_not_nil e.to_html
   end
  
   should 'can display hits' do
@@ -446,4 +446,8 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
     assert_equal false, enterprise.receives_scrap_notification?
   end
  
+  should 'have production cost' do
+    e = fast_create(Enterprise)
+    assert_respond_to e, :production_costs
+  end
 end
@@ -1200,4 +1200,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert_not_includes environment.enabled_plugins, plugin
   end
  
+  should 'have production costs' do
+    assert_respond_to Environment.default, :production_costs
+  end
 end
@@ -77,6 +77,7 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     file = mock()
     UploadedFile.expects(:find).with(1).returns(file)
     file.expects(:public_filename).returns('address')
+    UploadedFile.expects(:find).with(0).returns(nil)
     block = HighlightsBlock.new(:images => [{:image_id => 1, :address => '/address', :position => 1, :title => 'address'}, {:image_id => '', :address => 'some', :position => '2', :title => 'Some'}])
     block.save!
     block.reload
@@ -115,6 +116,12 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     f3 = mock()
     f3.expects(:public_filename).returns('address')
     UploadedFile.expects(:find).with(3).returns(f3)
+    f4 = mock()
+    f4.expects(:public_filename).returns('address')
+    UploadedFile.expects(:find).with(4).returns(f4)
+    f5 = mock()
+    f5.expects(:public_filename).returns('address')
+    UploadedFile.expects(:find).with(5).returns(f5)
     block = HighlightsBlock.new
     i1 = {:image_id => 1, :address => '/address', :position => 3, :title => 'address'}
     i2 = {:image_id => 2, :address => '/address', :position => 1, :title => 'address'}
@@ -162,4 +162,19 @@ class InputTest &lt; ActiveSupport::TestCase
     assert_kind_of Unit, input.build_unit
   end
  
+  should 'calculate cost of input' do
+    input = Input.new(:amount_used => 10, :price_per_unit => 2.00)
+    assert_equal 20.00, input.cost
+  end
+
+  should 'cost 0 if amount not defined' do
+    input = Input.new(:price_per_unit => 2.00)
+    assert_equal 0.00, input.cost
+  end
+
+  should 'cost 0 if price_per_unit is not defined' do
+    input = Input.new(:amount_used => 10)
+    assert_equal 0.00, input.cost
+  end
+
 end
@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PriceDetailTest < ActiveSupport::TestCase
+
+  should 'have price 0 by default' do
+    p = PriceDetail.new
+
+    assert p.price.zero?
+  end
+
+  should 'return zero on price if it is blank' do
+    p = PriceDetail.new(:price => '')
+
+    assert p.price.zero?
+  end
+
+  should 'accept price in american\'s or brazilian\'s currency format' do
+    [
+      [12.34, 12.34],
+      ["12.34", 12.34],
+      ["12,34", 12.34],
+      ["12.345.678,90", 12345678.90],
+      ["12,345,678.90", 12345678.90],
+      ["12.345.678", 12345678.00],
+      ["12,345,678", 12345678.00]
+    ].each do |input, output|
+      new_price_detail = PriceDetail.new(:price => input)
+      assert_equal output, new_price_detail.price
+    end
+  end
+
+  should 'belongs to a product' do
+    p = PriceDetail.new
+
+    assert_respond_to p, :product
+  end
+
+  should 'product be mandatory' do
+    p = PriceDetail.new
+    p.valid?
+
+    assert p.errors.invalid?(:product_id)
+  end
+
+  should 'have production cost' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    detail = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+
+    assert_equal cost, PriceDetail.find(detail.id).production_cost
+  end
+
+  should 'production cost be mandatory' do
+    p = PriceDetail.new
+    p.valid?
+
+    assert p.errors.invalid?(:production_cost_id)
+  end
+
+  should 'th production cost be unique on scope of product' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'environment')
+
+    detail1 = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+    detail2 = product.price_details.build(:production_cost_id => cost.id, :price => 10)
+
+    detail2.valid?
+    assert detail2.errors.invalid?(:production_cost_id)
+  end
+
+  should 'format values to float with 2 decimals' do
+    enterprise = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => enterprise.id)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'environment')
+
+    price_detail = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+
+    assert_equal "10.00", price_detail.formatted_value(:price)
+  end
+
+end
@@ -382,4 +382,132 @@ class ProductTest &lt; ActiveSupport::TestCase
     assert_includes Product.find_by_contents('thing'), p2
   end
  
+  should 'respond to price details' do
+    product = Product.new
+    assert_respond_to product, :price_details
+  end
+
+  should 'return total value of inputs' do
+    product = fast_create(Product)
+    first = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 2)
+    second = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 10.0, :amount_used => 1)
+
+    assert_equal 50.0, product.inputs_cost
+  end
+
+  should 'return 0 on total value of inputs if has no input' do
+    product = fast_create(Product)
+
+    assert product.inputs_cost.zero?
+  end
+
+  should 'know if price is described' do
+    product = fast_create(Product, :price => 30.0)
+
+    first = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 1)
+    assert !Product.find(product.id).price_described?
+
+    second = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 10.0, :amount_used => 1)
+    assert Product.find(product.id).price_described?
+  end
+
+  should 'return false on price_described if price of product is not defined' do
+    product = fast_create(Product)
+
+    assert_equal false, product.price_described?
+  end
+
+  should 'create price details' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    assert product.price_details.empty?
+
+    product.update_price_details([{:production_cost_id => cost.id, :price => 10}])
+    assert_equal 1, Product.find(product.id).price_details.size
+  end
+
+  should 'update price of a cost on price details' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    cost2 = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    price_detail = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+    assert !product.price_details.empty?
+
+    product.update_price_details([{:production_cost_id => cost.id, :price => 20}, {:production_cost_id => cost2.id, :price => 30}])
+    assert_equal 20, product.price_details.find_by_production_cost_id(cost.id).price
+    assert_equal 2, Product.find(product.id).price_details.size
+  end
+
+  should 'destroy price details if product is removed' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    price_detail = product.price_details.create(:production_cost_id => cost.id, :price => 10)
+
+    assert_difference PriceDetail, :count, -1 do
+      product.destroy
+    end
+  end
+
+  should 'have production costs' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'Environment')
+    product.price_details.create(:production_cost_id => cost.id, :price => 10)
+    assert_equal [cost], Product.find(product.id).production_costs
+  end
+
+  should 'return production costs from enterprise and environment' do
+    ent = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => ent.id)
+    ent_production_cost = fast_create(ProductionCost, :owner_id => ent.id, :owner_type => 'Profile')
+    env_production_cost = fast_create(ProductionCost, :owner_id => ent.environment.id, :owner_type => 'Environment')
+
+    assert_equal [env_production_cost, ent_production_cost], product.available_production_costs
+  end
+
+  should 'return all production costs' do
+    ent = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => ent.id)
+
+    env_production_cost = fast_create(ProductionCost, :owner_id => ent.environment.id, :owner_type => 'Environment')
+    ent_production_cost = fast_create(ProductionCost, :owner_id => ent.id, :owner_type => 'Profile')
+    product.price_details.create(:production_cost => env_production_cost, :product => product)
+    assert_equal [env_production_cost, ent_production_cost], product.available_production_costs
+  end
+
+  should 'return total value of production costs' do
+    ent = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => ent.id)
+
+    env_production_cost = fast_create(ProductionCost, :owner_id => ent.environment.id, :owner_type => 'Environment')
+    price_detail = product.price_details.create(:production_cost => env_production_cost, :price => 10)
+
+    input = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 2)
+
+    assert_equal price_detail.price + input.cost, product.total_production_cost
+  end
+
+  should 'return inputs cost as total value of production costs if has no price details' do
+    ent = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => ent.id)
+
+    input = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 2)
+
+    assert_equal input.cost, product.total_production_cost
+  end
+
+  should 'return 0 on total production cost if has no input and price details' do
+    product = fast_create(Product)
+
+    assert product.total_production_cost.zero?
+  end
+
+  should 'format inputs cost values to float with 2 decimals' do
+    ent = fast_create(Enterprise)
+    product = fast_create(Product, :enterprise_id => ent.id)
+    first = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 2)
+    second = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 10.0, :amount_used => 1)
+
+    assert_equal "50.00", product.formatted_value(:inputs_cost)
+  end
+
 end
@@ -0,0 +1,102 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProductionCostTest < ActiveSupport::TestCase
+
+  should 'have name' do
+    p = ProductionCost.new
+    p.valid?
+    assert p.errors.invalid?(:name)
+
+    p.name = 'Taxes'
+    p.valid?
+    assert !p.errors.invalid?(:name)
+  end
+
+  should 'not validates name if it is blank' do
+    p = ProductionCost.new
+
+    p.valid?
+    assert_equal 1, p.errors['name'].to_a.count
+  end
+
+  should 'not have a too long name' do
+    p = ProductionCost.new
+
+    p.name = 'a'*40
+    p.valid?
+    assert p.errors.invalid?(:name)
+
+    p.name = 'a'*30
+    p.valid?
+    assert !p.errors.invalid?(:name)
+  end
+
+  should 'not have duplicated name on same environment' do
+    cost = ProductionCost.create(:name => 'Taxes', :owner => Environment.default)
+
+    invalid_cost = ProductionCost.new(:name => 'Taxes', :owner => Environment.default)
+    invalid_cost.valid?
+
+    assert invalid_cost.errors.invalid?(:name)
+  end
+
+  should 'not have duplicated name on same enterprise' do
+    enterprise = fast_create(Enterprise)
+    cost = ProductionCost.create(:name => 'Taxes', :owner => enterprise)
+
+    invalid_cost = ProductionCost.new(:name => 'Taxes', :owner => enterprise)
+    invalid_cost.valid?
+
+    assert invalid_cost.errors.invalid?(:name)
+  end
+
+  should 'not allow same name on enterprise if already has on environment' do
+    enterprise = fast_create(Enterprise)
+
+    cost1 = ProductionCost.create(:name => 'Taxes', :owner => Environment.default)
+    cost2 = ProductionCost.new(:name => 'Taxes', :owner => enterprise)
+
+    cost2.valid?
+
+    assert !cost2.errors.invalid?(:name)
+  end
+
+  should 'allow duplicated name on different enterprises' do
+    enterprise = fast_create(Enterprise)
+    enterprise2 = fast_create(Enterprise)
+
+    cost1 = ProductionCost.create(:name => 'Taxes', :owner => enterprise)
+    cost2 = ProductionCost.new(:name => 'Taxes', :owner => enterprise2)
+
+    cost2.valid?
+
+    assert !cost2.errors.invalid?(:name)
+  end
+
+  should 'be associated to an environment as owner' do
+    p = ProductionCost.new
+    p.valid?
+    assert p.errors.invalid?(:owner)
+
+    p.owner = Environment.default
+    p.valid?
+    assert !p.errors.invalid?(:owner)
+  end
+
+  should 'be associated to an enterprise as owner' do
+    enterprise = fast_create(Enterprise)
+    p = ProductionCost.new
+    p.valid?
+    assert p.errors.invalid?(:owner)
+
+    p.owner = enterprise
+    p.valid?
+    assert !p.errors.invalid?(:owner)
+  end
+
+  should 'create a production cost on an enterprise' do
+    enterprise = fast_create(Enterprise)
+    enterprise.production_costs.create(:name => 'Energy')
+    assert_equal ['Energy'], enterprise.production_costs.map(&:name)
+  end
+end
...	...	@@ -111,6 +111,36 @@ class ManageProductsController < ApplicationController
111	111	end
112	112	end
113	113
	114	+ def manage_product_details
	115	+ @product = @profile.products.find(params[:id])
	116	+ if request.post?
	117	+ @product.update_price_details(params[:price_details]) if params[:price_details]
	118	+ render :partial => 'display_price_details'
	119	+ else
	120	+ render :partial => 'manage_product_details'
	121	+ end
	122	+ end
	123	+
	124	+ def remove_price_detail
	125	+ @product = @profile.products.find(params[:product])
	126	+ @price_detail = @product.price_details.find(params[:id])
	127	+ @product = @price_detail.product
	128	+ if request.post?
	129	+ @price_detail.destroy
	130	+ render :nothing => true
	131	+ end
	132	+ end
	133	+
	134	+ def display_price_composition_bar
	135	+ @product = @profile.products.find(params[:id])
	136	+ render :partial => 'price_composition_bar'
	137	+ end
	138	+
	139	+ def display_inputs_cost
	140	+ @product = @profile.products.find(params[:id])
	141	+ render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
	142	+ end
	143	+
114	144	def destroy
115	145	@product = @profile.products.find(params[:id])
116	146	if @product.destroy
...	...	@@ -167,4 +197,18 @@ class ManageProductsController < ApplicationController
167	197	end
168	198	end
169	199
	200	+ def create_production_cost
	201	+ cost = @profile.production_costs.create(:name => params[:id])
	202	+ if cost.valid?
	203	+ cost.save
	204	+ render :text => {:name => cost.name,
	205	+ :id => cost.id,
	206	+ :ok => true
	207	+ }.to_json
	208	+ else
	209	+ render :text => {:ok => false,
	210	+ :error_msg => _(cost.errors['name']) % {:fn => _('Name')}
	211	+ }.to_json
	212	+ end
	213	+ end
170	214	end
...	...
...	...	@@ -4,10 +4,11 @@ class CatalogController < PublicController
4	4	before_filter :check_enterprise_and_environment
5	5
6	6	def index
7		- @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
	7	+ @products = @profile.products.paginate(:order => 'name asc', :per_page => 9, :page => params[:page])
8	8	end
9	9
10	10	protected
	11	+
11	12	def check_enterprise_and_environment
12	13	unless @profile.kind_of?(Enterprise) && !@profile.environment.enabled?('disable_products_for_enterprises')
13	14	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
...	...
...	...	@@ -1254,25 +1254,27 @@ module ApplicationHelper
1254	1254	task.information[:message] % values
1255	1255	end
1256	1256
	1257	+ def add_zoom_to_article_images
	1258	+ add_zoom_to_images if environment.enabled?(:show_zoom_button_on_article_images)
	1259	+ end
	1260	+
1257	1261	def add_zoom_to_images
1258		- if environment.enabled?(:show_zoom_button_on_article_images)
1259		- stylesheet_link_tag('fancybox') +
1260		- javascript_include_tag('jquery.fancybox-1.3.4.pack') +
1261		- javascript_tag("jQuery(function($) {
1262		- $(window).load( function() {
1263		- $('#article .article-body img').each( function(index) {
1264		- var original = original_image_dimensions($(this).attr('src'));
1265		- if ($(this).width() < original['width'] \|\| $(this).height() < original['height']) {
1266		- $(this).wrap('<div class=\"zoomable-image\" />');
1267		- $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
1268		- $(this).attr('style', '');
1269		- $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
1270		- }
1271		- });
1272		- $('.zoomify-image').fancybox();
	1262	+ stylesheet_link_tag('fancybox') +
	1263	+ javascript_include_tag('jquery.fancybox-1.3.4.pack') +
	1264	+ javascript_tag("jQuery(function($) {
	1265	+ $(window).load( function() {
	1266	+ $('#article .article-body img').each( function(index) {
	1267	+ var original = original_image_dimensions($(this).attr('src'));
	1268	+ if ($(this).width() < original['width'] \|\| $(this).height() < original['height']) {
	1269	+ $(this).wrap('<div class=\"zoomable-image\" />');
	1270	+ $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
	1271	+ $(this).attr('style', '');
	1272	+ $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
	1273	+ }
1273	1274	});
1274		- });" % _('Zoom in'))
1275		- end
	1275	+ $('.zoomify-image').fancybox();
	1276	+ });
	1277	+ });" % _('Zoom in'))
1276	1278	end
1277	1279
1278	1280	def render_dialog_error_messages(instance_name)
...	...
1	1	module CatalogHelper
2	2
3		-include DisplayHelper
4		-include ManageProductsHelper
	3	+ include DisplayHelper
	4	+ include ManageProductsHelper
5	5
6		- def display_products_list(profile, products)
7		- data = ''
8		- extra_content = []
9		- extra_content_list = []
10		- products.each { \|product\|
11		- extra_content = @plugins.map(:catalog_item_extras, product).collect { \|content\| instance_eval(&content) } if @plugins
12		- extra_content_list = @plugins.map(:catalog_list_item_extras, product).collect { \|content\| instance_eval(&content) } if @plugins
13		- data << content_tag('li',
14		- link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) +
15		- content_tag('h3', link_to_product(product)) +
16		- content_tag('ul',
17		- (product.price ? content_tag('li', _('Price: %s') % ( "%.2f" % product.price), :class => 'product_price') : '') +
18		- content_tag('li', product_category_name(profile, product.product_category), :class => 'product_category') +
19		- extra_content_list.map { \|content\| content_tag('li', content)}.join("\n")
20		- ) +
21		- (product.description ? content_tag('div',
22		- txt2html(product.description),
23		- :class => 'description') : tag('br',
24		- :style => 'clear:both')) +
25		- extra_content.join("\n"),
26		- :class => 'product')
27		- }
28		- content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
29		- end
30		-
31		- private
32		-
33		- def product_category_name(profile, product_category)
34		- if profile.enabled?
35		- link_to_product_category(product_category)
36		- else
37		- product_category ? product_category.full_name(' → ') : _('Uncategorized product')
38		- end
39		- end
40	6	end
...	...
...	...	@@ -8,6 +8,20 @@ module DisplayHelper
8	8	opts
9	9	end
10	10
	11	+ def image_link_to_product(product, opts={})
	12	+ return _('No product') unless product
	13	+ target = product_path(product)
	14	+ link_to image_tag(product.default_image(:big), :alt => product.name),
	15	+ target,
	16	+ opts
	17	+ end
	18	+
	19	+ def price_span(price, options = {})
	20	+ content_tag 'span',
	21	+ number_to_currency(price, :unit => environment.currency_unit, :delimiter => environment.currency_delimiter, :separator => environment.currency_separator),
	22	+ options
	23	+ end
	24	+
11	25	def product_path(product)
12	26	product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
13	27	end
...	...
...	...	@@ -271,4 +271,23 @@ module ManageProductsHelper
271	271	return input_amount_used if input.unit.blank?
272	272	n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', input.unit.singular, :class => 'input-unit'), :plural_unit => content_tag('span', input.unit.plural, :class => 'input-unit') }
273	273	end
	274	+
	275	+ def select_production_cost(product,selected=nil)
	276	+ url = url_for( :controller => 'manage_products', :action => 'create_production_cost' )
	277	+ prompt_msg = _('Insert the name of the new cost:')
	278	+ error_msg = _('Something went wrong. Please, try again')
	279	+ select_tag('price_details[][production_cost_id]',
	280	+ '<option value="" disabled="disabled">' + _('Select...') + '</option>' +
	281	+ options_for_select(product.available_production_costs.map {\|item\| [truncate(item.name, 10, '...'), item.id]} + [[_('Other cost'), '']], selected),
	282	+ {:class => 'production-cost-selection',
	283	+ :onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
	284	+ end
	285	+
	286	+ def price_composition_progressbar_text(product, args = {})
	287	+ currency = environment.currency_unit
	288	+ production_cost = args[:production_cost_value] \|\| product.formatted_value(:total_production_cost)
	289	+ product_price = args[:product_price] \|\| product.formatted_value(:price)
	290	+
	291	+ _("%{currency} %{production_cost} of %{currency} %{product_price}") % {:currency => currency, :production_cost => content_tag('span', production_cost, :class => 'production_cost'), :product_price => content_tag('span', product_price, :class => 'product_price')}
	292	+ end
274	293	end
...	...
...	...	@@ -6,6 +6,7 @@ class Enterprise < Organization
6	6
7	7	has_many :products, :dependent => :destroy, :order => 'name ASC'
8	8	has_many :inputs, :through => :products
	9	+ has_many :production_costs, :as => :owner
9	10
10	11	has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
11	12
...	...
...	...	@@ -12,18 +12,13 @@ class EnterpriseHomepage < Article
12	12	profile.nil? ? _('Homepage') : profile.name
13	13	end
14	14
15		- # FIXME isn't this too much including just to be able to generate some HTML?
16		- include ActionView::Helpers::TagHelper
17		- include ActionView::Helpers::UrlHelper
18		- include ActionController::UrlWriter
19		- include ActionView::Helpers::AssetTagHelper
20		- include EnterpriseHomepageHelper
21		- include CatalogHelper
22		-
23		- def to_html(options ={})
24		- products = self.profile.products
25		- display_profile_info(self.profile) + content_tag('div', self.body \|\| '') +
26		- (self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))
	15	+ def to_html(options = {})
	16	+ enterprise_homepage = self
	17	+ lambda do
	18	+ extend EnterpriseHomepageHelper
	19	+ @products = profile.products.paginate(:order => 'id asc', :per_page => 9, :page => 1)
	20	+ render :partial => 'content_viewer/enterprise_homepage', :object => enterprise_homepage
	21	+ end
27	22	end
28	23
29	24	def can_display_hits?
...	...
...	...	@@ -174,6 +174,7 @@ class Environment < ActiveRecord::Base
174	174	acts_as_accessible
175	175
176	176	has_many :units, :order => 'position'
	177	+ has_many :production_costs, :as => :owner
177	178
178	179	def superior_intances
179	180	[self, nil]
...	...
...	...	@@ -9,15 +9,15 @@ class Image < ActiveRecord::Base
9	9	has_attachment :content_type => :image,
10	10	:storage => :file_system,
11	11	:path_prefix => 'public/image_uploads',
12		- :resize_to => '320x200>',
	12	+ :resize_to => '800x600>',
13	13	:thumbnails => { :big => '150x150',
14	14	:thumb => '100x100',
15	15	:portrait => '64x64',
16	16	:minor => '50x50',
17	17	:icon => '20x20!' },
18		- :max_size => 500.kilobytes # remember to update validate message below
	18	+ :max_size => 5.megabytes # remember to update validate message below
19	19
20		- validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 500.0 KB")
	20	+ validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB")
21	21
22	22	delay_attachment_fu_thumbnails
23	23
...	...