Enhancing edition of product

Fixing categories selection and fixing width of sideboxes in leftbar and rightbar templates Added themes to jquery-ui (ActionItem1392)

Enhancing edition of product
Fixing categories selection and fixing width of sideboxes in leftbar and rightbar templates Added themes to jquery-ui (ActionItem1392)
Daniela Feitosa · Joenio Costa
1 parent 2836c18c
Showing 88 changed files with 2905 additions and 196 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/certifier.rb
app/models/environment.rb
app/models/product.rb
app/models/product_qualifier.rb
app/models/products_block.rb
app/models/profile.rb
app/models/qualifier.rb
app/views/catalog/show.rhtml
app/views/cms/_upload_file_form.rhtml
app/views/layouts/_javascript.rhtml
app/views/layouts/application.rhtml
app/views/manage_products/_display_category.rhtml
app/views/manage_products/_display_image.rhtml
app/views/manage_products/_display_info.rhtml
 class ManageProductsController < ApplicationController
   needs_profile
-  protect 'manage_products', :profile
+  protect 'manage_products', :profile, :except => [:show]
   before_filter :check_environment_feature
+  before_filter :login_required, :except => [:show]
   protected  
+
   def check_environment_feature
     if profile.environment.enabled?('disable_products_for_enterprises')
       render_not_found
@@ -13,6 +15,7 @@ class ManageProductsController &lt; ApplicationController
   end
   public
+
   def index
     @products = @profile.products
     @consumptions = @profile.consumptions
@@ -51,15 +54,34 @@ class ManageProductsController &lt; ApplicationController
   end
   def edit
-    @object = @product = @profile.products.find(params[:id])
-    @current_category = @product.product_category
-    @categories = @current_category.nil? ? [] : @current_category.children
+    @product = @profile.products.find(params[:id])
+    field = params[:field]
     if request.post?
-      if @product.update_attributes(params[:product])
-        flash[:notice] = _('Product succesfully updated')
-        redirect_back_or_default :action => 'show', :id => @product
-      else
+      begin
+        @product.update_attributes!(params[:product])
+        render :partial => "display_#{field}", :locals => {:product => @product}
+      rescue Exception => e
+        render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
+      end
+    else
+      render :partial => "edit_#{field}", :locals => {:product => @product, :errors => false}
+    end
+  end
+
+  def edit_category
+    @product = @profile.products.find(params[:id])
+    @category = @product.product_category
+    @categories = ProductCategory.top_level_for(environment)
+    @edit = true
+    @level = @category.level
+    if request.post?
+      begin
+        @product.update_attributes!(params[:product])
+        render :partial => 'shared/redirect_via_javascript',
+          :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
+      rescue Exception => e
         flash[:notice] = _('Could not update the product')
+        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
       end
     end
   end
 class CatalogController < PublicController
   needs_profile
+
   before_filter :check_enterprise_and_environment
   def index
     @products = @profile.products
   end
-  def show
-    @product = @profile.products.find(params[:id])
-  end
-  
   protected
   def check_enterprise_and_environment
     unless @profile.kind_of?(Enterprise) && !@profile.environment.enabled?('disable_products_for_enterprises')
@@ -907,7 +907,7 @@ module ApplicationHelper
     (@section ? @section.title + ' - ' : '') +
     (@toc ? _('Online Manual') + ' - ' : '') +
     environment.name +
-    (@category ? "&rarr; #{@category.full_name}" : '')
+    (@category ? " - #{@category.full_name}" : '')
   end
   def noosfero_javascript
@@ -921,6 +921,7 @@ module ApplicationHelper
       'lightbox',
       'colorpicker',
       pngfix_stylesheet_path,
+      'jquery.ui/sunny/jquery-ui-1.8.2.custom',
     ]
   end
@@ -960,13 +961,16 @@ module ApplicationHelper
     text_field_tag(name, value, options.merge(:class => 'colorpicker_field'))
   end
-  # for now force currency to Brazillian format, like: "12.345,20"
-  def float_to_currency(price)
-    number_to_currency(price, :unit => 'R$', :separator => ',', :delimiter => '.')
-  end
-
   def ui_icon(icon_type)
     "<span class='ui-icon ui-icon-#{icon_type}' style='float:left; margin-right:7px;'></span>"
   end
+  def ui_button(label, url, html_options = {})
+    link_to(label, url, html_options.merge(:class => 'ui_button fg-button'))
+  end
+
+  def ui_button_to_remote(label, options, html_options = {})
+    link_to_remote(label, options, html_options.merge(:class => 'ui_button fg-button'))
+  end
+
 end
 module CatalogHelper
 include DisplayHelper
+include ManageProductsHelper
   def display_products_list(profile, products)
     data = ''
@@ -19,7 +20,7 @@ include DisplayHelper
     content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
   end
-private
+  private
   def product_category_name(profile, product_category)
     if profile.enabled?
@@ -2,7 +2,7 @@ module DisplayHelper
   def link_to_product(product, opts={})
     return _('No product') unless product
-    target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
+    target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
     link_to content_tag( 'span', product.name ),
             target,
             opts
@@ -49,12 +49,52 @@ module ManageProductsHelper
     hierarchy.reverse.join(options[:separator] || ' &rarr; ')
   end
-  def options_for_select_categories(categories)
+  def options_for_select_categories(categories, selected = nil)
     categories.sort_by{|cat| cat.name.transliterate}.map do |category|
-      "<option value='#{category.id}'>#{category.name + (category.leaf? ? '': ' &raquo;')}</option>"
+      selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
+      "<option value='#{category.id}' #{selected_attribute}>#{category.name + (category.leaf? ? '': ' &raquo;')}</option>"
     end.join("\n")
   end
+  def build_selects_for_ancestors(ancestors, last_level)
+    current_category = ancestors.shift
+    if current_category.nil?
+      content_tag('div', '<!-- no categories -->',
+        :class => 'categories_container',
+        :id => "categories_container_level#{ last_level }"
+      )
+    else
+      content_tag('div',
+        select_tag('category_id',
+          options_for_select_categories(current_category.siblings + [current_category], current_category),
+          :size => 10,
+          :onchange => remote_function_to_update_categories_selection("categories_container_level#{ current_category.level + 1 }", :with => "'category_id=' + this.value")
+        ) +
+        build_selects_for_ancestors(ancestors, last_level),
+        :class => 'categories_container',
+        :id => "categories_container_level#{ current_category.level }"
+      )
+    end
+  end
+
+  def selects_for_all_ancestors(current_category)
+    build_selects_for_ancestors(current_category.ancestors.reverse + [current_category], current_category.level + 1)
+  end
+
+  def select_for_new_category
+    content_tag('div',
+      render(:partial => 'categories_for_selection'),
+      :class => 'categories_container',
+      :id => 'categories_container_level0'
+    )
+  end
+
+  def categories_container(field_id_html, categories_selection_html, hierarchy_html = '')
+    field_id_html +
+    content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
+    content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
+  end
+
   def select_for_categories(categories, level = 0)
     if categories.empty?
       content_tag('div', '', :id => 'no_subcategories')
@@ -68,4 +108,98 @@ module ManageProductsHelper
     end
   end
+  def edit_product_link(product, field, label, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    options = html_options.merge(:id => 'link-edit-product-' + field)
+
+    link_to_remote(label,
+                   {:update => "product-#{field}",
+                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
+                   :method => :get},
+                   options)
+  end
+
+  def edit_product_button(product, field, label, html_options = {})
+    the_class = 'button with-text icon-edit'
+    if html_options.has_key?(:class)
+     the_class << ' ' << html_options[:class]
+    end
+    edit_product_link(product, field, label, html_options.merge(:class => the_class))
+  end
+
+  def edit_product_ui_button(product, field, label, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    options = html_options.merge(:id => 'edit-product-button-ui-' + field)
+
+    ui_button_to_remote(label,
+                   {:update => "product-#{field}",
+                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
+                   :complete => "$('edit-product-button-ui-#{field}').hide()",
+                   :method => :get},
+                   options)
+  end
+
+  def cancel_edit_product_link(product, field, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    button_to_function(:cancel, _('Cancel'), nil, html_options) do |page|
+      page.replace_html "product-#{field}", :partial => "display_#{field}", :locals => {:product => product}
+    end
+  end
+
+  def edit_product_category_link(product, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    options = html_options.merge(:id => 'link-edit-product-category')
+    link_to(_('Change category'), { :action => 'edit_category', :id => product.id}, options)
+  end
+
+  def float_to_currency(value)
+    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
+  end
+
+  def display_value(product)
+    price = product.price
+    unless price.blank? || price.zero?
+      unit = product.unit
+      return '' if unit.blank?
+      discount = product.discount
+      if discount.blank? || discount.zero?
+        display_price(_('Price: '), price, unit)
+      else
+        display_price_with_discount(price, unit, product.price_with_discount)
+      end
+    else
+      ''
+    end
+  end
+
+  def display_price(label, price, unit)
+    content_tag('span', label, :class => 'field-name') +
+    content_tag('span', float_to_currency(price), :class => 'field-value') +
+    ' (%s)' % unit
+  end
+
+  def display_price_with_discount(price, unit, price_with_discount)
+    original_value = content_tag('span', float_to_currency(price), :class => 'field-value')
+    discount_value = display_price(_('On sale: '), price_with_discount, unit)
+    content_tag('span', _('List price: '), :class => 'field-name') + original_value + "<p/>" + discount_value
+  end
+
+  def display_qualifiers(product)
+    data = ''
+    product.product_qualifiers.each do |pq|
+      certified_by = pq.certifier ? _(' certified by %s') % link_to(pq.certifier.name, pq.certifier.link) : ''
+      data << content_tag('li', '✔ ' + pq.qualifier.name + certified_by, :class => 'product-qualifiers-item')
+    end
+    content_tag('ul', data, :id => 'product-qualifiers')
+  end
+
+  def checkboxes_qualifiers(product, qualifier)
+    check_box_tag("product[qualifiers_list][#{qualifier.id}][qualifier_id]", qualifier.id, product.qualifiers.include?(qualifier)) + qualifier.name
+  end
+
+  def select_certifiers(product, qualifier, certifiers)
+    relation = product.product_qualifiers.find(:first, :conditions => {:qualifier_id => qualifier.id})
+    selected = relation.nil? ? 0 : relation.certifier_id
+    select_tag("product[qualifiers_list][#{qualifier.id}][certifier_id]", options_for_select([[_('Select...') , 0 ]] + certifiers.map {|c|[c.name, c.id]}, selected))
+  end
 end
@@ -0,0 +1,8 @@
+class Certifier < ActiveRecord::Base
+
+  belongs_to :environment
+
+  def link
+    self[:link] || ''
+  end
+end
@@ -152,6 +152,9 @@ class Environment &lt; ActiveRecord::Base
   has_many :roles
+  has_many :qualifiers
+  has_many :certifiers
+
   acts_as_accessible
   def superior_intances
@@ -209,6 +212,10 @@ class Environment &lt; ActiveRecord::Base
   settings_items :help_message_to_add_enterprise, :type => String, :default => ''
   settings_items :tip_message_enterprise_activation_question, :type => String, :default => ''
+  settings_items :currency_unit, :type => String, :default => '$'
+  settings_items :currency_separator, :type => String, :default => '.'
+  settings_items :currency_delimiter, :type => String, :default => ','
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -2,10 +2,14 @@ class Product &lt; ActiveRecord::Base
   belongs_to :enterprise
   belongs_to :product_category
   has_many :product_categorizations
+  has_many :product_qualifiers
+  has_many :qualifiers, :through => :product_qualifiers
   validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
   validates_presence_of :product_category
+
   validates_numericality_of :price, :allow_nil => true
+  validates_numericality_of :discount, :allow_nil => true
   after_update :save_image
@@ -31,10 +35,36 @@ class Product &lt; ActiveRecord::Base
   acts_as_searchable :fields => [ :name, :description, :category_full_name ]
-  xss_terminate :only => [ :name, :description ], :on => 'validation'
+  xss_terminate :only => [ :name ], :on => 'validation'
+  xss_terminate :only => [ :description ], :with => 'white_list', :on => 'validation'
   acts_as_mappable
-  
+
+  def self.units
+    {
+      _('Litre') => 'litre',
+      _('Kilo')  => 'kilo',
+      _('Meter') => 'meter',
+      _('Unit')  => 'unit',
+    }
+  end
+
+  def name
+    self[:name].blank? ? category_name : self[:name]
+  end
+
+  def name=(value)
+    if (value == category_name)
+      self[:name] = nil
+    else
+      self[:name] = value
+    end
+  end
+
+  def default_image(size='thumb')
+    '/images/icons-app/product-default-pic-%s.png' % size
+  end
+
   def category_full_name
     product_category ? product_category.full_name.split('/') : nil
   end
@@ -60,13 +90,21 @@ class Product &lt; ActiveRecord::Base
   end
   def url
-    enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => id)
+    enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
   end
   def public?
     enterprise.public_profile
   end
+  def formatted_value(value)
+    ("%.2f" % self[value]).to_s.gsub('.', enterprise.environment.currency_separator) if self[value]
+  end
+
+  def price_with_discount
+    price - discount if discount
+  end
+
   def price=(value)
     if value.is_a?(String)
       super(currency_to_float(value))
@@ -75,6 +113,14 @@ class Product &lt; ActiveRecord::Base
     end
   end
+  def discount=(value)
+    if value.is_a?(String)
+      super(currency_to_float(value))
+    else
+      super(value)
+    end
+  end
+
   def currency_to_float( num )
     if num.count('.') == 1 && num.count(',') == 0
       # number like "12.34"
@@ -99,4 +145,17 @@ class Product &lt; ActiveRecord::Base
     return num.tr(',.','').to_f
   end
+  def has_basic_info?
+    %w[description price].each do |field|
+      return true if !self.send(field).blank?
+    end
+    false
+  end
+
+  def qualifiers_list=(qualifiers)
+    self.product_qualifiers.delete_all
+    qualifiers.each do |item|
+      self.product_qualifiers.create(item[1]) if item[1].has_key?('qualifier_id')
+    end
+  end
 end
@@ -0,0 +1,5 @@
+class ProductQualifier < ActiveRecord::Base
+  belongs_to :qualifier
+  belongs_to :product
+  belongs_to :certifier
+end
@@ -20,7 +20,7 @@ class ProductsBlock &lt; Block
     block_title(title) +
     content_tag(
       'ul',
-      products.map {|product| content_tag('li', link_to(product.name, product.url, :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:minor) : '/images/icons-app/product-default-pic-minor.png' )), :class => 'product' )}
+      products.map {|product| content_tag('li', link_to(product.name, product.url, :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:minor) : product.default_image('minor'))), :class => 'product' )}
     )
   end
@@ -386,7 +386,7 @@ class Profile &lt; ActiveRecord::Base
   def url_options
     options = { :host => default_hostname, :profile => (own_hostname ? nil : self.identifier) }
-    Noosfero.url_options.merge(options)
+    options.merge(Noosfero.url_options.merge(options))
   end
 private :generate_url, :url_options
@@ -0,0 +1,5 @@
+class Qualifier < ActiveRecord::Base
+
+  belongs_to :environment
+
+end
@@ -1,25 +0,0 @@
-<div id="show_product">
-
-<h1> <%= @product.name %> </h1>
-
-<%= image_tag @product.image.public_filename, :class => 'product-pic' if @product.image %>
-
-<div class="product_description">
-<%= txt2html @product.description  if @product.description %>
-</div>
-
-<% if @product.price %>
-  <p class="product_price">
-  <%= _('Price: %s') % ( "<strong>%.2f</strong>" % @product.price) %>
-  </p>
-<% end %>
-
-<p class="product_category">
-<%= _('Category: %s ') % link_to_product_category(@product.product_category) %>
-</p>
-
-<% button_bar do %>
-  <%= button :back, _("%s's products/services listing") % profile.name, :action => 'index', :id => nil %>
-<% end %>
-
-</div>
@@ -11,7 +11,7 @@
   <% end %>
 </div>
-<%= hidden_field_tag('back_to', @back_to) if @back_to %>
+<%= hidden_field_tag('back_to', @back_to) %>
 <% button_bar do %>
   <%= add_upload_file_field(_('More files'), {:size => size}) %>
-<%= 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', 'colorpicker', 'colorpicker-noosfero', 'reflection', :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', 'colorpicker', 'colorpicker-noosfero', 'reflection', :cache => 'cache-general' %>
@@ -15,7 +15,6 @@
     <%=
       # Load the principal css files:
       stylesheet_link_tag(noosfero_stylesheets, :cache => 'cache') +
-      stylesheet_link_tag('jquery.ui/smoothness/jquery-ui-1.8.2.custom') +
       stylesheet_import( %w( common help menu article button search blocks forms login-box ),
                          :themed_source => true ) + "\n" +
       import_blocks_stylesheets(:themed_source => true) + "\n" +
@@ -126,5 +125,10 @@
     app/views/shared/noosfero_layout_features.rhtml! %>
     <%= noosfero_layout_features %>
+    <script type='text/javascript'>
+       // transform all element with class ui_button in a jQuery UI button
+       render_jquery_ui_buttons()
+    </script>
+
   </body>
 </html>
@@ -0,0 +1,4 @@
+<div id='display-product-category'>
+  <p><%= hierarchy_category_navigation(@product.product_category, :make_links => false)%></p>
+  <%= edit_product_category_link(@product) %>
+</div>
@@ -0,0 +1,5 @@
+<div id='display-product-image'>
+  <%= image_tag (@product.reload.image ? @product.image.public_filename : @product.default_image('thumb')), :class => 'product-pic' %>
+</div>
+
+<%= edit_product_link(@product, 'image', _('Change image')) %>
@@ -0,0 +1,14 @@
+<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
+<div id='display-product-info'>
+  <%= display_value(@product) %>
+  <%= display_qualifiers(@product) %>
+</div>
+
+<div id='display-product-description'><%= @product.description %></div>
+
+<% if @product.has_basic_info? %>
+  <%= edit_product_button(@product, 'info', _('Edit basic information')) %>
+<% else %>
+    <%= edit_product_ui_button(@product, 'info', _('Add description, price and other basic information'), :title => _('Click here to add description, price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers'), 'data-primary-icon' => 'ui-icon-pencil', 'data-secondary-icon' => 'ui-icon-triangle-1-s') %>
+    <%= javascript_tag("render_jquery_ui_buttons('edit-product-button-ui-info')") %>
+<% end%>
@@ -0,0 +1,5 @@
+<div id='display-product-name'>
+  <h2><%= @product.reload.name %></h2>
+  <%= edit_product_link(@product, 'name', _('Edit name')) %>
+</div>
+
@@ -0,0 +1,27 @@
+<div id='display-product-image'>
+  <%= image_tag (@product.reload.image ? @product.image.public_filename : @product.default_image('thumb')), :class => 'product-pic' %>
+</div>
+
+<% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
+  <% f.fields_for :image_builder, @product.image do |i| %>
+    <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
+    <p><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %></p>
+  <% end %>
+
+  <%= submit_button 'save', _('Save') %>
+  <%= cancel_edit_product_link(@product, 'image') %>
+<% end %>
+
+<script type="text/javascript">
+  jQuery("#uploadForm").ajaxForm({
+    beforeSubmit: function(a,f,o) {
+      o.loading = open_loading('<%= _('loading... ') %>');
+      o.loaded = close_loading();
+    },
+    target: '#product-image'
+  });
+</script>
+
+<% if errors %>
+  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+<% end %>
@@ -0,0 +1,49 @@
+<% if errors %>
+  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+<% end %>
+
+<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
+<% remote_form_for(@product,
+                   :loading => "open_loading('#{ _('loading...') }')",
+                   :loaded => 'close_loading()',
+                   :before => ("tinyMCE.triggerSave()" unless Rails.env == 'test'),
+                   :update => 'product-info',
+                   :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
+                   :html => {:id => 'product-info-form', :method => 'post'}) do |f| %>
+  <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;')) %>
+  <%= labelled_form_field(_('Price (%s):') % environment.currency_unit, f.text_field(:price, :value => @product.formatted_value(:price), :onKeyPress => "return numbersonly(event, '#{environment.currency_separator}');")) %>
+  <%= labelled_form_field(_('Unit:'), f.select(:unit, Product.units)) %>
+  <%= labelled_form_field(_('Discount (%s):') % environment.currency_unit, f.text_field(:discount, :value => @product.formatted_value(:discount), :onKeyPress => "return numbersonly(event, '#{environment.currency_separator}');")) %>
+  <div class='formlabel'><%= _('Available:') %></div>
+  <div class='formfield'>
+    <%= labelled_radio_button( _('Yes'), 'product[available]', 'true', @product.available) %>
+    <%= labelled_radio_button( _('No'), 'product[available]', 'false', !@product.available) %>
+  </div>
+
+
+  <% if !environment.qualifiers.empty? %>
+    <table id='product-qualifiers-list'>
+      <tr>
+        <th><%= _('Qualifier') %></th>
+        <th><%= _('Certifier') %></th>
+      </tr>
+      <% environment.qualifiers.each do |qualifier| %>
+        <tr>
+          <td>
+            <%= checkboxes_qualifiers(@product, qualifier) %>
+          </td>
+          <td>
+            <%= select_certifiers(@product, qualifier, environment.certifiers) %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save') %>
+    <%= cancel_edit_product_link(@product, 'info') %>
+  <% end %>
+<% end %>
+
+<br style='clear:both'>
@@ -0,0 +1,21 @@
+<% remote_form_for(@product,
+                   :loading => "open_loading('#{ _('loading...') }')",
+                   :loaded => 'close_loading()',
+                   :update => 'product-name',
+                   :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
+                   :html => {:method => 'post'}) do |f| %>
+                     <%= f.text_field(:name, :value => @product.name, :class => 'name_edition') %>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save') %>
+    <%= cancel_edit_product_link(@product, 'name') %>
+  <% end %>
+<% end %>
+
+<script type="text/javascript">
+  jQuery('#product_name').focus().select();
+</script>
+
+<% if errors %>
+  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+<% end %>
@@ -0,0 +1,34 @@
+<div class=product-category-hierarchy>
+  <%= hierarchy_category_navigation(@product.product_category, :make_links => false)%>
+</div>
+
+<div id="category-product-edition">
+
+  <h2><%= @product.name %></h2>
+
+  <div id='request_result_message' style='display: none'></div>
+
+  <% remote_form_for(:product, @product,
+                     :loading => "open_loading('#{ _('loading...') }')",
+                     :loaded => "close_loading()",
+                     :update => "request_result_message",
+                     :url => {:action => 'edit_category', :id => @product, :field => 'category'},
+                     :html => {:method => 'post', :id => 'product_category_form'}) do |f| %>
+
+    <h3><%= _('Edit category of this product:') %></h3>
+
+    <%= categories_container(f.hidden_field('product_category_id'), selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
+
+    <div id='categories_selection_actionbar'>
+      <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
+      <span id='save_and_continue_wrapper'>
+        <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
+        <span class='tooltip' id='save_and_continue_disabled_tooltip'>
+           <%= ui_icon(:alert) %>
+           <%= _('This category does not allow registration of products, select a more specific category') %>
+        </span>
+      </span>
+    </div>
+
+  <% end %>
+</div>
@@ -16,7 +16,6 @@
       <td><strong><%= link_to product.name, :action => 'show', :id => product %></strong></td>
       <td><%= product.price %></td>
       <td>
-        <%= button :edit, _('Edit'), :action => 'edit', :id => product %>
         <%= button :delete, _('Destroy'), :action => 'destroy', :id => product %>
       </td>
     </tr>
@@ -6,19 +6,11 @@
    :loading => "open_loading('#{ _('loading...') }')",
    :update => "request_result_message",
    :url => {:action => 'new'},
-   :html => {:method => 'post', :id => 'new_product_form'} do |f| %>
+   :html => {:method => 'post', :id => 'product_category_form'} do |f| %>
   <h3><%= _('Select the category of the new product or service') %></h3>
-  <%= f.hidden_field 'product_category_id' %>
-
-  <div id='hierarchy_navigation'> </div>
-
-  <div id='categories_container_wrapper'>
-    <div class='categories_container' id='categories_container_level0'>
-       <%= render :partial => 'categories_for_selection' %>
-    </div>
-  </div>
+  <%= categories_container(f.hidden_field('product_category_id'), select_for_new_category) %>
   <div id='categories_selection_actionbar'>
     <%= button :back, _('Back to the product listing'), :action => 'index' %>
-<h3> <%= @product.name %> </h3>
+<div id="product-category">
+  <%= render :partial => 'manage_products/display_category', :locals => {:product => @product} %>
+</div>
-<p> <%= image_tag @product.image.public_filename if @product.image %> </p>
-<p> <strong><%= _('Price:') %></strong> <%= @product.price %> </p>
-<p> <strong><%= _('Description:') %></strong> <%= txt2html @product.description  if @product.description %> </p>
-<p> <strong><%= _('Category:') %></strong> <%= link_to_product_category(@product.product_category) %> </p>
+<div id="show_product">
-<%= button :back, _('Back'), :action => 'index' %>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-<%= button :delete, _('Destroy'), :action => 'destroy', :id => @product %>
-<%= button :edit, _('Edit'), :action => 'edit', :id => @product %>
+  <div id='product-name'>
+    <%= render :partial => 'manage_products/display_name', :locals => {:product => @product} %>
+  </div>
+  <div id='product-details'>
+    <div id='product-image'>
+      <%= render :partial => 'manage_products/display_image', :locals => {:product => @product} %>
+    </div>
+
+    <div id='product-info'>
+      <%= render :partial => 'manage_products/display_info', :locals => {:product => @product} %>
+    </div>
+
+  </div>
+</div>
+
+<% button_bar do %>
+  <%= button :back, _('Back to the product listing'), :action => 'index' %>
+  <%= button :delete, _('Remove product or service'), {:action => 'destroy', :id => @product}, :class => 'requires-permission-manage_products', :style => 'display:none;' %>
+<% end %>
-<%= error_messages_for object_name %>
-
 <% javascript_tag do %>
   close_loading()
   jQuery('#errorExplanation h2').hide()
@@ -11,3 +9,4 @@
      title: "<%= ui_icon(:alert) %>Ops…",
   });
 <% end %>
+<%= error_messages_for object_name %>
 <%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
 <script type="text/javascript">
   var myplugins = "searchreplace,print,table";
+  var first_line, second_line;
+  var mode = '<%= mode ||= false %>'
+  <% if mode %>
+    first_line = "fontsizeselect,bold,italic,underline,bullist,numlist,justifyleft,justifycenter,justifyright,link,unlink"
+    second_line = ""
+  <% else %>
+    first_line = "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,fontsizeselect,formatselect"
+    second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code"
+  <% end %>
+
   if (tinymce.isIE) {
     // the paste plugin is only useful in Internet Explorer
     myplugins = "paste," + myplugins;
@@ -14,8 +24,8 @@ tinyMCE.init({
         plugins: myplugins,
         theme_advanced_toolbar_location : "top",
         theme_advanced_layout_manager: 'SimpleLayout',
-        theme_advanced_buttons1 : "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,fontsizeselect,formatselect",
-        theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code",
+        theme_advanced_buttons1 : first_line,
+        theme_advanced_buttons2 : second_line,
         theme_advanced_buttons3 : "",
         theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
         paste_auto_cleanup_on_paste : true,
@@ -60,7 +60,6 @@ ActionController::Routing::Routes.draw do |map|
   # catalog
   map.catalog 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/
-  map.product 'catalog/:profile/:id', :controller => 'catalog', :action => 'show', :profile => /#{Noosfero.identifier_format}/
   # invite
   map.invite 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
@@ -0,0 +1,13 @@
+class AddColumnsToProducts < ActiveRecord::Migration
+  def self.up
+    add_column :products, :unit, :string
+    add_column :products, :discount, :float
+    add_column :products, :available, :boolean
+  end
+
+  def self.down
+    remove_column :products, :unit
+    remove_column :products, :discount
+    remove_column :products, :available
+  end
+end
@@ -0,0 +1,14 @@
+class CreateProductQualifiers < ActiveRecord::Migration
+  def self.up
+    create_table :product_qualifiers do |t|
+      t.references :product
+      t.references :qualifier
+      t.references :certifier
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :product_qualifiers
+  end
+end
@@ -0,0 +1,14 @@
+class CreateQualifiers < ActiveRecord::Migration
+  def self.up
+    create_table :qualifiers do |t|
+      t.string :name
+      t.references :environment
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :qualifiers
+  end
+end
@@ -0,0 +1,16 @@
+class CreateCertifiers < ActiveRecord::Migration
+  def self.up
+    create_table :certifiers do |t|
+      t.string :name
+      t.string :description
+      t.string :link
+      t.references :environment
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :certifiers
+  end
+end
@@ -141,6 +141,15 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do
   add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
   add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
+  create_table "certifiers", :force => true do |t|
+    t.string   "name"
+    t.string   "description"
+    t.string   "link"
+    t.integer  "environment_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -230,6 +239,14 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do
   add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
   add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
+  create_table "product_qualifiers", :force => true do |t|
+    t.integer  "product_id"
+    t.integer  "qualifier_id"
+    t.integer  "certifier_id"
+    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"
@@ -241,6 +258,9 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do
     t.datetime "updated_at"
     t.float    "lat"
     t.float    "lng"
+    t.string   "unit"
+    t.float    "discount"
+    t.boolean  "available"
     t.boolean  "highlighted"
   end
@@ -276,6 +296,13 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  create_table "qualifiers", :force => true do |t|
+    t.string   "name"
+    t.integer  "environment_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "refused_join_community", :id => false, :force => true do |t|
     t.integer "person_id"
     t.integer "community_id"
@@ -10,18 +10,28 @@ Feature: manage products
       | identifier | owner | name | enabled |
       | redemoinho | joaosilva | Rede Moinho | true |
     And feature "disable_products_for_enterprises" is disabled on environment
-    And I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
   Scenario: listing products and services
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     Then I should see "Listing products and services"
+  Scenario: see button to back in categories hierarchy
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
+    When I follow "New product or service"
+    Then I should see "Back to the product listing" link
+
   Scenario: see toplevel categories
     Given the following product_categories
       | name |
       | Products |
       | Services |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     Then I should see "Products"
     And I should see "Service"
@@ -35,6 +45,9 @@ Feature: manage products
       | name | parent |
       | Computers level1 | products-level0 |
       | DVDs level1 | products-level0 |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Products level0 »"
     Then I should see "Computers level1"
@@ -50,6 +63,9 @@ Feature: manage products
       | name | parent |
       | Computers level1 | products-level0 |
       | Software development level1 | services-level0 |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Products level0 »"
     And I select "Computers level1"
@@ -65,6 +81,9 @@ Feature: manage products
     And the following product_category
       | name | parent |
       | Computers | products |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Products »"
     And I select "Computers"
@@ -78,6 +97,9 @@ Feature: manage products
     Given the following product_category
       | name | parent |
       | Category Level 1 | toplevel-product-categories |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Toplevel Product Categories »"
     And I select "Category Level 1"
@@ -89,6 +111,7 @@ Feature: manage products
     Given the following product_category
       | name |
       | Only for test |
+    And I am logged in as "joaosilva"
     When I go to /myprofile/redemoinho/manage_products/new
     Then the "#save_and_continue" button should not be enabled
@@ -97,6 +120,9 @@ Feature: manage products
     Given the following product_category
       | name |
       | Browsers (accept categories) |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Browsers (accept categories)"
     Then the "Save and continue" button should be enabled
@@ -106,6 +132,9 @@ Feature: manage products
     Given the following product_category
       | name | accept_products |
       | Browsers | false |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Browsers"
     Then the "#save_and_continue" button should not be enabled
@@ -115,16 +144,23 @@ Feature: manage products
     Given the following product_category
       | name |
       | Bicycle |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     When I follow "New product or service"
     And I select "Bicycle"
     And I press "Save and continue"
-    Then I should see "Category: Bicycle"
+    Then I should see "Bicycle"
+    And I should see "Change category"
   @selenium
   Scenario: stay on the same place after error on save
     Given the following product_category
       | name |
       | Bicycle |
+    Given I am logged in as "joaosilva"
+    And I am on Rede Moinho's control panel
+    And I follow "Manage Products and Services"
     And I follow "New product or service"
     And I select "Bicycle"
     And I press "Save and continue"
@@ -134,3 +170,184 @@ Feature: manage products
     And I press "Save and continue"
     Then I should be on Rede Moinho's new product page
     And I should see "Bicycle"
+
+  Scenario: a user with permission can see edit links
+    Given the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category | name | description |
+      | redemoinho | bicycle  | Bike | Red bicycle |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Bike
+    Then I should see "Change category"
+    And I should see "Edit name"
+    And I should see "Edit basic information"
+    And I should see "Change image"
+
+  Scenario: an allowed user will see a different button when has no basic info
+    Given the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category | name |
+      | redemoinho | bicycle  | Bike |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Bike
+    Then I should see "Change category"
+    And I should see "Edit name"
+    And I should see "Add description, price and other basic information"
+    And I should see "Change image"
+
+  Scenario: a not logged user cannot see edit links
+    Given I am not logged in
+    And the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category | name | description |
+      | redemoinho | bicycle  | Bike | Red bicycle |
+    When I go to Rede Moinho's page of product Bike
+    Then I should not see "Change category"
+    And I should not see "Edit name"
+    And I should not see "Edit basic information"
+    And I should not see "Change image"
+
+  Scenario: a not allowed user cannot see edit links
+    Given the following users
+      | login       | name         |
+      | mariasantos | Maria Santos |
+    And the following product_category
+      | name    |
+      | Bicycle |
+    And the following products
+      | owner      | category | name | description |
+      | redemoinho | bicycle  | Bike | Red bicycle |
+    And I am logged in as "mariasantos"
+    When I go to Rede Moinho's page of product Bike
+    Then I should not see "Change category"
+    And I should not see "Edit name"
+    And I should not see "Edit basic information"
+    And I should not see "Change image"
+
+  @selenium
+  Scenario: edit name of a product
+    Given the following product_category
+      | name    |
+      | Bicycle |
+    And the following products
+      | owner      | category | name |
+      | redemoinho | bicycle  | Bike |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Bike
+    And I follow "Edit name"
+    And I fill in "product_name" with "Red bicycle"
+    And I press "Save"
+    Then I should see "Red bicycle"
+    And I should be on Rede Moinho's page of product Red bicycle
+
+  @selenium
+  Scenario: cancel edition of a product name
+    Given the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category | name |
+      | redemoinho | bicycle  | Bike |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Bike
+    And I follow "Edit name"
+    When I follow "Cancel"
+    Then I should see "Bike"
+
+  @selenium
+  Scenario: edit category of a product
+    Given the following product_category
+      | name |
+      | Eletronics |
+    And the following product_categories
+      | name | parent |
+      | Computers | eletronics |
+      | DVDs      | eletronics |
+    And the following products
+      | owner      | category   | name       |
+      | redemoinho | computers  | Generic pc |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Generic pc
+    And I follow "Change category"
+    And I select "Eletronics »"
+    Then I select "DVDs"
+    And I press "Save and continue"
+    Then I should see "Eletronics → DVDs"
+
+  @selenium
+  Scenario: cancel edition of a product category
+    Given the following product_category
+      | name |
+      | Eletronics |
+    And the following product_categories
+      | name | parent |
+      | Computers | eletronics |
+      | DVDs      | eletronics |
+    And the following products
+      | owner      | category   | name       |
+      | redemoinho | computers  | Generic pc |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Generic pc
+    And I follow "Change category"
+    When I follow "Back to product"
+    Then I should see "Eletronics → Computers"
+
+
+  @selenium
+  Scenario: edit image of a product
+    Given the following product_category
+      | name |
+      | Eletronics |
+    And the following product_categories
+      | name | parent |
+      | Computers | eletronics |
+      | DVDs      | eletronics |
+    And the following products
+      | owner      | category   | name       |
+      | redemoinho | computers  | Generic pc |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Generic pc
+    And I follow "Change image"
+    When I follow "Cancel"
+    Then I should be on Rede Moinho's page of product Generic pc
+
+ # FIXME Not working because of tinyMCE plus selenium
+ # @selenium
+ # Scenario: edit description of a product
+ #   Given the following product_category
+ #     | name    |
+ #     | Bicycle |
+ #   And the following products
+ #     | owner      | category | name | description       |
+ #     | redemoinho | bicycle  | Bike | A new red bicycle |
+ #   And I am logged in as "joaosilva"
+ #   When I go to Rede Moinho's page of product Bike
+ #   Then I should see "A new red bicycle"
+ #   And I follow "Edit basic information"
+ #   And I type in tinyMCE field "Description" the text "An used red bicycle"
+ #   And I press "Save"
+ #   Then I should not see "A new red bicycle"
+ #   And I should see "An used red bicycle"
+ #   And I should be on Rede Moinho's page of product Bike
+
+  @selenium
+  Scenario: cancel edition of a product description
+    Given the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category | name | description       |
+      | redemoinho | bicycle  | Bike | A new red bicycle |
+    And I am logged in as "joaosilva"
+    When I go to Rede Moinho's page of product Bike
+    Then I should see "A new red bicycle"
+    And I follow "Edit basic information"
+    When I follow "Cancel"
+    Then I should see "A new red bicycle"
+    And I should be on Rede Moinho's page of product Bike
@@ -200,3 +200,5 @@ Given /^(.+) is disabled$/ do |enterprise_name|
   enterprise.enabled = false
   enterprise.save
 end
+
+
@@ -54,6 +54,14 @@ module NavigationHelpers
     when /^(.+)'s new product page/
       '/myprofile/%s/manage_products/new' % Profile.find_by_name($1).identifier
+    when /^(.+)'s page of product (.*)$/
+       enterprise = Profile.find_by_name($1)
+       product = enterprise.products.find_by_name($2)
+      '/myprofile/%s/manage_products/show/%s' % [enterprise.identifier, product.id]
+
+    when /^(.*)'s products page$/
+      '/catalog/%s' % Profile.find_by_name($1).identifier
+
     # Add more mappings here.
     # Here is a more fancy example:
     #
 .box-1 {
-  margin: 0 0 0 200px;
+  margin: 0 30px 0 260px;
 }
 .box-1 .blocks {
@@ -17,3 +17,7 @@
   padding: 10px 0;
   float: none;
 }
+
+#product-image {
+  margin-right: 0px;
+}
@@ -9,7 +9,7 @@
 .box-2 {
   float: right;
-  width: 190px;
+  width: 230px;
 }
 .block {
@@ -138,3 +138,58 @@ function update_loading(message) {
 function redirect_to(url) {
   document.location=url;
 }
+
+/* Products edition  */
+
+function numbersonly(e, separator) {
+  var key;
+  var keychar;
+
+  if (window.event) {
+    key = window.event.keyCode;
+  }
+  else if (e) {
+    key = e.which;
+  }
+  else {
+    return true;
+  }
+  keychar = String.fromCharCode(key);
+
+  if ((key==null) || (key==0) || (key==8) ||  (key==9) || (key==13) || (key==27) ) {
+    return true;
+  }
+  else if ((("0123456789").indexOf(keychar) > -1)) {
+    return true;
+  }
+  else if (keychar == separator) {
+    return true;
+  }
+  else
+    return false;
+}
+
+// transform all element with class ui_button in a jQuery UI button
+function render_jquery_ui_buttons(element_id) {
+   if (element_id) {
+      element_id = '#' + element_id
+      jQuery(element_id).button({
+         icons: {
+             primary: jQuery(element_id).attr('data-primary-icon'),
+             secondary: jQuery(element_id).attr('data-secondary-icon')
+            }
+         }
+      )
+   }
+   else {
+      jQuery('.ui_button').each(function() {
+         jQuery(this).button({
+            icons: {
+                primary: this.getAttribute('data-primary-icon'),
+                secondary: this.getAttribute('data-secondary-icon')
+               }
+            }
+         )
+      })
+   }
+}
@@ -0,0 +1,675 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.43 (12-MAR-2010)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function() {
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+			return false; // <-- important!
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function')
+		options = { success: options };
+
+	var url = $.trim(this.attr('action'));
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+   	}
+   	url = url || window.location.href || '';
+
+	options = $.extend({
+		url:  url,
+		type: this.attr('method') || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options || {});
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (var n in options.data) {
+		  if(options.data[n] instanceof Array) {
+			for (var k in options.data[n])
+			  a.push( { name: n, value: options.data[n][k] } );
+		  }
+		  else
+			 a.push( { name: n, value: options.data[n] } );
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else
+		options.data = q; // data is the query string for 'post'
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+	if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success)
+		callbacks.push(options.success);
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		for (var i=0, max=callbacks.length; i < max; i++)
+			callbacks[i].apply(options, [data, status, xhr || $form, $form]);
+	};
+
+	// are there files to upload?
+	var files = $('input:file', this).fieldValue();
+	var found = false;
+	for (var j=0; j < files.length; j++)
+		if (files[j])
+			found = true;
+
+	var multipart = false;
+//	var mp = 'multipart/form-data';
+//	multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive)
+		   $.get(options.closeKeepAlive, fileUpload);
+	   else
+		   fileUpload();
+	   }
+   else
+	   $.ajax(options);
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit]', form).length) {
+			alert('Error: Form elements must not be named "submit".');
+			return;
+		}
+
+		var opts = $.extend({}, $.ajaxSettings, options);
+		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+		var id = 'jqFormIO' + (new Date().getTime());
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" onload="(jQuery(this).data(\'form-plugin-onload\'))()" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function() {
+				this.aborted = 1;
+				$io.attr('src', opts.iframeSrc); // abort op in progress
+			}
+		};
+
+		var g = opts.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) $.event.trigger("ajaxStart");
+		if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+			s.global && $.active--;
+			return;
+		}
+		if (xhr.aborted)
+			return;
+
+		var cbInvoked = false;
+		var timedOut = 0;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				opts.extraData = opts.extraData || {};
+				opts.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					opts.extraData[n+'.x'] = form.clk_x;
+					opts.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (form.getAttribute('method') != 'POST')
+				form.setAttribute('method', 'POST');
+			if (form.getAttribute('action') != opts.url)
+				form.setAttribute('action', opts.url);
+
+			// ie borks in some cases when setting encoding
+			if (! opts.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (opts.timeout)
+				setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (opts.extraData)
+					for (var n in opts.extraData)
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+opts.extraData[n]+'" />')
+								.appendTo(form)[0]);
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
+				$io.data('form-plugin-onload', cb);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				t ? form.setAttribute('target', t) : $form.removeAttr('target');
+				$(extraInputs).remove();
+			}
+		};
+
+		if (opts.forceSync)
+			doSubmit();
+		else
+			setTimeout(doSubmit, 10); // this lets dom updates render
+	
+		var domCheckCount = 100;
+
+		function cb() {
+			if (cbInvoked) 
+				return;
+
+			var ok = true;
+			try {
+				if (timedOut) throw 'timeout';
+				// extract the server response from the iframe
+				var data, doc;
+
+				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+				
+				var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
+				 	if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+				 		log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					log('Could not access iframe DOM after 100 tries.');
+					return;
+				}
+
+				log('response detected');
+				cbInvoked = true;
+				xhr.responseText = doc.body ? doc.body.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': opts.dataType};
+					return headers[header];
+				};
+
+				if (opts.dataType == 'json' || opts.dataType == 'script') {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta)
+						xhr.responseText = ta.value;
+					else {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						if (pre)
+							xhr.responseText = pre.innerHTML;
+					}			  
+				}
+				else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				data = $.httpData(xhr, opts.dataType);
+			}
+			catch(e){
+				log('error caught:',e);
+				ok = false;
+				xhr.error = e;
+				$.handleError(opts, xhr, 'error', e);
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				opts.success(data, 'success');
+				if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+			}
+			if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+			if (g && ! --$.active) $.event.trigger("ajaxStop");
+			if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+			// clean up
+			setTimeout(function() {
+				$io.removeData('form-plugin-onload');
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		};
+
+		function toXml(s, doc) {
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+		};
+	};
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		e.preventDefault();
+		$(this).ajaxSubmit(options);
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0)
+				return;
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length == 0) return a;
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) return a;
+	for(var i=0, max=els.length; i < max; i++) {
+		var el = els[i];
+		var n = el.name;
+		if (!n) continue;
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		var v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(var j=0, jmax=v.length; j < jmax; j++)
+				a.push({name: n, value: v[j]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: n, value: v});
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0], n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) return;
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++)
+				a.push({name: n, value: v[i]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: this.name, value: v});
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+			continue;
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (typeof successful == 'undefined') successful = true;
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1))
+			return null;
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) return null;
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				if (one) return v;
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return el.value;
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea')
+			this.value = '';
+		else if (t == 'checkbox' || t == 'radio')
+			this.checked = false;
+		else if (tag == 'select')
+			this.selectedIndex = -1;
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+			this.reset();
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b == undefined) b = true;
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select == undefined) select = true;
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio')
+			this.checked = select;
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+	if ($.fn.ajaxSubmit.debug) {
+		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+		if (window.console && window.console.log)
+			window.console.log(msg);
+		else if (window.opera && window.opera.postError)
+			window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
@@ -97,7 +97,7 @@ div#profile-disabled {
   padding-left: 60px;
   min-height: 40px;
   width: 400px;
-  background: url("../images/icons-app/alert.png") no-repeat 5px #ffffa9;
+  background: url('/images/icons-app/alert.png') no-repeat 5px #ffffa9;
 }
 div#profile-disabled .unlock-button{
@@ -2503,20 +2503,158 @@ div#activation_enterprise div {
 /* * * Show Product * * * * * * * * * * * * */
-#show_product .product-pic {
+.controller-catalog #show_product .product-pic {
+  border: 1px solid #D3D7CF;
+}
+
+#show_product,
+#category-product-edition {
+  background-color: transparent;
+  position: relative;
+  padding: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+#show_product h2,
+#category-product-edition h2 {
+  margin-top: 0px;
+}
+
+#show_product .field-value {
+  font-weight: bold;
+}
+
+#product-category,
+.product-category-hierarchy {
+  margin-top: 40px;
+  margin-bottom: 12px;
+  padding-left: 7px;
+}
+
+#product-category {
+  height: 18px;
+}
+
+#product-category p {
+  display: inline;
+}
+
+#category-product-edition {
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#display-product-name,
+#display-product-category {
   float: left;
-  margin-right: 15px;
-  border: 1px solid #444;
-  padding: 2px;
-  background: #FFF;
 }
-#show_product .product_category {
+#product-details {
   padding-top: 10px;
+  padding-bottom: 10px;
+  position: relative;
+}
+
+#product-name h2 {
+  display: inline;
+}
+
+#product_name {
+  width: 90%;
+}
+
+#edit-product-name {
+  margin-top: 10px;
+}
+
+#product-name,
+#product-details {
+  position: relative;
   clear: left;
 }
