muck-engine 0.3.0 → 0.3.1

data/README.rdoc

@@ -89,6 +89,23 @@ easing - http://gsgd.co.uk/sandbox/jquery/easing/
 fancyzoom - http://orderedlist.com/articles/fancyzoom-meet-jquery
 
 
+=== jGrowl
+If you wish to enable jgrowl then add the following lines to application.js and customize each as desired:
+
+  jQuery.jGrowl.defaults.position = 'center';
+
+  jQuery.jGrowl.info = function(msg){
+  	jQuery.jGrowl(msg);
+  }
+
+  jQuery.jGrowl.warn = function(msg){
+  	jQuery.jGrowl(msg);
+  }
+
+  jQuery.jGrowl.error = function(msg){
+  	jQuery.jGrowl(msg, {sticky:true});
+  }
+
 == Rake tasks
 The muck engine comes with an abundance of rake tasks mostly meant for development of muck engines.  If you want to use these tasks
 be sure that you first do a sudo install muck-engine.  Next define the muck gems you are using in a file RAILS_ROOT/lib/tasks/muck.rake.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/helpers/muck_engine_helper.rb

@@ -37,21 +37,21 @@ module MuckEngineHelper
   end
   
   def output_flash(options = {})
-    output_errors('', options)
+    output_errors('', options, nil, true)
   end
   
-  def output_errors(title, options = {}, fields = nil)
+  def output_errors(title, options = {}, fields = nil, flash_only = false)
     fields = [fields] unless fields.is_a?(Array)
     flash_html = render(:partial => 'shared/flash_messages')
     flash.clear
-    field_errors = render(:partial => 'shared/field_error', :collection => fields)
     css_class = "class=\"#{options[:class]}\"" unless options[:class].nil?
+    field_errors = render(:partial => 'shared/field_error', :collection => fields)
     
-    if !flash_html.empty? && field_errors.empty?
-      # only flash.  Don't render the 
+    if flash_only || (!flash_html.empty? && field_errors.empty?)
+      # Only flash.  Don't render errors for any fields
       render(:partial => 'shared/flash_error_box', :locals => {:flash_html => flash_html, :css_class => css_class})
     elsif !field_errors.empty?
-      # field errors and/or flash
+      # Field errors and/or flash
       render(:partial => 'shared/error_box', :locals => {:title => title, 
         :flash_html => flash_html, 
         :field_errors => field_errors,

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-22}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

data/test/rails_root/public/javascripts/muck.js

@@ -92,20 +92,6 @@ function setup_country(force_load){
 	}
 }
 
-jQuery.jGrowl.defaults.position = 'center';
-
-jQuery.jGrowl.info = function(msg){
-	jQuery.jGrowl(msg);
-}
-
-jQuery.jGrowl.warn = function(msg){
-	jQuery.jGrowl(msg);	
-}
-
-jQuery.jGrowl.error = function(msg){
-	jQuery.jGrowl(msg, {sticky:true,header:"Please correct the following errors:"});	
-}
-
 jQuery(document).ready(function() {
 	jQuery("#global-login").focus(function() {
 		jQuery("#global-login").val("");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -07:00
+date: 2010-01-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency