spree_core 1.0.0.rc2 → 1.0.0.rc3

data/app/views/spree/shared/_head.html.erb

@@ -1,8 +1,24 @@
+<meta charset="utf-8">
+
+<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame -->
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
 <title><%= title %></title>
+
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<meta content="width=device-width, initial-scale=1.0, maximum-scale=1" name="viewport">
+
 <%== meta_data_tags %>
+
 <%= favicon_link_tag image_path('favicon.ico') %>
+
 <%= stylesheet_link_tag 'store/all', :media => 'screen' %>
+
 <%= csrf_meta_tags %>
 <%= javascript_include_tag 'store/all' %>
-<%= yield :head %>
+
+<!--[if lt IE 9]>
+<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+
+<%= yield :head %>

data/app/views/spree/shared/_nav_bar.html.erb

@@ -1,6 +1,3 @@
 <li id="search-bar" data-hook>
   <%= render :partial => 'spree/shared/search' %>
-</li>
-<% if store_menu? %>
-  <%= render :partial => 'spree/shared/store_menu' %>
-<% end %>
+</li>

data/app/views/spree/shared/_order_details.html.erb

@@ -1,50 +1,109 @@
-<table class="index" data-hook="order_details">
-  <tbody id="line-items" data-hook>
+<div class="row steps-data">
+  
+  <div class="columns alpha four">
+    <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+    <div class="address">
+      <%= order.ship_address %>
+    </div>
+  </div>
+
+  <div class="columns alpha four">
+    <h6><%= t(:billing_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+    <div class="address">
+      <%= order.bill_address %>
+    </div>
+  </div>
+
+  <div class="columns alpha four">
+    <h6><%= t(:shipping_method) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
+    <div class="delivery">
+      <%= order.shipping_method.name %>
+    </div>
+  </div>
+
+  <div class="columns omega four">
+    <h6><%= t(:payment_information) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:payment) unless @order.completed? %></h6>
+    <div class="payment-info">
+      <% unless order.creditcards.empty? %>
+        <span class="cc-type">
+          <%= image_tag "creditcards/icons/#{order.creditcards.first.cc_type}.png" %>
+          <%= t(:ending_in)%> <%= order.creditcards.first.last_digits %>
+        </span>
+        <br />
+        <span class="full-name">
+          <%= order.creditcards.first.first_name %>
+          <%= order.creditcards.first.last_name %>
+        </span>
+      <% end %>
+    </div>
+  </div>
+
+</div>
+
+<hr />
+
+<table class="index columns alpha omega sixteen" data-hook="order_details">
+  
+  <thead id="line-items" data-hook>
     <tr data-hook="order_details_line_items_headers">
+      <th> </th>
       <th><%= t(:item_description) %></th>
       <th class="price"><%= t(:price) %></th>
       <th class="qty"><%= t(:qty) %></th>
       <th class="total"><span><%= t(:total) %></span></th>
     </tr>
+  </thead>
 
+  <tbody id="line-items" data-hook>
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
-        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-        <td class="price"><%= number_to_currency item.price %></td>
+        <td data-hook="order_item_image" width="20%">
+          <% if item.variant.images.length == 0 %>
+            <%= small_image(item.variant.product) %>
+          <% else %>
+            <%= image_tag item.variant.images.first.attachment.url(:small) %>
+          <% end %>
+        </td>
+        <td width="80%">
+          <h6><%= item.variant.product.name %></h6>
+          <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
+          <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %>
+        </td>
+        <td class="price"><span><%= number_to_currency item.price %></span></td>
         <td class="qty"><%= item.quantity %></td>
         <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>
-  <tbody id="subtotal" data-hook="order_details_subtotal">
-    <tr class="total" id="subtotal-row">
-      <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
-    </tr>
-  </tbody>
-  <tbody id="order-charges" data-hook="order_details_adjustments">
-    <% @order.adjustments.eligible.each do |adjustment| %>
-    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-      <tr class="total">
-        <td colspan="3"><strong><%= adjustment.label %></strong></td>
-        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
-      </tr>
-    <% end %>
-  </tbody>
-  <tbody id="order-total" data-hook="order_details_total">
+  <tfoot id="order-total" data-hook="order_details_total">
     <tr class="total">
-      <td colspan="3"><b><%= t(:order_total) %>:</b></td>
+      <td colspan="4"><b><%= t(:order_total) %>:</b></td>
       <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
     </tr>
-  </tbody>
+  </tfoot>
   <% if order.price_adjustment_totals.present? %>
-    <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
+    <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
       <% @order.price_adjustment_totals.keys.each do |key| %>
         <tr class="total">
-          <td colspan="3"><strong><%= key %></strong></td>
+          <td colspan="4"><strong><%= key %></strong></td>
           <td class="total"><span><%= number_to_currency @order.price_adjustment_totals[key] %></span></td>
         </tr>
       <% end %>
-    </tbody>
+    </tfoot>
   <% end %>
-</table>
+  <tfoot id="subtotal" data-hook="order_details_subtotal">
+    <tr class="total" id="subtotal-row">
+      <td colspan="4"><b><%= t(:subtotal) %>:</b></td>
+      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+    </tr>
+  </tfoot>
+  <tfoot id="order-charges" data-hook="order_details_adjustments">
+    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+      <tr class="total">
+        <td colspan="4"><strong><%= adjustment.label %></strong></td>
+        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+      </tr>
+    <% end %>
+  </tfoot>
+</table>

data/app/views/spree/shared/_products.html.erb

@@ -5,27 +5,28 @@
 <% if products.empty? %>
   <%= t(:no_products_found) %>
 <% elsif params.key?(:keywords) %>
-  <h3><%= t(:search_results, :keywords => h(params[:keywords])) %></h3>
+  <h6 class="search-results-title"><%= t(:search_results, :keywords => h(params[:keywords])) %></h6>
 <% end %>
 
 <% if products.any? %>
-<ul id="products" class="product-listing" data-hook>
+<ul id="products" class="inline product-listing" data-hook>
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
-      <li id="product_<%= product.id %>" data-hook="products_list_item">
-        <%= link_to product.name, product, :class => 'info' %>
-        <%= link_to small_image(product), product %>
-        <span class="price selling"><%= number_to_currency product.price %></span>
+      <li id="product_<%= product.id %>" class="columns three" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+        <div class="product-image">
+          <%= link_to small_image(product, :itemprop => "name"), product %>
+        </div>
+        <%= link_to product.name, product, :class => 'info', :itemprop => "name" %>
+        <span class="price selling" itemprop="price"><%= number_to_currency product.price %></span>
       </li>
     <% end %>
   <% end %>
 </ul>
 <% end %>
 
-<hr class="space" />
+
 
 <% if paginated_products.respond_to?(:num_pages)
       params.delete(:search)
       params.delete(:taxon)
-%><%= paginate paginated_products %><% end %>
-<hr class="space" />
+%><%= paginate paginated_products %><% end %>

data/app/views/spree/shared/_store_menu.html.erb

@@ -1,3 +1,2 @@
 <li id="home-link" data-hook><%= link_to t(:home), root_path %></li>
-<li id="link-to-cart" data-hook><%= link_to_cart %></li>
-
+<li id="link-to-cart" data-hook><%= link_to_cart %></li>

data/app/views/spree/shared/_taxonomies.html.erb

@@ -1,6 +1,6 @@
-<div id="taxonomies" class="sidebar-item" data-hook>
+<nav id="taxonomies" class="sidebar-item" data-hook>
   <% get_taxonomies.each do |taxonomy| %>
-    <h3 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name.singularize) %></h3>
+    <h6 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name.singularize) %></h6>
     <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
   <% end %>
-</div>
+</nav>

data/app/views/spree/taxons/_taxon.html.erb

@@ -1,4 +1,4 @@
 <div class="taxon" data-hook="taxon">
-  <h2><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h2>
+  <h5 class="subtaxon-title"><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h5>
   <%= render :partial => 'spree/shared/products', :locals => { :products => taxon_preview(taxon), :taxon => taxon } %>
 </div>

data/app/views/spree/taxons/show.html.erb

@@ -1,4 +1,4 @@
-<h1><%= accurate_title %></h1>
+<h3 class="taxon-title"><%= accurate_title %></h3>
 
 <% content_for :sidebar do %>
   <div data-hook="taxon_sidebar_navigation">

data/config/locales/en.yml

@@ -385,6 +385,7 @@ en:
   enable_login_via_login_password: "Use standard email/password"
   enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
+  ending_in: "Ending in"
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
   enter_at_least_five_letters: Enter at least five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
@@ -616,6 +617,7 @@ en:
     payment: payment
     resumed: resumed
     returned: returned
+    skrill: skrill
   order_summary: Order Summary
   order_sure_want_to: "Are you sure you want to %{event} this order?"
   order_total: "Order Total"

data/config/routes.rb

@@ -89,6 +89,7 @@ Spree::Core::Engine.routes.draw do
         collection do
           get :available
           get :selected
+          post :update_positions
         end
       end
       resources :taxons do
@@ -200,5 +201,5 @@ Spree::Core::Engine.routes.draw do
   match '/admin', :to => 'admin/orders#index', :as => :admin
 
   match '/content/cvv', :to => 'content#cvv'
-  match '/content/*path', :to => 'content#show', :via => :get
+  match '/content/*path', :to => 'content#show', :via => :get, :as => :content
 end

data/db/migrate/{20111128153359_new_preferences.rb → 20120119024710_new_preferences.rb}

@@ -27,18 +27,22 @@ class NewPreferences < ActiveRecord::Migration
           owner_class = old_pref.owner_type.constantize
           owner = OldPrefs.connection.select_value("SELECT #{owner_class.inheritance_column} FROM #{owner_class.table_name} WHERE id = #{old_pref.owner_id}").constantize.new
         end
-        say "Migrating preference #{old_pref.name}..."
-        owner.set_preference old_pref.name, old_pref.value
+
+        unless old_pref.owner_type.nil?
+        end
+
+        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::PromotionRule"
+          say "Migrating preference #{old_pref.name}"
+          owner.set_preference old_pref.name, old_pref.value
+        end
       rescue => e
         say "Skipping setting preference #{old_pref.owner_type}::#{old_pref.name}"
       end
     end
 
-    remove_column :spree_preferences, :name
-    remove_column :spree_preferences, :owner_id
-    remove_column :spree_preferences, :owner_type
-    remove_column :spree_preferences, :group_id
-    remove_column :spree_preferences, :group_type
+    # Remove old promotion prefs
+    Spree::Preference.where(:key => nil).delete_all
+
   end
 
   def down
@@ -51,6 +55,4 @@ class NewPreferences < ActiveRecord::Migration
     add_column :spree_preferences, :group_id, :integer
     add_column :spree_preferences, :group_type, :string
   end
-
 end
-

data/lib/generators/spree/install/install_generator.rb

@@ -9,6 +9,8 @@ module Spree
     class_option :seed, :type => :boolean, :default => true, :banner => 'load seed data (migrations must be run)'
     class_option :sample, :type => :boolean, :default => true, :banner => 'load sample data (migrations must be run)'
     class_option :auto_accept, :type => :boolean
+    class_option :admin_email, :type => :string
+    class_option :admin_password, :type => :string
     class_option :lib_name, :type => :string, :default => 'spree'
 
     def self.source_paths
@@ -115,7 +117,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
-        rake('db:migrate')
+        quietly { rake 'db:migrate' }
       else
         say_status :skipping, "migrations (don't forget to run rake db:migrate)"
       end
@@ -126,7 +128,15 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
         say_status :loading,  "seed data"
         rake_options=[]
         rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
-        rake("db:seed #{rake_options.join(' ')}")
+        rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
+        rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+
+        cmd = lambda { rake("db:seed #{rake_options.join(' ')}") }
+        if options[:auto_accept] || (options[:admin_email] && options[:admin_password])
+          quietly &cmd
+        else
+          cmd.call
+        end
       else
         say_status :skipping, "seed data (you can always run rake db:seed)"
       end
@@ -135,7 +145,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def load_sample_data
       if @load_sample_data
         say_status :loading, "sample data"
-        rake('spree_sample:load')
+        quietly { rake 'spree_sample:load' }
       else
         say_status :skipping, "sample data (you can always run rake spree_sample:load)"
       end

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -1,7 +1,10 @@
-# Used to configure Spree Preferences
+# Configure Spree Preferences
 # 
-# In order to override a default setting set: config.setting_name = 'new value'
+# Note: Initializing preferences available within the Admin will overwrite any changes that were made through the user interface when you restart.
+#       If you would like users to be able to update a setting with the Admin it should NOT be set here.
 #
+# In order to initialize a setting do: 
+# config.setting_name = 'new value'
 Spree.config do |config|
   # Example:
   # Uncomment to override the default site name.

data/lib/spree/core/controller_helpers.rb

@@ -88,7 +88,8 @@ module Spree
         # add additional keys as appropriate. Override this method if you need additional data when
         # responding to a notification
         def default_notification_payload
-          {:user => (respond_to?(:current_user) && current_user), :order => current_order}
+          { :user => (respond_to?(:current_user) && current_user),
+            :order => current_order(true) }
         end
 
         private
@@ -111,7 +112,7 @@ module Spree
           ActiveSupport::Deprecation.warn "current_gateway is deprecated and will be removed in Spree > 1.0"
           @current_gateway ||= Gateway.current
         end
-        
+
         def associate_user
           return unless current_user and current_order
           current_order.associate_user!(current_user)

data/lib/spree/core/engine.rb

@@ -18,6 +18,7 @@ module Spree
         ActiveSupport::Notifications.subscribe(/^spree\./) do |*args|
           event_name, start_time, end_time, id, payload = args
           Activator.active.event_name_starts_with(event_name).each do |activator|
+            payload[:event_name] = event_name
             activator.activate(payload)
           end
         end

data/lib/spree/core/permalinks.rb

@@ -40,7 +40,10 @@ module Spree
           permalink_value = self.to_param
           field = self.class.permalink_field
           # Do other links exist with this permalink?
-          other = self.class.first(:conditions => "#{field} LIKE '#{self.send(field)}%'", :order => "#{field} DESC")
+          other = self.class.first(
+            :conditions => "#{field} LIKE '#{permalink_value}%'",
+            :order => "LENGTH(#{field}) DESC, #{field} DESC"
+          )
           if other
             # Find the number of that permalink and add one.
             if /-(\d+)$/.match(other.send(field))

data/lib/spree/core/testing_support/common_rake.rb

@@ -8,7 +8,7 @@ namespace :common do
     require "#{ENV['LIB_NAME']}"
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}", "--quiet"]
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet"]
 
     puts "Setting up dummy database..."
     cmd = "bundle exec rake db:drop db:create db:migrate RAILS_ENV=test AUTO_ACCEPT=true"

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.0.rc2"
+    "1.0.0.rc3"
   end
 end

data/vendor/assets/javascripts/jquery.formalize.min.js

@@ -0,0 +1 @@
+var FORMALIZE=function(a,b,c){function d(a){var b=c.createElement("b");return b.innerHTML="<!--[if IE "+a+"]><br><![endif]-->",!!b.getElementsByTagName("br").length}var e="placeholder"in c.createElement("input"),f="autofocus"in c.createElement("input"),g=d(6),h=d(7);return{go:function(){var a,b=this.init;for(a in b)b.hasOwnProperty(a)&&b[a]()},init:{full_input_size:function(){h&&a("textarea, input.input_full").length&&a("textarea, input.input_full").wrap('<span class="input_full_wrap"></span>')},ie6_skin_inputs:function(){if(g&&a("input, select, textarea").length){var b=/button|submit|reset/,c=/date|datetime|datetime-local|email|month|number|password|range|search|tel|text|time|url|week/;a("input").each(function(){var d=a(this);this.getAttribute("type").match(b)?(d.addClass("ie6_button"),this.disabled&&d.addClass("ie6_button_disabled")):this.getAttribute("type").match(c)&&(d.addClass("ie6_input"),this.disabled&&d.addClass("ie6_input_disabled"))}),a("textarea, select").each(function(){this.disabled&&a(this).addClass("ie6_input_disabled")})}},autofocus:function(){f||!a(":input[autofocus]").length||a(":input[autofocus]:visible:first").focus()},placeholder:function(){!e&&!!a(":input[placeholder]").length&&(FORMALIZE.misc.add_placeholder(),a(":input[placeholder]").each(function(){if(this.type!=="password"){var b=a(this),c=b.attr("placeholder");b.focus(function(){b.val()===c&&b.val("").removeClass("placeholder_text")}).blur(function(){FORMALIZE.misc.add_placeholder()}),b.closest("form").submit(function(){b.val()===c&&b.val("").removeClass("placeholder_text")}).bind("reset",function(){setTimeout(FORMALIZE.misc.add_placeholder,50)})}}))}},misc:{add_placeholder:function(){e||!a(":input[placeholder]").length||a(":input[placeholder]").each(function(){if(this.type!=="password"){var b=a(this),c=b.attr("placeholder");(!b.val()||b.val()===c)&&b.val(c).addClass("placeholder_text")}})}}}}(jQuery,this,this.document);jQuery(document).ready(function(){FORMALIZE.go()})

data/vendor/assets/stylesheets/jquery.formalize.css

@@ -0,0 +1,364 @@
+.input_tiny {
+  width: 50px;
+}
+
+.input_small {
+  width: 100px;
+}
+
+.input_medium {
+  width: 150px;
+}
+
+.input_large {
+  width: 200px;
+}
+
+.input_xlarge {
+  width: 250px;
+}
+
+.input_xxlarge {
+  width: 300px;
+}
+
+.input_full {
+  width: 100%;
+}
+
+.input_full_wrap {
+  display: block;
+  padding-right: 8px;
+}
+
+input[type="search"]::-webkit-search-decoration {
+  display: none;
+}
+
+button:focus,
+input:focus,
+select:focus,
+textarea:focus {
+  -webkit-box-shadow: #0066ff 0 0 7px 0;
+  -moz-box-shadow: #0066ff 0 0 7px 0;
+  -o-box-shadow: #0066ff 0 0 7px 0;
+  box-shadow: #0066ff 0 0 7px 0;
+  z-index: 1;
+}
+
+input[type="file"]:focus, input[type="file"]:active,
+input[type="radio"]:focus,
+input[type="radio"]:active,
+input[type="checkbox"]:focus,
+input[type="checkbox"]:active {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+}
+button,
+input[type="reset"],
+input[type="submit"],
+input[type="button"],
+a.button {
+  -webkit-appearance: none;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-background-clip: padding;
+  -moz-background-clip: padding;
+  -ms-background-clip: padding-box;
+  -o-background-clip: padding-box;
+  background-clip: padding-box;
+  background: #dddddd url('../images/button.png?1298351022') repeat-x;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #dddddd));
+  background-image: -webkit-linear-gradient(#ffffff, #dddddd);
+  background-image: -moz-linear-gradient(#ffffff, #dddddd);
+  background-image: -o-linear-gradient(#ffffff, #dddddd);
+  background-image: -ms-linear-gradient(#ffffff, #dddddd);
+  background-image: linear-gradient(#ffffff, #dddddd);
+  border: 1px solid;
+  border-color: #dddddd #bbbbbb #999999;
+  cursor: pointer;
+  color: #333333;
+  font: bold 12px/1.3 "Helvetica Neue", Arial, "Liberation Sans", FreeSans, sans-serif;
+  outline: 0;
+  overflow: visible;
+  margin: 0;
+  padding: 3px 10px;
+  text-shadow: white 0 1px 1px;
+  vertical-align: top;
+  width: auto;
+  *padding-top: 2px;
+  *padding-bottom: 0;
+}
+button:hover,
+input[type="reset"]:hover,
+input[type="submit"]:hover,
+input[type="button"]:hover,
+a.button:hover {
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(1px, #eeeeee), color-stop(100%, #cccccc));
+  background-image: -webkit-linear-gradient(#ffffff, #eeeeee 1px, #cccccc);
+  background-image: -moz-linear-gradient(#ffffff, #eeeeee 1px, #cccccc);
+  background-image: -o-linear-gradient(#ffffff, #eeeeee 1px, #cccccc);
+  background-image: -ms-linear-gradient(#ffffff, #eeeeee 1px, #cccccc);
+  background-image: linear-gradient(#ffffff, #eeeeee 1px, #cccccc);
+}
+button:active,
+input[type="reset"]:active,
+input[type="submit"]:active,
+input[type="button"]:active,
+a.button:active {
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(1px, #dddddd), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(#ffffff, #dddddd 1px, #eeeeee);
+  background-image: -moz-linear-gradient(#ffffff, #dddddd 1px, #eeeeee);
+  background-image: -o-linear-gradient(#ffffff, #dddddd 1px, #eeeeee);
+  background-image: -ms-linear-gradient(#ffffff, #dddddd 1px, #eeeeee);
+  background-image: linear-gradient(#ffffff, #dddddd 1px, #eeeeee);
+  -webkit-box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+  -moz-box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+  -o-box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+  box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+  border-color: #999999 #bbbbbb #dddddd;
+}
+a.button::-moz-focus-inner,
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+button, a.button {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+textarea,
+select,
+input[type="date"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="email"],
+input[type="month"],
+input[type="number"],
+input[type="password"],
+input[type="search"],
+input[type="tel"],
+input[type="text"],
+input[type="time"],
+input[type="url"],
+input[type="week"] {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-background-clip: padding;
+  -moz-background-clip: padding;
+  -ms-background-clip: padding-box;
+  -o-background-clip: padding-box;
+  background-clip: padding-box;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0;
+  -webkit-appearance: none;
+  background-color: white;
+  border: 1px solid;
+  border-color: #848484 #c1c1c1 #e1e1e1;
+  color: black;
+  outline: 0;
+  margin: 0;
+  padding: 2px 3px;
+  text-align: left;
+  font-size: 13px;
+  font-family: Arial, "Liberation Sans", FreeSans, sans-serif;
+  height: 1.8em;
+  vertical-align: top;
+  *padding-top: 2px;
+  *padding-bottom: 1px;
+  *height: auto;
+}
+textarea[disabled],
+select[disabled],
+input[type="date"][disabled],
+input[type="datetime"][disabled],
+input[type="datetime-local"][disabled],
+input[type="email"][disabled],
+input[type="month"][disabled],
+input[type="number"][disabled],
+input[type="password"][disabled],
+input[type="search"][disabled],
+input[type="tel"][disabled],
+input[type="text"][disabled],
+input[type="time"][disabled],
+input[type="url"][disabled],
+input[type="week"][disabled] {
+  background-color: #eeeeee;
+}
+a.button[disabled],
+button[disabled],
+input[disabled],
+select[disabled],
+select[disabled] option,
+select[disabled] optgroup,
+textarea[disabled] {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+  -moz-user-select: -moz-none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  user-select: none;
+  color: #888888;
+  cursor: default;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #888888;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #888888;
+}
+
+input.placeholder_text,
+textarea.placeholder_text {
+  color: #888888;
+}
+
+textarea,
+select[size],
+select[multiple] {
+  height: auto;
+}
+
+select[size="0"],
+select[size="1"] {
+  height: 1.8em;
+  *height: auto;
+}
+
+@media (-webkit-min-device-pixel-ratio: 0) {
+  select[size],
+  select[multiple],
+  select[multiple][size] {
+    background-image: none;
+    padding-right: 3px;
+  }
+
+  select,
+  select[size="0"],
+  select[size="1"] {
+    background-image: url('../images/select_arrow.gif?1298351050');
+    background-repeat: no-repeat;
+    background-position: right center;
+    padding-right: 20px;
+  }
+
+  ::-webkit-validation-bubble-message {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #666666), color-stop(1, black));
+    border: 1px solid;
+    border-color: #747474 #5e5e5e #4f4f4f;
+    color: white;
+    font: 13px/17px "Lucida Grande", Arial, "Liberation Sans", FreeSans, sans-serif;
+    overflow: hidden;
+    padding: 15px 15px 17px;
+    text-shadow: black 0 0 1px;
+    height: 16px;
+  }
+
+  ::-webkit-validation-bubble-arrow,
+  ::-webkit-validation-bubble-top-outer-arrow,
+  ::-webkit-validation-bubble-top-inner-arrow {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    background: #666666;
+    border: 0;
+  }
+}
+textarea {
+  min-height: 40px;
+  overflow: auto;
+  resize: vertical;
+  width: 100%;
+}
+
+optgroup {
+  color: black;
+  font-style: normal;
+  font-weight: normal;
+  font-family: Arial, "Liberation Sans", FreeSans, sans-serif;
+}
+
+input:invalid,
+button:invalid,
+select:invalid,
+textarea:invalid {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+}
+input::-moz-focus-inner,
+button::-moz-focus-inner,
+a.button::-moz-focus-inner,
+select::-moz-focus-inner,
+textarea::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+.ie6_button,
+* html button {
+  background: #dddddd url('../images/button.png?1298351022') repeat-x;
+  border: 1px solid;
+  border-color: #dddddd #bbbbbb #999999;
+  cursor: pointer;
+  color: #333333;
+  font: bold 12px/1.2 Arial, sans-serif;
+  padding: 2px 10px 0px;
+  overflow: visible;
+  width: auto;
+}
+
+* html button {
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+
+.ie6_input,
+* html textarea,
+* html select {
+  background: white;
+  border: 1px solid;
+  border-color: #848484 #c1c1c1 #e1e1e1;
+  color: black;
+  padding: 2px 3px 1px;
+  font-size: 13px;
+  font-family: Arial, sans-serif;
+  vertical-align: top;
+}
+
+* html select {
+  margin-top: 1px;
+}
+
+.placeholder_text,
+.ie6_input_disabled,
+.ie6_button_disabled {
+  color: #888888;
+}
+
+.ie6_input_disabled {
+  background: #eeeeee;
+}