casein 3.1.5 → 3.1.6

data/PUBLIC_VERSION.yml

@@ -1,4 +1,4 @@
 major: 3
 minor: 1
-patch: 5
+patch: 6
 build: 

data/app/helpers/casein/casein_helper.rb

@@ -68,19 +68,19 @@ module Casein
   	# Styled form tag helpers
 	
   	def casein_text_field form, obj, attribute, options = {}
-  	  casein_form_tag_wrapper(form.text_field(attribute, strip_casein_options(options.merge({:class => 'caseinTextField'}))), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.text_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'caseinTextField'))), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_password_field form, obj, attribute, options = {}
-  		casein_form_tag_wrapper(form.password_field(attribute, strip_casein_options(options.merge({:class => 'caseinTextField'}))), form, obj, attribute, options).html_safe
+  		casein_form_tag_wrapper(form.password_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'caseinTextField'))), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_text_area form, obj, attribute, options = {}
-  	  casein_form_tag_wrapper(form.text_area(attribute, strip_casein_options(options.merge({:class => 'caseinTextArea'}))), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.text_area(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'caseinTextArea'))), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_text_area_big form, obj, attribute, options = {}
-  	 casein_form_tag_wrapper(form.text_area(attribute, strip_casein_options(options.merge({:class => 'caseinTextAreaBig'}))), form, obj, attribute, options).html_safe
+  	 casein_form_tag_wrapper(form.text_area(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'caseinTextAreaBig'))), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_check_box form, obj, attribute, options = {}
@@ -124,31 +124,32 @@ module Casein
     end
 	
   	def casein_select form, obj, attribute, option_tags, options = {}
-  		casein_form_tag_wrapper(form.select(attribute, option_tags, strip_casein_options(options), {:class => 'caseinSelect'}), form, obj, attribute, options).html_safe
+  		casein_form_tag_wrapper(form.select(attribute, option_tags, strip_casein_options(options), merged_class_hash(options, 'caseinSelect')), form, obj, attribute, options).html_safe
   	end
   	
   	def casein_time_zone_select form, obj, attribute, option_tags, options = {}
-  	  casein_form_tag_wrapper(form.time_zone_select(attribute, option_tags, strip_casein_options(options), {:class => 'caseinSelect'}), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.time_zone_select(attribute, option_tags, strip_casein_options(options), merged_class_hash(options, 'caseinSelect')), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_collection_select form, obj, object, attribute, collection, value_method, text_method, options = {}
-  		casein_form_tag_wrapper(collection_select(object, attribute, collection, value_method, text_method, strip_casein_options(options), {:class => 'caseinSelect'}), form, obj, attribute, options).html_safe
+  		casein_form_tag_wrapper(collection_select(object, attribute, collection, value_method, text_method, strip_casein_options(options), merged_class_hash(options, 'caseinSelect')), form, obj, attribute, options).html_safe
   	end
   	
   	def casein_date_select form, obj, attribute, options = {}
-  	  casein_form_tag_wrapper(form.date_select(attribute, strip_casein_options(options), {:class => 'caseinDateTimeSelect'}), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.date_select(attribute, strip_casein_options(options), merged_class_hash(options, 'caseinDateTimeSelect')), form, obj, attribute, options).html_safe
   	end
 
   	def casein_time_select form, obj, attribute, options = {}
-  	  casein_form_tag_wrapper(form.time_select(attribute, strip_casein_options(options), {:class => 'caseinDateTimeSelect'}), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.time_select(attribute, strip_casein_options(options), merged_class_hash(options, 'caseinDateTimeSelect')), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_datetime_select form, obj, attribute, options = {}
-  	  casein_form_tag_wrapper(form.datetime_select(attribute, strip_casein_options(options), {:class => 'caseinDateTimeSelect'}), form, obj, attribute, options).html_safe
+  	  casein_form_tag_wrapper(form.datetime_select(attribute, strip_casein_options(options), merged_class_hash(options, 'caseinDateTimeSelect')), form, obj, attribute, options).html_safe
   	end
 	
   	def casein_file_field form, obj, object_name, attribute, options = {}
-  	  contents = '<div class="caseinFileFieldContainer">' + file_field(object_name, attribute, strip_casein_options(options)) + '</div>'
+  	  class_hash = merged_class_hash(options, 'caseinFileFieldContainer')
+  	  contents = "<div class='#{class_hash['class']}'>" + file_field(object_name, attribute, strip_casein_options(options)) + '</div>'
   	  casein_form_tag_wrapper(contents, form, obj, attribute, options).html_safe
   	end
 	
@@ -161,6 +162,22 @@ module Casein
     def strip_casein_options options
       options.reject {|key, value| key.to_s.include? "casein_" }
     end
+    
+    def merged_class_hash options, new_class
+      if options.key? :class
+        new_class += " #{options[:class]}"
+      end
+        
+      {:class => new_class}
+    end
+    
+    def options_hash_with_merged_classes options, new_class
+      if options.key? :class
+        new_class += " #{options[:class]}"
+      end
+      options[:class] = new_class
+      options
+    end
 
     def casein_form_tag_wrapper form_tag, form, obj, attribute, options = {}
         unless options.key? :casein_label

data/lib/generators/casein/update/templates/public/casein/stylesheets/login.css

@@ -11,6 +11,10 @@ body {
 	font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif;
 }
 
+a {
+	outline: none;
+}
+
 #header {
 	background: #efefef url(/casein/images/login/top.png) repeat-x bottom left;
 	padding: 80px 0 40px 0;

data/lib/generators/casein/update/templates/public/casein/stylesheets/screen.css

@@ -25,6 +25,7 @@ img {
 a {
 	color: #333333;
 	text-decoration: underline;
+	outline: none;
 }
 
 a:hover {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casein
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Russell Quinn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency