muck-engine 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/controllers/admin/muck/base_controller.rb

@@ -31,9 +31,15 @@ class Admin::Muck::BaseController < ApplicationController
 
     # Output a page update that will display messages in the flash
     def output_admin_messages(fields = nil, title = '', options = { :class => 'notify-box' }, flash_only = false)
-      render :update do |page|
-        page.replace_html 'admin-messages', output_errors(title, options, fields, flash_only)
-      end
+      @fields = fields
+      @title = title
+      @options = options
+      @flash_only = flash_only
+      render :template => 'admin/shared/output_admin_messages', :layout => false
     end
     
+    def output_admin_messages
+    
+    end
+
 end

data/app/helpers/muck_admin_helper.rb

@@ -10,4 +10,9 @@ module MuckAdminHelper
     end
   end
   
+  # Generates a string that will hide admin messages.
+  def hide_admin_messages
+    "jQuery('#admin-messages').hide();"
+  end
+  
 end

data/app/helpers/muck_custom_form_builder.rb

@@ -113,6 +113,7 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+  # Call '<%= country_scripts %>' to render javascript that will change the state control based on the current country 
   # creates a select control with us states.  Default id is 'us_states'.  If 'retain' is passed for the class value the value of this
   # control will be written into a cookie with the key 'us_states'.
   def us_state_select(method, options = {}, html_options = {}, additional_state = nil)

data/app/helpers/muck_engine_helper.rb

@@ -23,6 +23,13 @@ module MuckEngineHelper
     end
   end
   
+  # Outputs scripts that manipulate the country and state select controls
+  def country_scripts
+    return if @@country_scripts_included
+    @@country_scripts_included = true
+    render :partial => 'scripts/country_scripts'
+  end
+  
   def custom_form_for(record_or_name_or_array, *args, &proc) 
     options = args.detect { |argument| argument.is_a?(Hash) } 
     if options.nil? 
@@ -131,11 +138,11 @@ module MuckEngineHelper
   
   # Used inside of format.js to return a message to the client.
   # If jGrowl is enabled the message will show up as a growl instead of a popup
-  def page_alert(page, message, title = '')
+  def page_alert(message, title = '')
     if GlobalConfig.growl_enabled
-      page << "jQuery.jGrowl.error('" + message + "', {header:'" + title + "'});"
+      "jQuery.jGrowl.error('" + message + "', {header:'" + title + "'});"
     else
-      page.alert(message)
+      "alert(#{message});"
     end
   end
   

data/app/views/admin/shared/output_admin_messages.js.erb

@@ -0,0 +1,2 @@
+jQuery('#admin-messages').html('<%= escape_javascript(output_errors(@title, @options, @fields, @flash_only))%>');
+jQuery('#admin-messages').show();

data/app/views/forms/_color_picker_field.html.erb

@@ -21,7 +21,7 @@
 				jQuery('#colorSelectorDisplay<%=html_id%>').css('backgroundColor', '#' + hex);
 				jQuery('#<%=field_name%>').val(hex);
 			}
-		});		
+		});
 	});
 	</script>
 </div>

data/app/views/scripts/_country_scripts.html.erb

@@ -0,0 +1,3 @@
+<% content_for :head do -%>
+  <%= javascript_include_tag 'muck-countries' %>
+<% end -%>

data/app/views/shared/_error_box.html.erb

@@ -1,5 +1,7 @@
 <div <%=css_class%> id="errorExplanation">
-  <h2><%= title %></h2>
+  <% if !title.blank? -%>
+    <h2><%= title %></h2>
+  <% end -%>
   <%= flash_html %>
   <%= field_errors %>
   <%= extra_html %>

data/lib/muck_engine/flash_errors.rb

@@ -1,24 +1,26 @@
 class MuckEngine
   module FlashErrors
     
+    # Output only flash errors
     def output_flash(options = {})
       output_errors('', options, nil, true)
     end
 
+    # Output flash and object errors
     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
-      css_class = "class=\"#{options[:class]}\"" unless options[:class].nil?
+      css_class = "class=\"#{options[:class] || 'error'}\"" unless options[:class].nil?
       field_errors = render(:partial => 'shared/field_error', :collection => fields)
-  
+
       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
-        render(:partial => 'shared/error_box', :locals => {:title => title, 
-          :flash_html => flash_html, 
+        render(:partial => 'shared/error_box', :locals => {:title => title,
+          :flash_html => flash_html,
           :field_errors => field_errors,
           :css_class => css_class,
           :extra_html => options[:extra_html]})

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.0"
+  s.version = "0.4.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-30}
+  s.date = %q{2010-02-01}
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "app/models/language.rb",
      "app/models/state.rb",
      "app/views/admin/default/index.html.erb",
+     "app/views/admin/shared/output_admin_messages.js.erb",
      "app/views/forms/_base_field.html.erb",
      "app/views/forms/_color_picker_field.html.erb",
      "app/views/forms/_default.html.erb",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
      "app/views/layouts/global/_google_analytics.html.erb",
      "app/views/layouts/global/_head.html.erb",
      "app/views/layouts/popup.html.erb",
+     "app/views/scripts/_country_scripts.html.erb",
      "app/views/scripts/_parse_uri.html.erb",
      "app/views/scripts/_time_scripts.html.erb",
      "app/views/shared/_delete.html.erb",
@@ -541,6 +543,7 @@ Gem::Specification.new do |s|
      "public/javascripts/jquery/jquery.swapimage.min.js",
      "public/javascripts/jquery/jquery.tips.js",
      "public/javascripts/jquery/jrails.js",
+     "public/javascripts/muck-countries.js",
      "public/javascripts/muck.js",
      "public/javascripts/muck_time/en.js",
      "public/javascripts/tree.js",

data/public/javascripts/muck-countries.js

@@ -0,0 +1,50 @@
+function setup_country(force_load){
+
+	var country_id = jQuery("#countries").val();
+	var state_id = jQuery("#states").val();
+
+	if (country_id == undefined){ 
+		return; 
+	}
+
+	if (country_id == '-1'){
+		jQuery("#states").val('-1');
+		jQuery("#counties").val('-1');
+	}
+
+	if (country_id == '-1' || country_id == ''){
+		jQuery("#states-container").hide();
+		jQuery("#counties-container").hide();
+		return;
+	}
+
+	if(force_load || state_id == '' || state_id == null || state_id == -1) {
+		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
+			var options = '';
+			jQuery("#counties-container").hide();
+			jQuery('#states-container label').html(data.label);
+			states = data.states;
+			if(states.length > 0){
+				for (var i = 0; i < states.length; i++) {
+					var state_id = states[i].state.id;
+					if(state_id == undefined) { state_id = ''; }
+					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
+				}
+				jQuery("#states-container").show();
+				jQuery("select#states").html(options);
+			} else {
+				jQuery("#states-container").hide();
+			}
+		});
+	}
+}
+
+jQuery(document).ready(function() {
+  jQuery("#countries-container select").change(function() {
+		setup_country(true);
+  });
+	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
+		jQuery("#states-container").hide();
+	}
+	setup_country(false);
+});

data/public/javascripts/muck.js

@@ -8,88 +8,6 @@ jQuery(document).ajaxSend(function(event, request, settings) {
   	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
 });
 
-function setup_submit_delete(){
-	jQuery(".submit-delete").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.json', form.serialize(),
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        }
-      });
-    return false;
-  });
-	jQuery(".submit-delete-js").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.js', form.serialize(),
-      function(data){
-      });
-    return false;
-  });
-}
-
-function show_hide_obj (ary_objs_to_show, ary_objs_to_hide)
-{
- 	for (i=0;i<ary_objs_to_show.length;i++) {
- 		if (obj_to_show = document.getElementById(ary_objs_to_show[i])) obj_to_show.style.display="";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_show[i])) tab.className = 'curTab';
- 	}
- 	for (i=0;i<ary_objs_to_hide.length;i++) {
- 		if (obj_to_hide = document.getElementById(ary_objs_to_hide[i])) obj_to_hide.style.display="none";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_hide[i])) tab.className = '';
- 	}
-}
-
-function setup_country(force_load){
-
-	var country_id = jQuery("#countries").val();
-	var state_id = jQuery("#states").val();
-
-	if (country_id == undefined){ 
-		return; 
-	}
-
-	if (country_id == '-1'){
-		jQuery("#states").val('-1');
-		jQuery("#counties").val('-1');
-	}
-
-	if (country_id == '-1' || country_id == ''){
-		jQuery("#states-container").hide();
-		jQuery("#counties-container").hide();
-		return;
-	}
-
-	if(force_load || state_id == '' || state_id == null || state_id == -1) {
-		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
-			var options = '';
-			jQuery("#counties-container").hide();
-			jQuery('#states-container label').html(data.label);
-			states = data.states;
-			if(states.length > 0){
-				for (var i = 0; i < states.length; i++) {
-					var state_id = states[i].state.id;
-					if(state_id == undefined) { state_id = ''; }
-					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
-				}
-				jQuery("#states-container").show();
-				jQuery("select#states").html(options);
-			} else {
-				jQuery("#states-container").hide();
-			}
-		});
-	}
-}
-
 function apply_ajax_forms() {
   jQuery('form.ajax').ajaxForm({
     dataType: 'script',
@@ -133,21 +51,26 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery("#global-login").focus(function() {
-		jQuery("#global-login").val("");
-	});
-	jQuery("#global-password").focus(function() {
-		jQuery("#global-password").val("");
-	});
-	jQuery("#quick-login-submit").click(function() {
-		jQuery("#quick-login").submit();
-	});
-	
-	jQuery("#countries-container select").change(function() {
-		setup_country(true);
+  jQuery(".submit-delete").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.json', form.serialize(),
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+  
+  jQuery(".submit-delete-js").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.js', form.serialize(),
+      function(data){
+      });
+    return false;
   });
-	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
-		jQuery("#states-container").hide();
-	}
-	setup_country(false);
+
 });

data/public/stylesheets/admin.css

@@ -26,7 +26,9 @@ ul.admin-list li a{font-size:1.2em;}
 /* errors, message */
 .notify-box{font-size:1.2em;color:#555;width:100%}
 .error,.notice,.success {margin:0;}
-#errorExplanation{margin:0;padding:0;}
+#errorExplanation{margin:0;padding:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#admin-messages{display:none;}
+
 /* tables */
 .adminTable{margin:5px 0 0 0;padding:0 0 40px 0px;width:980px;}
 .adminTable a{color:#000;text-decoration:none;font-weight:bold;}

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

@@ -8,88 +8,6 @@ jQuery(document).ajaxSend(function(event, request, settings) {
   	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
 });
 
-function setup_submit_delete(){
-	jQuery(".submit-delete").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.json', form.serialize(),
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        }
-      });
-    return false;
-  });
-	jQuery(".submit-delete-js").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.js', form.serialize(),
-      function(data){
-      });
-    return false;
-  });
-}
-
-function show_hide_obj (ary_objs_to_show, ary_objs_to_hide)
-{
- 	for (i=0;i<ary_objs_to_show.length;i++) {
- 		if (obj_to_show = document.getElementById(ary_objs_to_show[i])) obj_to_show.style.display="";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_show[i])) tab.className = 'curTab';
- 	}
- 	for (i=0;i<ary_objs_to_hide.length;i++) {
- 		if (obj_to_hide = document.getElementById(ary_objs_to_hide[i])) obj_to_hide.style.display="none";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_hide[i])) tab.className = '';
- 	}
-}
-
-function setup_country(force_load){
-
-	var country_id = jQuery("#countries").val();
-	var state_id = jQuery("#states").val();
-
-	if (country_id == undefined){ 
-		return; 
-	}
-
-	if (country_id == '-1'){
-		jQuery("#states").val('-1');
-		jQuery("#counties").val('-1');
-	}
-
-	if (country_id == '-1' || country_id == ''){
-		jQuery("#states-container").hide();
-		jQuery("#counties-container").hide();
-		return;
-	}
-
-	if(force_load || state_id == '' || state_id == null || state_id == -1) {
-		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
-			var options = '';
-			jQuery("#counties-container").hide();
-			jQuery('#states-container label').html(data.label);
-			states = data.states;
-			if(states.length > 0){
-				for (var i = 0; i < states.length; i++) {
-					var state_id = states[i].state.id;
-					if(state_id == undefined) { state_id = ''; }
-					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
-				}
-				jQuery("#states-container").show();
-				jQuery("select#states").html(options);
-			} else {
-				jQuery("#states-container").hide();
-			}
-		});
-	}
-}
-
 function apply_ajax_forms() {
   jQuery('form.ajax').ajaxForm({
     dataType: 'script',
@@ -133,21 +51,26 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery("#global-login").focus(function() {
-		jQuery("#global-login").val("");
-	});
-	jQuery("#global-password").focus(function() {
-		jQuery("#global-password").val("");
-	});
-	jQuery("#quick-login-submit").click(function() {
-		jQuery("#quick-login").submit();
-	});
-	
-	jQuery("#countries-container select").change(function() {
-		setup_country(true);
+  jQuery(".submit-delete").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.json', form.serialize(),
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+  
+  jQuery(".submit-delete-js").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.js', form.serialize(),
+      function(data){
+      });
+    return false;
   });
-	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
-		jQuery("#states-container").hide();
-	}
-	setup_country(false);
+
 });

data/test/rails_root/public/stylesheets/admin.css

@@ -26,7 +26,9 @@ ul.admin-list li a{font-size:1.2em;}
 /* errors, message */
 .notify-box{font-size:1.2em;color:#555;width:100%}
 .error,.notice,.success {margin:0;}
-#errorExplanation{margin:0;padding:0;}
+#errorExplanation{margin:0;padding:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#admin-messages{display:none;}
+
 /* tables */
 .adminTable{margin:5px 0 0 0;padding:0 0 40px 0px;width:980px;}
 .adminTable a{color:#000;text-decoration:none;font-weight:bold;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -07:00
+date: 2010-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - app/models/language.rb
 - app/models/state.rb
 - app/views/admin/default/index.html.erb
+- app/views/admin/shared/output_admin_messages.js.erb
 - app/views/forms/_base_field.html.erb
 - app/views/forms/_color_picker_field.html.erb
 - app/views/forms/_default.html.erb
@@ -97,6 +98,7 @@ files:
 - app/views/layouts/global/_google_analytics.html.erb
 - app/views/layouts/global/_head.html.erb
 - app/views/layouts/popup.html.erb
+- app/views/scripts/_country_scripts.html.erb
 - app/views/scripts/_parse_uri.html.erb
 - app/views/scripts/_time_scripts.html.erb
 - app/views/shared/_delete.html.erb
@@ -587,6 +589,7 @@ files:
 - public/javascripts/jquery/jquery.swapimage.min.js
 - public/javascripts/jquery/jquery.tips.js
 - public/javascripts/jquery/jrails.js
+- public/javascripts/muck-countries.js
 - public/javascripts/muck.js
 - public/javascripts/muck_time/en.js
 - public/javascripts/tree.js