typus 3.1.2 → 3.1.3

data/app/views/admin/dashboard/widgets/_applications.html.erb

@@ -33,7 +33,7 @@
         </tr>
       </thead>
 
-      <% admin_user.application(app).map { |i| i.constantize }.each do |klass| %>
+      <% admin_user.application(app).map(&:constantize).each do |klass| %>
         <% if klass.typus_options_for(:hide_from_dashboard) == false %>
           <tr class="<%= cycle("even", "odd") %>">
             <td>

data/app/views/admin/dashboard/widgets/_models.html.erb

@@ -11,7 +11,7 @@
     </tr>
   </thead>
 
-  <% admin_user.models.map { |i| i.constantize }.each do |klass| %>
+  <% admin_user.models.map(&:constantize).each do |klass| %>
     <tr class="<%= cycle("even", "odd") %>">
       <td><%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %></td>
       <td width="80px" align="right">

data/app/views/admin/dashboard/widgets/_models_extended.html.erb

@@ -12,7 +12,7 @@
     </tr>
   </thead>
 
-  <% admin_user.models.map { |i| i.constantize }.each do |klass| %>
+  <% admin_user.models.map(&:constantize).each do |klass| %>
     <tr class="<%= cycle("even", "odd") %>">
       <td><%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %></td>
       <td width="30px" align="right"><%= klass.count %></td>

data/app/views/admin/resources/_form.html.erb

@@ -15,7 +15,7 @@
       <% build_save_options.each do |key, value, special| %>
         <%
           message = Typus::I18n.t(value)
-          options = { :name => key, :onclick => "setConfirmUnload(false);", :disable_with => message  }
+          options = { :name => key, :onclick => "Typus.setConfirmUnload(false);", :disable_with => message  }
         %>
         <li><%= submit_tag message, options %></li>
       <% end %>

data/app/views/admin/resources/edit.html.erb

@@ -9,15 +9,17 @@
     <small><%= list_actions %></small>
   </h2>
 
-  <% if headless_mode? && params[:action] == 'edit' %>
+  <% if headless_mode? && params[:action] == 'edit' && flash.keys.include?(:notice) && !params[:_input] %>
     <script type="text/javascript">
       $(document).ready(function () {
-        parent.Typus.resource_attribute = "#<%= params[:attribute] %>";
-        parent.Typus.resource_id = '<%= @item.id %>';
-        parent.Typus.resource_to_label = '<%= @item.to_label %>';
-        <% if flash.keys.any? && !params[:_input] %>
+        <% if params[:attribute] %>
+          var option = new Option("<%= @item.to_label %>", "<%= @item.id %>", true, true);
+          parent.$("#<%= params[:attribute] %>").append(option);
+          parent.$(".chzn-select-<%= params[:attribute] %>").trigger("liszt:updated");
+        <% else %>
           parent.Typus.parent_location_reload = true;
         <% end %>
+        parent.$.fancybox.close();
       });
     </script>
   <% end %>

data/app/views/admin/templates/_belongs_to.html.erb

@@ -1,8 +1,14 @@
-<li id="<%= attribute_id %>">
+<% chosen_class = "chzn-select-#{attribute_id}" %>
+
+<li id="<%= attribute_id %>_li">
   <%= form.label attribute, label_text %>
   <% if values.any? %>
-    <%= form.select related_fk, values, options, html_options.merge(:class => "chzn-select", :style => "width: 350px;") %>
+    <%= form.select related_fk, values, options, html_options.merge(:class => chosen_class, :style => "width: 350px;") %>
   <% else %>
     <%= Typus::I18n.t("No %{resources} found.", :resources => related.model_name.human.downcase.pluralize) %>
   <% end %>
 </li>
+
+<script type="text/javascript">
+  $(document).ready(function () { $(".<%= chosen_class %>").chosen(); });
+</script>

data/app/views/admin/templates/_date.html.erb

@@ -1,8 +1,3 @@
-<%
-  custom = { :include_blank => false }
-  options.merge!(custom)
-%>
-
 <li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.date_select attribute, options, html_options %>

data/app/views/admin/templates/_datetime.html.erb

@@ -1,8 +1,3 @@
-<%
-  custom = { :include_blank => false }
-  options.merge!(custom)
-%>
-
 <li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.datetime_select attribute, options, html_options %>

data/app/views/admin/templates/_has_and_belongs_to_many.html.erb

@@ -1,15 +1,17 @@
+<% chosen_class = "chzn-select-#{attribute_id}" %>
+
 <li id="<%= attribute_id %>_field">
   <%= form.label attribute, label_text %>
-  <% if related_items.any? %>
-    <%= hidden_field_tag related_ids %>
-    <%= select_tag related_ids,
-                   options_from_collection_for_select(related_items, "id", "to_label", values.map(&:id)),
-                   html_options.merge(:multiple => true,
-                                      :id => attribute_id,
-                                      :class => "chzn-select",
-                                      :style => "width: 550px;",
-                                      "data-placeholder" => Typus::I18n.t("Select Some Options")) %>
-  <% else %>
-    <%= Typus::I18n.t("No %{resources} found.", :resources => related_klass.model_name.human.downcase.pluralize) %>
-  <% end %>
+  <%= hidden_field_tag related_ids %>
+  <%= select_tag related_ids,
+                 options_from_collection_for_select(values.all, "id", "to_label", related_items.map(&:id)),
+                 html_options.merge(:multiple => true,
+                                    :id => attribute_id,
+                                    :class => chosen_class,
+                                    :style => "width: 550px;",
+                                    "data-placeholder" => Typus::I18n.t("Select Some Options")) %>
 </li>
+
+<script type="text/javascript">
+  $(document).ready(function () { $(".<%= chosen_class %>").chosen(); });
+</script>

data/app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -22,7 +22,7 @@
 %>
 
 <%
-  unless options[:disabled] == true
+  unless params[:_popup] || options[:disabled] == true
     input = "#{@resource.model_name.underscore.gsub("/", "_")}_#{attribute}"
     insert_picture = <<-DATA
   <small>

data/config/routes.rb

@@ -21,11 +21,11 @@ Rails.application.routes.draw do
       end
     end
 
-    Typus.models.map { |i| i.to_resource }.each do |resource|
+    Typus.models.map(&:to_resource).each do |resource|
       match "#{resource}(/:action(/:id))(.:format)", :controller => resource
     end
 
-    Typus.resources.map { |i| i.underscore }.each do |resource|
+    Typus.resources.map(&:underscore).each do |resource|
       match "#{resource}(/:action(/:id))(.:format)", :controller => resource
     end
   end

data/lib/generators/typus/config_generator.rb

@@ -26,32 +26,37 @@ Description:
         @configuration
       end
 
+      def fields_for(model, *defaults)
+        rejections = %w( ^id$ _type$ type created_at created_on updated_at updated_on deleted_at ).join("|")
+        fields = model.table_exists? ? model.columns.map(&:name) : defaults
+        fields.reject { |f| f.match(rejections) }.join(", ")
+      end
+
       def generate_yaml
         Typus.reload!
 
         configuration = {}
-        models = Typus.application_models.reject { |m| Typus.models.include?(m) }.map { |m| m.constantize }
+        models = Typus.application_models.reject { |m| Typus.models.include?(m) }.map(&:constantize)
 
         models.each do |model|
-          configuration[model.table_name] = {}
+          key = model.name.underscore
+
+          configuration[key] = {}
 
           relationships = [ :has_many, :has_one ].map do |relationship|
                             model.reflect_on_all_associations(relationship).map { |i| i.name.to_s }
                           end.flatten.join(", ")
 
-          rejections = %w( ^id$ _type$ type created_at created_on updated_at updated_on deleted_at ).join("|")
-          fields = model.columns.map(&:name).reject { |f| f.match(rejections) }.join(", ")
-
-          configuration[model.table_name][:base] = <<-RAW
+          configuration[key][:base] = <<-RAW
 #{model}:
   fields:
-    default: #{fields}
-    form: #{fields}
+    default: #{fields_for(model, 'to_label')}
+    form: #{fields_for(model)}
   relationships: #{relationships}
   application: Application
           RAW
 
-          configuration[model.table_name][:roles] = "#{model}: create, read, update, delete"
+          configuration[key][:roles] = "#{model}: create, read, update, delete"
         end
 
         configuration

data/lib/support/string.rb

@@ -1,7 +1,7 @@
 class String
 
   def extract_settings
-    split(",").map { |x| x.strip }
+    split(",").map(&:strip)
   end
 
   def remove_prefix

data/lib/typus.rb

@@ -23,6 +23,7 @@ module Typus
     autoload :Actions, "typus/controller/actions"
     autoload :ActsAsList, "typus/controller/acts_as_list"
     autoload :Ancestry, "typus/controller/ancestry"
+    autoload :Autocomplete, "typus/controller/autocomplete"
     autoload :Bulk, "typus/controller/bulk"
     autoload :FeaturedImage, "typus/controller/featured_image"
     autoload :Filters, "typus/controller/filters"
@@ -158,7 +159,7 @@ module Typus
         hash[settings.first] = settings.size > 1 ? settings.last : 1000
       end
 
-      hash.sort { |a1, a2| a1[1].to_i <=> a2[1].to_i }.map { |i| i.first }
+      hash.sort { |a1, a2| a1[1].to_i <=> a2[1].to_i }.map(&:first)
     end
 
     # Lists modules of an application.
@@ -175,7 +176,7 @@ module Typus
 
     # Lists models from the configuration file.
     def models
-      Typus::Configuration.config.map { |i| i.first }.sort
+      Typus::Configuration.config.map(&:first).sort
     end
 
     # Lists resources, which are tableless models. This is done by looking at

data/lib/typus/configuration.rb

@@ -19,19 +19,19 @@ module Typus
 
     # Read roles from files <tt>config/typus/*_roles.yml</tt>.
     def self.roles!
-      @@roles = {}
+      @@roles = Hash.new({})
 
       Typus.role_configuration_files.each do |file|
         if data = YAML::load(ERB.new(File.read(file)).result)
           data.compact.each do |key, value|
-            @@roles[key] ? @@roles[key].merge!(value) : (@@roles[key] = value)
+            @@roles[key] = @@roles[key].merge(value)
           end
         end
       end
     end
 
     mattr_accessor :roles
-    @@roles = {}
+    @@roles = Hash.new({})
 
   end
 end

data/lib/typus/controller/autocomplete.rb

@@ -0,0 +1,13 @@
+module Typus
+  module Controller
+    module Autocomplete
+
+      def autocomplete
+        get_objects
+        @items = @resource.limit(20)
+        render :json => @items.map { |i| { "id" => i.id, "name" => i.to_label } }
+      end
+
+    end
+  end
+end

data/lib/typus/controller/format.rb

@@ -60,7 +60,7 @@ module Typus
       end
 
       def export(format)
-        fields = @resource.typus_fields_for(format).map { |i| i.first }
+        fields = @resource.typus_fields_for(format).map(&:first)
         methods = fields - @resource.column_names
         except = @resource.column_names - fields
 

data/lib/typus/controller/headless.rb

@@ -15,7 +15,9 @@ module Typus
       private :set_resources_action_for_headless_on_index
 
       def set_resources_action_for_headless
-        add_resources_action("All Entries", {:action => 'index', :id => nil})
+        if params[:_input]
+          add_resources_action("All Entries", {:action => 'index', :id => nil})
+        end
       end
       private :set_resources_action_for_headless
 

data/lib/typus/i18n.rb

@@ -18,10 +18,9 @@ module Typus
       #
       #     Typus::I18n.t("Hello %{world}!", :world => @world)
       #
-      def t(msg, *args)
-        options = args.extract_options!
-        options[:default] = msg
-        ::I18n.t(msg, options)
+      def t(key, options = {})
+        options[:default] ||= key
+        ::I18n.t(key, options)
       end
 
       def default_locale

data/lib/typus/orm/active_record/class_methods.rb

@@ -44,7 +44,7 @@ module Typus
 
           fields ||= data['default'] || typus_default_fields_for(filter)
           fields = fields.extract_settings if fields.is_a?(String)
-          fields.map { |f| f.to_sym }
+          fields.map(&:to_sym)
         end
 
         def typus_default_fields_for(filter)
@@ -52,7 +52,7 @@ module Typus
         end
 
         def virtual_fields
-          instance_methods.map { |i| i.to_s } - model_fields.keys.map { |i| i.to_s }
+          instance_methods.map(&:to_s) - model_fields.keys.map(&:to_s)
         end
 
         def virtual_attribute?(field)
@@ -60,7 +60,7 @@ module Typus
         end
 
         def dragonfly_attribute?(field)
-          if respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
+          if respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map(&:attribute).include?(field)
             :dragonfly
           end
         end
@@ -98,7 +98,7 @@ module Typus
 
         def get_typus_filters
           data = read_model_config['filters'] || ""
-          data.extract_settings.map { |i| i.to_sym }
+          data.extract_settings.map(&:to_sym)
         end
 
       end

data/lib/typus/orm/base.rb

@@ -52,7 +52,7 @@ module Typus
 
       def typus_field_options_for(filter)
         options = read_model_config['fields']['options']
-        options && options[filter.to_s] ? options[filter.to_s].extract_settings.map { |i| i.to_sym } : []
+        options && options[filter.to_s] ? options[filter.to_s].extract_settings.map(&:to_sym) : []
       end
 
       #--
@@ -145,7 +145,7 @@ module Typus
       end
 
       def typus_user_id?
-        columns.map { |u| u.name }.include?(Typus.user_foreign_key)
+        columns.map(&:name).include?(Typus.user_foreign_key)
       end
 
       def read_model_config

data/lib/typus/resources.rb

@@ -22,7 +22,7 @@ module Typus
     @@form_rows = 15
 
     mattr_accessor :minute_step
-    @@minute_step = 5
+    @@minute_step = nil
 
     mattr_accessor :only_user_items
     @@only_user_items = false

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

data/typus.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.version = Typus::VERSION
   s.platform = Gem::Platform::RUBY
   s.authors = ["Francesc Esplugas"]
-  s.email = ["core@typuscmf.com"]
-  s.homepage = "http://core.typuscmf.com/"
+  s.email = ["support@typuscmf.com"]
+  s.homepage = "http://www.typuscmf.com/"
   s.summary = "Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator)"
   s.description = "Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content."
 
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.test_files    = []
   s.require_paths = ["lib"]
 
+  s.add_dependency "bcrypt-ruby", "~> 3.0.0"
   s.add_dependency "jquery-rails"
   s.add_dependency "kaminari"
   s.add_dependency "rails", "~> 3.1.0"

data/vendor/assets/chosen/LICENSE.md

@@ -0,0 +1,24 @@
+# Chosen, a Select Box Enhancer for jQuery and Protoype
+## by Patrick Filler for [Harvest](http://getharvest.com)
+
+Available for use under the [MIT License](http://en.wikipedia.org/wiki/MIT_License)
+
+Copyright (c) 2011 by Harvest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/assets/chosen/chosen.css

@@ -57,6 +57,19 @@
   -ms-text-overflow: ellipsis;
   text-overflow: ellipsis;
 }
+.chzn-container-single .chzn-single abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url(chosen-sprite.png) right top no-repeat;
+}
+.chzn-container-single .chzn-single abbr:hover {
+  background-position: right -11px;
+}
 .chzn-container-single .chzn-single div {
   -webkit-border-radius: 0 4px 4px 0;
   -moz-border-radius   : 0 4px 4px 0;
@@ -81,25 +94,26 @@
   width: 18px;
 }
 .chzn-container-single .chzn-single div b {
-  background: url('/assets/chosen-sprite.png') no-repeat 0 1px;
+  background: url('chosen-sprite.png') no-repeat 0 1px;
   display: block;
   width: 100%;
   height: 100%;
 }
 .chzn-container-single .chzn-search {
   padding: 3px 4px;
+  position: relative;
   margin: 0;
   white-space: nowrap;
 }
 .chzn-container-single .chzn-search input {
-  background: #fff url('/assets/chosen-sprite.png') no-repeat 100% -20px;
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   margin: 1px 0;
   padding: 4px 20px 4px 5px;
   outline: 0;
@@ -117,6 +131,11 @@
 }
 /* @end */
 
+.chzn-container-single-nosearch .chzn-search input {
+  position: absolute;
+  left: -9000px;
+}
+
 /* @group Multi Chosen */
 .chzn-container-multi .chzn-choices {
   background-color: #fff;
@@ -191,18 +210,18 @@
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close {
   display: block;
   position: absolute;
-  right: 5px;
-  top: 6px;
-  width: 8px;
-  height: 9px;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
   font-size: 1px;
-  background: url('/assets/chosen-sprite.png') right top no-repeat;
+  background: url(chosen-sprite.png) right top no-repeat;
 }
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
-  background-position: right -9px;
+  background-position: right -11px;
 }
 .chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
-  background-position: right -9px;
+  background-position: right -11px;
 }
 /* @end */
 
@@ -220,6 +239,7 @@
   padding: 0;
 }
 .chzn-container .chzn-results li {
+  display: none;
   line-height: 80%;
   padding: 7px 7px 8px;
   margin: 0;
@@ -227,6 +247,7 @@
 }
 .chzn-container .chzn-results .active-result {
   cursor: pointer;
+  display: list-item;
 }
 .chzn-container .chzn-results .highlighted {
   background: #3875d7;
@@ -241,6 +262,7 @@
 }
 .chzn-container .chzn-results .no-results {
   background: #f4f4f4;
+  display: list-item;
 }
 .chzn-container .chzn-results .group-result {
   cursor: default;
@@ -303,6 +325,18 @@
 }
 /* @end */
 
+/* @group Disabled Support */
+.chzn-disabled {
+  cursor: default;
+  opacity:0.5 !important;
+}
+.chzn-disabled .chzn-single {
+  cursor: default;
+}
+.chzn-disabled .chzn-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
 /* @group Right to Left */
 .chzn-rtl { direction:rtl;text-align: right; }
 .chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
@@ -321,14 +355,14 @@
 .chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
 .chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
 .chzn-rtl .chzn-search input {
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, #ffffff;
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, #ffffff;
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   padding: 4px 5px 4px 20px;
 }
 /* @end */