+#display-product-info {
+  left: 290px;
+  top: 10px;
+  width: 360px;
+  text-align: left;
+  position: absolute;
+  overflow: hidden;
+}
+
+#product-info-form {
+  margin-top: 20px;
+}
+#edit-product-category {
+  padding: 15px 5px 10px;
+}
+
+#product-info .field-name {
+  margin-top: 5px;
+  margin-bottom: 15px;
+}
+
+#product-info .type-text input,
+#product-info select {
+  width: 150px;
+}
+
+#product-info .section-title {
+  display: none;
+}
+
+#product-qualifiers {
+  padding-left: 0px;
+}
+
+#product-qualifiers li {
+  list-style: none;
+}
+
+#edit-product-button-ui-info {
+  margin-top: 40px;
+}
+
+#product-image {
+  text-align: center;
+  padding: 10px;
+  width: 250px;
+  margin-right: 10px;
+  margin-bottom: 5px;
+  border: 1px solid #AAA;
+}
+
+#product-image p {
+  font-size: 11px;
+  font-style: italic;
+  margin-top: 0px;
+  color: #555;
+}
+
+#display-product-image {
+  margin-bottom: 10px;
+  overflow: hidden;
+}
+
+#edit-product-image {
+  position: relative;
+  margin-top: 5px;
+}
+
+#product-qualifiers-list {
+  padding: 0px;
+}
+
+#product-qualifiers-list li {
+  list-style: none;
+}
+
+#product-qualifiers-list .product-qualifier-title,
+#product-qualifiers-list .product-certifier-title {
+  margin-right: 20px;
+}
 /* ==> public/stylesheets/controller_cms.css <== */
 .controller-cms #article_types li {
@@ -3007,7 +3145,7 @@ h1#agenda-title {
 #new_product_title {
   text-align: center;
 }
-#new_product_form {
+#product_category_form {
   border: 1px solid #AABB88;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -3063,7 +3201,7 @@ h1#agenda-title {
   display: block;
 }
 #hierarchy_navigation {
-  min-height: 1em;
+  min-height: 1.3em;
 }
 .msie #hierarchy_navigation {
   font-size: small;
@@ -3903,7 +4041,8 @@ h1#agenda-title {
 /* jquery.ui custom styles */
 .fg-button span {
-  padding: 0.1em 1em !important;
+  padding-top: 0.1em !important;
+  padding-bottom: 0.1em !important;
 }
 .treeitem .button{
@@ -0,0 +1,489 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=segoe%20ui,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=ece8da&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=100&borderColorHeader=d4ccb0&fcHeader=433f38&iconColorHeader=847e71&bgColorContent=f5f3e5&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=dfd9c3&fcContent=312e25&iconColorContent=808080&bgColorDefault=459e00&bgTextureDefault=04_highlight_hard.png&bgImgOpacityDefault=15&borderColorDefault=327E04&fcDefault=ffffff&iconColorDefault=eeeeee&bgColorHover=67b021&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=25&borderColorHover=327E04&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=fafaf4&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=d4ccb0&fcActive=459e00&iconColorActive=8DC262&bgColorHighlight=fcf0ba&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=e8e1b5&fcHighlight=363636&iconColorHighlight=8DC262&bgColorError=ffedad&bgTextureError=03_highlight_soft.png&bgImgOpacityError=95&borderColorError=e3a345&fcError=cd5c0a&iconColorError=cd0a0a&bgColorOverlay=2b2922&bgTextureOverlay=05_inset_soft.png&bgImgOpacityOverlay=15&opacityOverlay=90&bgColorShadow=cccccc&bgTextureShadow=04_highlight_hard.png&bgImgOpacityShadow=95&opacityShadow=20&thicknessShadow=12px&offsetTopShadow=-12px&offsetLeftShadow=-12px&cornerRadiusShadow=10px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: segoe ui, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: segoe ui, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #dfd9c3; background: #f5f3e5 url(images/ui-bg_highlight-hard_100_f5f3e5_1x100.png) 50% top repeat-x; color: #312e25; }
+.ui-widget-content a { color: #312e25; }
+.ui-widget-header { border: 1px solid #d4ccb0; background: #ece8da url(images/ui-bg_gloss-wave_100_ece8da_500x100.png) 50% 50% repeat-x; color: #433f38; font-weight: bold; }
+.ui-widget-header a { color: #433f38; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #327e04; background: #459e00 url(images/ui-bg_highlight-hard_15_459e00_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #327e04; background: #67b021 url(images/ui-bg_highlight-soft_25_67b021_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #d4ccb0; background: #fafaf4 url(images/ui-bg_highlight-hard_100_fafaf4_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #459e00; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #459e00; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #e8e1b5; background: #fcf0ba url(images/ui-bg_glass_55_fcf0ba_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #e3a345; background: #ffedad url(images/ui-bg_highlight-soft_95_ffedad_1x100.png) 50% top repeat-x; color: #cd5c0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd5c0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd5c0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_808080_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_808080_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_847e71_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_eeeeee_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_8dc262_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_8dc262_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; }
+.ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; }
+.ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
+.ui-corner-top { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
+.ui-corner-right {  -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
+.ui-corner-left { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; }
+.ui-corner-all { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #2b2922 url(images/ui-bg_inset-soft_15_2b2922_1x100.png) 50% bottom repeat-x; opacity: .90;filter:Alpha(Opacity=90); }
+.ui-widget-shadow { margin: -12px 0 0 -12px; padding: 12px; background: #cccccc url(images/ui-bg_highlight-hard_95_cccccc_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Selectable
+----------------------------------*/
+.ui-selectable-helper { border:1px dotted black }
+/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+/* IE7-/Win - Fix extra vertical space in lists */
+.ui-accordion a { zoom: 1; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
+----------------------------------*/
+.ui-autocomplete { position: absolute; cursor: default; }	
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/* Menu
+----------------------------------*/
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/* Button
+----------------------------------*/
+
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+
+
+
+
+/* Dialog
+----------------------------------*/
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
 \ No newline at end of file
@@ -0,0 +1,489 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=817865&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=ffffff&iconColorHeader=fadc7a&bgColorContent=feeebd&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Segoe UI, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Segoe UI, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #8e846b; background: #feeebd url(images/ui-bg_highlight-soft_100_feeebd_1x100.png) 50% top repeat-x; color: #383838; }
+.ui-widget-content a { color: #383838; }
+.ui-widget-header { border: 1px solid #494437; background: #817865 url(images/ui-bg_gloss-wave_45_817865_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d19405; background: #fece2f url(images/ui-bg_gloss-wave_60_fece2f_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #4c3000; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4c3000; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #a45b13; background: #ffdd57 url(images/ui-bg_gloss-wave_70_ffdd57_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #381f00; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #381f00; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #655e4e; background: #ffffff url(images/ui-bg_inset-soft_30_ffffff_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0074c7; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #0074c7; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeb420; background: #fff9e5 url(images/ui-bg_gloss-wave_90_fff9e5_500x100.png) 50% top repeat-x; color: #1f1f1f; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #1f1f1f; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #d34d17 url(images/ui-bg_diagonals-medium_20_d34d17_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_d19405_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_d19405_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_fadc7a_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_3d3d3d_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_bd7b00_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_eb990f_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_ed9f26_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffe180_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; }
+.ui-corner-tr { -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
+.ui-corner-br { -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-top { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-right {  -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-left { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
+.ui-corner-all { -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
+.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Selectable
+----------------------------------*/
+.ui-selectable-helper { border:1px dotted black }
+/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+/* IE7-/Win - Fix extra vertical space in lists */
+.ui-accordion a { zoom: 1; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
+----------------------------------*/
+.ui-autocomplete { position: absolute; cursor: default; }	
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/* Menu
+----------------------------------*/
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/* Button
+----------------------------------*/
+
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+
+
+
+
+/* Dialog
+----------------------------------*/
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
 \ No newline at end of file
@@ -39,31 +39,6 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     assert_kind_of Array, assigns(:products)
   end
-  should 'show product of enterprise' do
-    prod = @enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
-    get :show, :id => prod.id, :profile => @enterprise.identifier
-    assert_tag :tag => 'h1', :content => /#{prod.name}/
-  end
-
-  should 'link back to index from product show' do
-    enterprise = Enterprise.create!(:name => 'test_enterprise_1', :identifier => 'test_enterprise_1', :environment => Environment.default)
-    prod = enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
-    get :show, :id => prod.id, :profile => enterprise.identifier
-    assert_tag({
-      :tag => 'div',
-      :attributes => {
-        :class => /main-block/
-      },
-      :descendant => {
-        :tag => 'a',
-        :attributes => {
-          :href => "/catalog/#{enterprise.identifier}"
-        }
-      }
-    })
-    
-  end
-
   should 'not give access if environment do not let' do
     env = Environment.default
     env.enable('disable_products_for_enterprises')
@@ -86,20 +61,6 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'li', :attributes => { :class => 'product_price' }, :content => /Price:/
   end
-  should 'not show product price when showing product if not informed' do
-    prod = @enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
-    get :show, :id => prod.id, :profile => @enterprise.identifier
-
-    assert_no_tag :tag => 'p', :attributes => { :class => 'product_price' }, :content => /Price:/
-  end
-
-  should 'show product price when showing product if informed' do
-    prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => @product_category)
-    get :show, :id => prod.id, :profile => @enterprise.identifier
-
-    assert_tag :tag => 'p', :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)
@@ -108,12 +69,4 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
   end
-  should 'link to assets products wiht product category in the link to product category on show' do
-    pc = ProductCategory.create!(:name => 'some product', :environment => enterprise.environment)
-    prod = enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => pc)
-
-    get :show, :id => prod.id, :profile => enterprise.identifier
-    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
-  end
-
 end
@@ -65,27 +65,60 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
     end
   end
-  should "get edit form" do
-    p = @enterprise.products.create!(:name => 'test product', :product_category => @product_category)
-    get 'edit', :profile => @enterprise.identifier, :id => p.id
+  should "get edit name form" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    get 'edit', :profile => @enterprise.identifier, :id => product.id, :field => 'name'
     assert_response :success
     assert assigns(:product)
-    assert_template 'edit'
-    assert_tag :tag => 'form', :attributes => { :action => /edit/ }
+    assert_tag :tag => 'form', :attributes => { :action => /myprofile\/#{@enterprise.identifier}\/manage_products\/edit\/#{product.id}\?field=name/ }
   end
-  should "edit product" do
-    p = @enterprise.products.create!(:name => 'test product', :product_category => @product_category)
-    post 'edit', :profile => @enterprise.identifier, :product => {:name => 'new test product'}, :id => p.id
-    assert_response :redirect
+  should "get edit info form" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    get 'edit', :profile => @enterprise.identifier, :id => product.id, :field => 'info'
+    assert_response :success
+    assert assigns(:product)
+    assert_tag :tag => 'form', :attributes => { :action => /myprofile\/#{@enterprise.identifier}\/manage_products\/edit\/#{product.id}\?field=info/ }
+  end
+
+  should "get edit image form" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    get 'edit', :profile => @enterprise.identifier, :id => product.id, :field => 'image'
+    assert_response :success
+    assert assigns(:product)
+    assert_tag :tag => 'form', :attributes => { :action => /myprofile\/#{@enterprise.identifier}\/manage_products\/edit\/#{product.id}\?field=image/ }
+  end
+
+  should "edit product name" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    post :edit, :profile => @enterprise.identifier, :product => {:name => 'new test product'}, :id => product.id, :field => 'name'
+    assert_response :success
     assert assigns(:product)
     assert ! assigns(:product).new_record?
-    assert_equal p, Product.find_by_name('new test product')
+    assert_equal product, Product.find_by_name('new test product')
+  end
+
+  should "edit product description" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id, :description => 'My product is very good')
+    post :edit, :profile => @enterprise.identifier, :product => {:description => 'A very good product!'}, :id => product.id, :field => 'info'
+    assert_response :success
+    assert assigns(:product)
+    assert ! assigns(:product).new_record?
+    assert_equal 'A very good product!', Product.find_by_name('test product').description
+  end
+
+  should "edit product image" do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    post :edit, :profile => @enterprise.identifier, :product => { :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png') } }, :id => product.id, :field => 'image'
+    assert_response :success
+    assert assigns(:product)
+    assert ! assigns(:product).new_record?
+    assert_equal 'rails.png', Product.find_by_name('test product').image.filename
   end
   should "not edit to invalid parameters" do
-    p = @enterprise.products.create!(:name => 'test product', :product_category => @product_category)
-    post 'edit', :profile => @enterprise.identifier, :product => {:product_category => nil}, :id => p.id
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    post 'edit_category', :profile => @enterprise.identifier, :product => {:product_category => nil}, :id => product.id
     assert_response :success
     assert assigns(:product)
     assert ! assigns(:product).valid?
@@ -131,32 +164,16 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
     end
   end
-  should 'show thumbnail image when edit product' do
-    p = @enterprise.products.create!(:name => 'test product1', :product_category => @product_category, :image_builder => {
-      :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
-    })
-    get 'edit', :profile => @enterprise.identifier, :id => p.id
-    assert_tag :tag => 'img', :attributes => { :src => /#{p.image.public_filename(:thumb)}/ }
-  end
-
-  should 'show change image link above thumbnail image' do
-    p = @enterprise.products.create!(:name => 'test product1', :product_category => @product_category, :image_builder => {
-      :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
-    })
-    get 'edit', :profile => @enterprise.identifier, :id => p.id
-    assert_tag :tag => 'a', :attributes => { :href => '#' }, :content => 'Change image'
-  end
-  
   should 'filter html from name of product' do
     category = fast_create(ProductCategory, :name => 'Category 1')
     post 'new', :profile => @enterprise.identifier, :product => { :name => "<b id='html_name'>name bold</b>", :product_category_id => category.id }
     assert_sanitized assigns(:product).name
   end
-  should 'filter html from description of product' do
+  should 'filter html with whit list from description of product' do
     category = fast_create(ProductCategory, :name => 'Category 1')
     post 'new', :profile => @enterprise.identifier, :product => { :name => 'name', :description => "<b id='html_descr'>descr bold</b>", :product_category_id => category.id }
-    assert_sanitized assigns(:product).description
+    assert_equal "<b>descr bold</b>", assigns(:product).description
   end
   should 'not let users in if environment do not let' do
@@ -179,15 +196,6 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
     assert_equivalent ProductCategory.top_level_for(pc1.environment), assigns(:categories)
   end
-  should 'links to products asset for product category link when showing' do
-    pc = fast_create(ProductCategory, :name => 'test_category')
-    p = @enterprise.products.create!(:name => 'test product', :product_category => pc)
-
-    get :show, :profile => @enterprise.identifier, :id => p.id
-
-    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
-  end
-
   should 'increase level while navigate on hierarchy categories' do
     category_level0 = fast_create(ProductCategory, :name => 'Products', :environment_id => @environment.id)
     category_level1 = fast_create(ProductCategory, :parent_id => category_level0.id, :name => 'Shoes', :environment_id => @environment.id)
@@ -232,4 +240,58 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
     end
   end
+  should 'show product of enterprise' do
+    prod = @enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
+    get :show, :id => prod.id, :profile => @enterprise.identifier
+    assert_tag :tag => 'h2', :content => /#{prod.name}/
+  end
+
+  should 'link back to index from product show' do
+    enterprise = Enterprise.create!(:name => 'test_enterprise_1', :identifier => 'test_enterprise_1', :environment => Environment.default)
+    prod = enterprise.products.create!(:name => 'Product test', :product_category => @product_category)
+    get :show, :id => prod.id, :profile => enterprise.identifier
+    assert_tag({
+      :tag => 'div',
+      :attributes => {
+        :class => /main-block/
+      },
+      :descendant => {
+        :tag => 'a',
+        :attributes => {
+          :href => "/myprofile/#{enterprise.identifier}/manage_products",
+        },
+        :content => /Back to the product listing/
+      }
+    })
+  end
+
+  should 'not show product price when showing product if not informed' do
+    product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
+    get :show, :id => product.id, :profile => @enterprise.identifier
+
+    assert_no_tag :tag => 'span', :attributes => { :class => 'product_price' }, :content => /Price:/
+  end
+
+  should 'show product price when showing product if unit was informed' do
+    prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :unit => 'unit', :product_category => @product_category)
+    get :show, :id => prod.id, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'span', :attributes => { :class => 'field-name' }, :content => /Price:/
+  end
+
+  should 'show product price when showing product if discount was informed' do
+    prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :discount => 3.50, :unit => 'unit', :product_category => @product_category)
+    get :show, :id => prod.id, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'span', :attributes => { :class => 'field-name' }, :content => /List price:/
+    assert_tag :tag => 'span', :attributes => { :class => 'field-name' }, :content => /On sale:/
+  end
+
+  should 'not show product price when showing product if unit not informed' do
+    prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => @product_category)
+    get :show, :id => prod.id, :profile => @enterprise.identifier
+
+    assert_no_tag :tag => 'span', :attributes => { :class => 'product_price' }, :content => /Price:/
+  end
+
 end
@@ -160,12 +160,6 @@ class RoutingTest &lt; ActionController::IntegrationTest
   def test_catalog_routing
     assert_routing('/catalog/colivre', :controller => 'catalog', :action => 'index', :profile => 'colivre')
-    assert_routing('/catalog/colivre/1234', :controller => 'catalog', :action => 'show', :profile => 'colivre', :id => '1234')
-  end
-
-  def test_catalog_with_dot_routing
-    assert_routing('/catalog/profile.withdot', :controller => 'catalog', :action => 'index', :profile => 'profile.withdot')
-    assert_routing('/catalog/profile.withdot/1234', :controller => 'catalog', :action => 'show', :profile => 'profile.withdot', :id => '1234')
   end
   def test_hosted_domain_routing
@@ -579,11 +579,6 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal 'filename.mp3', short_filename('filename.mp3')
   end
-  include ActionView::Helpers::NumberHelper
-  should 'format float to money as Brazillian currency' do
-    assert_equal 'R$10,00', float_to_currency(10.0)
-  end
-
   protected
   def url_for(args = {})
@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CertifierTest < Test::Unit::TestCase
+
+  should 'have link' do
+    certifier = Certifier.new
+
+    assert_equal '', certifier.link
+
+    certifier.link = 'http://noosfero.org'
+    assert_equal 'http://noosfero.org', certifier.link
+  end
+
+end
@@ -52,7 +52,7 @@ class EnterpriseHomepageTest &lt; Test::Unit::TestCase
     a = EnterpriseHomepage.new(:name => 'article homepage')
     ent.articles << a
     result = a.to_html
-    assert_match /catalog\/test_enterprise\/#{prod.id}/, result
+    assert_match /\/test_enterprise\/manage_products\/show\/#{prod.id}/, result
   end
   should 'can display hits' do
@@ -948,4 +948,28 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert !v.has_terms_of_use?
   end
+  should 'have currency unit attribute' do
+    env = Environment.new
+    assert_equal env.currency_unit, '$'
+
+    env.currency_unit = 'R$'
+    assert_equal 'R$', env.currency_unit
+  end
+
+  should 'have currency separator attribute' do
+    env = Environment.new
+    assert_equal env.currency_separator, '.'
+
+    env.currency_separator = ','
+    assert_equal ',', env.currency_separator
+  end
+
+  should 'have currency delimiter attribute' do
+    env = Environment.new
+    assert_equal env.currency_delimiter, ','
+
+    env.currency_delimiter = '.'
+    assert_equal '.', env.currency_delimiter
+  end
+
 end
@@ -38,6 +38,63 @@ class ManageProductsHelperTest &lt; Test::Unit::TestCase
     assert_tag_in_string select_for_categories(category_1.children(true), 1), :tag => 'select', :attributes => {:id => 'category_id'}
   end
+  include ActionView::Helpers::NumberHelper
+  should 'format price to environment currency' do
+    @environment.currency_unit = "R$"
+    @environment.currency_separator = ","
+    @environment.currency_delimiter = "."
+    @environment.save
+    assert_equal 'R$ 10,00', float_to_currency(10.0)
+  end
+
+  should 'not display link to edit product when user does not have permission' do
+    user = mock
+    user.expects(:has_permission?).with(anything, anything).returns(false)
+    @controller = mock
+    @controller.expects(:user).returns(user).at_least_once
+    @controller.expects(:profile).returns(mock)
+    category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
+    product = fast_create(Product, :product_category_id => category.id)
+    assert_equal '', edit_product_link(product, 'field', 'link to edit')
+  end
+
+  should 'display link to edit product when user has permission' do
+    user = mock
+    user.expects(:has_permission?).with(anything, anything).returns(true)
+    @controller = mock
+    @controller.expects(:user).returns(user).at_least_once
+    @controller.expects(:profile).returns(mock)
+    category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
+    product = fast_create(Product, :product_category_id => category.id)
+
+    expects(:link_to_remote).with('link to edit', {:update => "product-name", :url => {:controller => 'manage_products', :action => 'edit', :id => product.id, :field => 'name'}, :method => :get}, anything).returns('LINK')
+
+    assert_equal 'LINK', edit_product_link(product, 'name', 'link to edit')
+  end
+
+  should 'not display link to edit product category when user does not have permission' do
+    user = mock
+    user.expects(:has_permission?).with(anything, anything).returns(false)
+    @controller = mock
+    @controller.expects(:user).returns(user).at_least_once
+    @controller.expects(:profile).returns(mock)
+    category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
+    product = fast_create(Product, :product_category_id => category.id)
+    assert_equal '', edit_product_category_link(product)
+  end
+
+  should 'display link to edit product category when user has permission' do
+    user = mock
+    user.expects(:has_permission?).with(anything, anything).returns(true)
+    @controller = mock
+    @controller.expects(:user).returns(user).at_least_once
+    @controller.expects(:profile).returns(mock)
+    category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
+    product = fast_create(Product, :product_category_id => category.id)
+
+    assert_tag_in_string edit_product_category_link(product), {:tag => 'a', :content => 'Change category'}
+  end
+
   protected
   include NoosferoTestHelper
@@ -20,6 +20,27 @@ class ProductTest &lt; Test::Unit::TestCase
     end   
   end
+  should 'display category name if name is nil' do
+    p = fast_create(Product, :name => nil)
+    p.expects(:category_name).returns('Software')
+    assert_equal 'Software', p.name
+  end
+
+  should 'display category name if name is blank' do
+    p = fast_create(Product, :name => '')
+    p.expects(:category_name).returns('Software')
+    assert_equal 'Software', p.name
+  end
+
+  should 'set nil to name if name is equal to category name' do
+    p = fast_create(Product)
+    p.expects(:category_name).returns('Software').at_least_once
+    p.name = 'Software'
+    p.save
+    assert_equal 'Software', p.name
+    assert_equal nil, p[:name]
+  end
+
   should 'list recent products' do
     enterprise = fast_create(Enterprise, :name => "My enterprise", :identifier => 'my-enterprise')
     Product.delete_all
@@ -113,7 +134,7 @@ class ProductTest &lt; Test::Unit::TestCase
     product.expects(:id).returns(999)
     product.expects(:enterprise).returns(enterprise)
-    assert_equal({:controller => 'catalog', :action => 'show', :id => 999}, product.url)
+    assert_equal({:controller => 'manage_products', :action => 'show', :id => 999}, product.url)
   end
   should 'categorize also with product categorization' do
@@ -178,12 +199,27 @@ class ProductTest &lt; Test::Unit::TestCase
     end
   end
+  should 'accept discount 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|
+      product = Product.new(:discount => input)
+      assert_equal output, product.discount
+    end
+  end
+
   should 'strip name with malformed HTML when sanitize' do
     product = Product.new(:product_category => @product_category)
     product.name = "<h1 Bla </h1>"
     product.valid?
-    assert_equal '', product.name
+    assert_equal @product_category.name, product.name
   end
   should 'escape malformed html tags' do
@@ -208,4 +244,23 @@ class ProductTest &lt; Test::Unit::TestCase
     assert product.errors.invalid?(:product_category)
   end
+  should 'format values to float with 2 decimals' do
+     ent = fast_create(Enterprise, :name => 'test ent 1', :identifier => 'test_ent1')
+     product = fast_create(Product, :enterprise_id => ent.id, :price => 12.994, :discount => 1.994)
+
+    assert_equal "12.99", product.formatted_value(:price)
+    assert_equal "1.99", product.formatted_value(:discount)
+  end
+
+  should 'calculate price with discount' do
+     ent = fast_create(Enterprise, :name => 'test ent 1', :identifier => 'test_ent1')
+     product = fast_create(Product, :enterprise_id => ent.id, :price => 12.994, :discount => 1.994)
+
+    assert_equal 11.00, product.price_with_discount
+  end
+
+  should 'have default image' do
+    product = Product.new
+    assert_equal '/images/icons-app/product-default-pic-thumb.png', product.default_image
+  end
 end
	@@ -2,7 +2,7 @@ module DisplayHelper		@@ -2,7 +2,7 @@ module DisplayHelper
2		2
3	def link_to_product(product, opts={})	3	def link_to_product(product, opts={})
4	return _('No product') unless product	4	return _('No product') unless product
5	- target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url	5	+ target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
6	link_to content_tag( 'span', product.name ),	6	link_to content_tag( 'span', product.name ),
7	target,	7	target,
8	opts	8	opts
	@@ -49,12 +49,52 @@ module ManageProductsHelper		@@ -49,12 +49,52 @@ module ManageProductsHelper
49	hierarchy.reverse.join(options[:separator] \|\| ' → ')	49	hierarchy.reverse.join(options[:separator] \|\| ' → ')
50	end	50	end
51		51
52	- def options_for_select_categories(categories)	52	+ def options_for_select_categories(categories, selected = nil)
53	categories.sort_by{\|cat\| cat.name.transliterate}.map do \|category\|	53	categories.sort_by{\|cat\| cat.name.transliterate}.map do \|category\|
54	- "<option value='#{category.id}'>#{category.name + (category.leaf? ? '': ' »')}</option>"	54	+ selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
		55	+ "<option value='#{category.id}' #{selected_attribute}>#{category.name + (category.leaf? ? '': ' »')}</option>"
55	end.join("\n")	56	end.join("\n")
56	end	57	end
57		58
		59	+ def build_selects_for_ancestors(ancestors, last_level)
		60	+ current_category = ancestors.shift
		61	+ if current_category.nil?
		62	+ content_tag('div', '<!-- no categories -->',
		63	+ :class => 'categories_container',
		64	+ :id => "categories_container_level#{ last_level }"
		65	+ )
		66	+ else
		67	+ content_tag('div',
		68	+ select_tag('category_id',
		69	+ options_for_select_categories(current_category.siblings + [current_category], current_category),
		70	+ :size => 10,
		71	+ :onchange => remote_function_to_update_categories_selection("categories_container_level#{ current_category.level + 1 }", :with => "'category_id=' + this.value")
		72	+ ) +
		73	+ build_selects_for_ancestors(ancestors, last_level),
		74	+ :class => 'categories_container',
		75	+ :id => "categories_container_level#{ current_category.level }"
		76	+ )
		77	+ end
		78	+ end
		79	+
		80	+ def selects_for_all_ancestors(current_category)
		81	+ build_selects_for_ancestors(current_category.ancestors.reverse + [current_category], current_category.level + 1)
		82	+ end
		83	+
		84	+ def select_for_new_category
		85	+ content_tag('div',
		86	+ render(:partial => 'categories_for_selection'),
		87	+ :class => 'categories_container',
		88	+ :id => 'categories_container_level0'
		89	+ )
		90	+ end
		91	+
		92	+ def categories_container(field_id_html, categories_selection_html, hierarchy_html = '')
		93	+ field_id_html +
		94	+ content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
		95	+ content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
		96	+ end
		97	+
58	def select_for_categories(categories, level = 0)	98	def select_for_categories(categories, level = 0)
59	if categories.empty?	99	if categories.empty?
60	content_tag('div', '', :id => 'no_subcategories')	100	content_tag('div', '', :id => 'no_subcategories')
	@@ -68,4 +108,98 @@ module ManageProductsHelper		@@ -68,4 +108,98 @@ module ManageProductsHelper
68	end	108	end
69	end	109	end
70		110
		111	+ def edit_product_link(product, field, label, html_options = {})
		112	+ return '' unless (user && user.has_permission?('manage_products', profile))
		113	+ options = html_options.merge(:id => 'link-edit-product-' + field)
		114	+
		115	+ link_to_remote(label,
		116	+ {:update => "product-#{field}",
		117	+ :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
		118	+ :method => :get},
		119	+ options)
		120	+ end
		121	+
		122	+ def edit_product_button(product, field, label, html_options = {})
		123	+ the_class = 'button with-text icon-edit'
		124	+ if html_options.has_key?(:class)
		125	+ the_class << ' ' << html_options[:class]
		126	+ end
		127	+ edit_product_link(product, field, label, html_options.merge(:class => the_class))
		128	+ end
		129	+
		130	+ def edit_product_ui_button(product, field, label, html_options = {})
		131	+ return '' unless (user && user.has_permission?('manage_products', profile))
		132	+ options = html_options.merge(:id => 'edit-product-button-ui-' + field)
		133	+
		134	+ ui_button_to_remote(label,
		135	+ {:update => "product-#{field}",
		136	+ :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
		137	+ :complete => "$('edit-product-button-ui-#{field}').hide()",
		138	+ :method => :get},
		139	+ options)
		140	+ end
		141	+
		142	+ def cancel_edit_product_link(product, field, html_options = {})
		143	+ return '' unless (user && user.has_permission?('manage_products', profile))
		144	+ button_to_function(:cancel, _('Cancel'), nil, html_options) do \|page\|
		145	+ page.replace_html "product-#{field}", :partial => "display_#{field}", :locals => {:product => product}
		146	+ end
		147	+ end
		148	+
		149	+ def edit_product_category_link(product, html_options = {})
		150	+ return '' unless (user && user.has_permission?('manage_products', profile))
		151	+ options = html_options.merge(:id => 'link-edit-product-category')
		152	+ link_to(_('Change category'), { :action => 'edit_category', :id => product.id}, options)
		153	+ end
		154	+
		155	+ def float_to_currency(value)
		156	+ number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
		157	+ end
		158	+
		159	+ def display_value(product)
		160	+ price = product.price
		161	+ unless price.blank? \|\| price.zero?
		162	+ unit = product.unit
		163	+ return '' if unit.blank?
		164	+ discount = product.discount
		165	+ if discount.blank? \|\| discount.zero?
		166	+ display_price(_('Price: '), price, unit)
		167	+ else
		168	+ display_price_with_discount(price, unit, product.price_with_discount)
		169	+ end
		170	+ else
		171	+ ''
		172	+ end
		173	+ end
		174	+
		175	+ def display_price(label, price, unit)
		176	+ content_tag('span', label, :class => 'field-name') +
		177	+ content_tag('span', float_to_currency(price), :class => 'field-value') +
		178	+ ' (%s)' % unit
		179	+ end
		180	+
		181	+ def display_price_with_discount(price, unit, price_with_discount)
		182	+ original_value = content_tag('span', float_to_currency(price), :class => 'field-value')
		183	+ discount_value = display_price(_('On sale: '), price_with_discount, unit)
		184	+ content_tag('span', _('List price: '), :class => 'field-name') + original_value + "<p/>" + discount_value
		185	+ end
		186	+
		187	+ def display_qualifiers(product)
		188	+ data = ''
		189	+ product.product_qualifiers.each do \|pq\|
		190	+ certified_by = pq.certifier ? _(' certified by %s') % link_to(pq.certifier.name, pq.certifier.link) : ''
		191	+ data << content_tag('li', '✔ ' + pq.qualifier.name + certified_by, :class => 'product-qualifiers-item')
		192	+ end
		193	+ content_tag('ul', data, :id => 'product-qualifiers')
		194	+ end
		195	+
		196	+ def checkboxes_qualifiers(product, qualifier)
		197	+ check_box_tag("product[qualifiers_list][#{qualifier.id}][qualifier_id]", qualifier.id, product.qualifiers.include?(qualifier)) + qualifier.name
		198	+ end
		199	+
		200	+ def select_certifiers(product, qualifier, certifiers)
		201	+ relation = product.product_qualifiers.find(:first, :conditions => {:qualifier_id => qualifier.id})
		202	+ selected = relation.nil? ? 0 : relation.certifier_id
		203	+ select_tag("product[qualifiers_list][#{qualifier.id}][certifier_id]", options_for_select([[_('Select...') , 0 ]] + certifiers.map {\|c\|[c.name, c.id]}, selected))
		204	+ end
71	end	205	end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+class Certifier < ActiveRecord::Base
	2	+
	3	+ belongs_to :environment
	4	+
	5	+ def link
	6	+ self[:link] \|\| ''
	7	+ end
	8	+end
	@@ -2,10 +2,14 @@ class Product < ActiveRecord::Base		@@ -2,10 +2,14 @@ class Product < ActiveRecord::Base
2	belongs_to :enterprise	2	belongs_to :enterprise
3	belongs_to :product_category	3	belongs_to :product_category
4	has_many :product_categorizations	4	has_many :product_categorizations
		5	+ has_many :product_qualifiers
		6	+ has_many :qualifiers, :through => :product_qualifiers
5		7
6	validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true	8	validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
7	validates_presence_of :product_category	9	validates_presence_of :product_category
		10	+
8	validates_numericality_of :price, :allow_nil => true	11	validates_numericality_of :price, :allow_nil => true
		12	+ validates_numericality_of :discount, :allow_nil => true
9		13
10	after_update :save_image	14	after_update :save_image
11		15
	@@ -31,10 +35,36 @@ class Product < ActiveRecord::Base		@@ -31,10 +35,36 @@ class Product < ActiveRecord::Base
31		35
32	acts_as_searchable :fields => [ :name, :description, :category_full_name ]	36	acts_as_searchable :fields => [ :name, :description, :category_full_name ]
33		37
34	- xss_terminate :only => [ :name, :description ], :on => 'validation'	38	+ xss_terminate :only => [ :name ], :on => 'validation'
		39	+ xss_terminate :only => [ :description ], :with => 'white_list', :on => 'validation'
35		40
36	acts_as_mappable	41	acts_as_mappable
37	-	42	+
		43	+ def self.units
		44	+ {
		45	+ _('Litre') => 'litre',
		46	+ _('Kilo') => 'kilo',
		47	+ _('Meter') => 'meter',
		48	+ _('Unit') => 'unit',
		49	+ }
		50	+ end
		51	+
		52	+ def name
		53	+ self[:name].blank? ? category_name : self[:name]
		54	+ end
		55	+
		56	+ def name=(value)
		57	+ if (value == category_name)
		58	+ self[:name] = nil
		59	+ else
		60	+ self[:name] = value
		61	+ end
		62	+ end
		63	+
		64	+ def default_image(size='thumb')
		65	+ '/images/icons-app/product-default-pic-%s.png' % size
		66	+ end
		67	+
38	def category_full_name	68	def category_full_name
39	product_category ? product_category.full_name.split('/') : nil	69	product_category ? product_category.full_name.split('/') : nil
40	end	70	end
	@@ -60,13 +90,21 @@ class Product < ActiveRecord::Base		@@ -60,13 +90,21 @@ class Product < ActiveRecord::Base
60	end	90	end
61		91
62	def url	92	def url
63	- enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => id)	93	+ enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
64	end	94	end
65		95
66	def public?	96	def public?
67	enterprise.public_profile	97	enterprise.public_profile
68	end	98	end
69		99
		100	+ def formatted_value(value)
		101	+ ("%.2f" % self[value]).to_s.gsub('.', enterprise.environment.currency_separator) if self[value]
		102	+ end
		103	+
		104	+ def price_with_discount
		105	+ price - discount if discount
		106	+ end
		107	+
70	def price=(value)	108	def price=(value)
71	if value.is_a?(String)	109	if value.is_a?(String)
72	super(currency_to_float(value))	110	super(currency_to_float(value))
	@@ -75,6 +113,14 @@ class Product < ActiveRecord::Base		@@ -75,6 +113,14 @@ class Product < ActiveRecord::Base
75	end	113	end
76	end	114	end
77		115
		116	+ def discount=(value)
		117	+ if value.is_a?(String)
		118	+ super(currency_to_float(value))
		119	+ else
		120	+ super(value)
		121	+ end
		122	+ end
		123	+
78	def currency_to_float( num )	124	def currency_to_float( num )
79	if num.count('.') == 1 && num.count(',') == 0	125	if num.count('.') == 1 && num.count(',') == 0
80	# number like "12.34"	126	# number like "12.34"
	@@ -99,4 +145,17 @@ class Product < ActiveRecord::Base		@@ -99,4 +145,17 @@ class Product < ActiveRecord::Base
99	return num.tr(',.','').to_f	145	return num.tr(',.','').to_f
100	end	146	end
101		147
		148	+ def has_basic_info?
		149	+ %w[description price].each do \|field\|
		150	+ return true if !self.send(field).blank?
		151	+ end
		152	+ false
		153	+ end
		154	+
		155	+ def qualifiers_list=(qualifiers)
		156	+ self.product_qualifiers.delete_all
		157	+ qualifiers.each do \|item\|
		158	+ self.product_qualifiers.create(item[1]) if item[1].has_key?('qualifier_id')
		159	+ end
		160	+ end
102	end	161	end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class ProductQualifier < ActiveRecord::Base
	2	+ belongs_to :qualifier
	3	+ belongs_to :product
	4	+ belongs_to :certifier
	5	+end
	@@ -20,7 +20,7 @@ class ProductsBlock < Block		@@ -20,7 +20,7 @@ class ProductsBlock < Block
20	block_title(title) +	20	block_title(title) +
21	content_tag(	21	content_tag(
22	'ul',	22	'ul',
23	- products.map {\|product\| content_tag('li', link_to(product.name, product.url, :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:minor) : '/images/icons-app/product-default-pic-minor.png' )), :class => 'product' )}	23	+ products.map {\|product\| content_tag('li', link_to(product.name, product.url, :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:minor) : product.default_image('minor'))), :class => 'product' )}
24	)	24	)
25	end	25	end
26		26
	@@ -386,7 +386,7 @@ class Profile < ActiveRecord::Base		@@ -386,7 +386,7 @@ class Profile < ActiveRecord::Base
386		386
387	def url_options	387	def url_options
388	options = { :host => default_hostname, :profile => (own_hostname ? nil : self.identifier) }	388	options = { :host => default_hostname, :profile => (own_hostname ? nil : self.identifier) }
389	- Noosfero.url_options.merge(options)	389	+ options.merge(Noosfero.url_options.merge(options))
390	end	390	end
391		391
392	private :generate_url, :url_options	392	private :generate_url, :url_options
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class Qualifier < ActiveRecord::Base
	2	+
	3	+ belongs_to :environment
	4	+
	5	+end
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-<div id="show_product">
2	-
3	-<h1> <%= @product.name %> </h1>
4	-
5	-<%= image_tag @product.image.public_filename, :class => 'product-pic' if @product.image %>
6	-
7	-<div class="product_description">
8	-<%= txt2html @product.description if @product.description %>
9	-</div>
10	-
11	-<% if @product.price %>
12	- <p class="product_price">
13	- <%= _('Price: %s') % ( "<strong>%.2f</strong>" % @product.price) %>
14	- </p>
15	-<% end %>
16	-
17	-<p class="product_category">
18	-<%= _('Category: %s ') % link_to_product_category(@product.product_category) %>
19	-</p>
20	-
21	-<% button_bar do %>
22	- <%= button :back, _("%s's products/services listing") % profile.name, :action => 'index', :id => nil %>
23	-<% end %>
24	-
25	-</div>
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	<% end %>	11	<% end %>
12	</div>	12	</div>
13		13
14	-<%= hidden_field_tag('back_to', @back_to) if @back_to %>	14	+<%= hidden_field_tag('back_to', @back_to) %>
15		15
16	<% button_bar do %>	16	<% button_bar do %>
17	<%= add_upload_file_field(_('More files'), {:size => size}) %>	17	<%= add_upload_file_field(_('More files'), {:size => size}) %>