muck-engine 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

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

@@ -29,17 +29,4 @@ class Admin::Muck::BaseController < ApplicationController
       end
     end
 
-    # 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)
-      @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_custom_form_builder.rb

@@ -45,16 +45,22 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
       :css_class    => options.delete(:css_class)
     }
     # TODO css_class does not appear to be used. Can just use the standard :class in html options to set the class
-        
+    
+    is_checkbox = false
+    is_checkbox = true if %w(check_box).include?(name)
+    
     type = options.delete(:type)
     type ||= :tippable if tippable
 
-    if !options[:label_class].nil?
-      label_options = { :class => options.delete(:label_class) }
+    label_class = ''
+    label_class << "checkbox-label" if is_checkbox
+    label_class << " #{options.delete(:label_class)}" if !options[:label_class].nil?
+    if label_class.blank?
+      label_options = {}
     else
-      label_options = { }
+      label_options = { :class => label_class }
     end
-
+  
     if local_options[:hide_required]
       required = false
       label_text = options[:label]
@@ -65,9 +71,6 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
     end
     label_name = options.delete(:label)
 
-    is_checkbox = false
-    is_checkbox = true if %w(check_box).include?(name)
-
     options[:class] ||= ''
     options[:class] << add_space_to_css(options) + 'tip-field' if tippable
     options[:class] << add_space_to_css(options) + "required-value" if required

data/lib/muck_engine/flash_errors.rb

@@ -30,5 +30,14 @@ class MuckEngine
       end
     end
     
+    # 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)
+      @fields = fields
+      @title = title
+      @options = options
+      @flash_only = flash_only
+      render :partial => 'admin/shared/output_admin_messages'
+    end
+    
   end
 end

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   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-02-01}
+  s.date = %q{2010-02-04}
   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,7 +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/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",

data/public/javascripts/jquery/jquery.tips.js

@@ -1,5 +1,5 @@
 jQuery(document).ready(function() {
-	jQuery(".tip-field").focus(function() {
+	jQuery(".tip-field").live('focus', function() {
 		jQuery(".active").removeClass("active");
 		var tip_key = jQuery('#' + this.id).siblings('.tip-key');
 		var control_id = this.id;
@@ -22,7 +22,7 @@ jQuery(document).ready(function() {
 		jQuery("#" + help_id + "-container").addClass("active");
 	});
 
-	jQuery(".tip-field").blur(function() {
+	jQuery(".tip-field").live('blur', function() {
 		jQuery('#' + this.id + '-tip').hide(1);
 	});
 });

data/public/javascripts/muck.js

@@ -22,9 +22,16 @@ function add_headers(xhr){
 }
 
 jQuery(document).ready(function() {
-	
+
   jQuery('a.ajax-delete').live('click', function() {
-    jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    var title = jQuery(this).attr('title');
+    var do_delete = true;
+    if(title.length > 0){
+      do_delete = confirm(title);
+    }
+    if (do_delete){
+      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    }
     return false;
   });
 
@@ -33,15 +40,15 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery(".submit-form").click(function() {
+  jQuery(".submit-form").click(function() {
     jQuery(this).parent('form').submit();
   });
 
-	apply_ajax_forms();
-	
-	jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
-	
-	jQuery('a.dialog-pop').live('click', function() {
+  apply_ajax_forms();
+
+  jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
+
+  jQuery('a.dialog-pop').live('click', function() {
     var d = jQuery('<div class="dialog"></div>').appendTo("body");
     d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
     d.load(jQuery(this).attr('href'), '', function(){

data/public/stylesheets/admin.css

@@ -1,5 +1,6 @@
 /* header */
 a {color:#000;}
+fieldset {border:none;}
 #main-navigation{}
 #account-navigation {}
 .navigation ul{padding:2px;margin:0;}
@@ -26,9 +27,10 @@ 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:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#errorExplanation #field-errors{margin:0;padding:0.4em 1.5em;width:96%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
 #admin-messages{display:none;}
-
+/* ui elements */
+#ui-datepicker-div{z-index:2005;}
 /* 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/public/stylesheets/styles.css

@@ -37,7 +37,7 @@ ul.icon-list a{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-dec
 .availability{color:#b61e12;position:absolute;}
 .hidden-tips{display:none;}
 .required-tip{color:#555555;font-size:1.2em;margin:0pt;font-weight:bolder;height:0px;}
-.tip{position:absolute;z-index:100;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
+.tip{position:absolute;z-index:2000;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
 #tip-title{font-size:1.1em;background-color:#CCCCCC;text-align:left;padding:2px 0px 5px 8px;font-weight:bold;}
 #tip-main{padding:10px;color:#333333;}
 #tip-main p,#tip-main ul{font-size:1.3em;}

data/test/rails_root/public/javascripts/jquery/jquery.tips.js

@@ -1,5 +1,5 @@
 jQuery(document).ready(function() {
-	jQuery(".tip-field").focus(function() {
+	jQuery(".tip-field").live('focus', function() {
 		jQuery(".active").removeClass("active");
 		var tip_key = jQuery('#' + this.id).siblings('.tip-key');
 		var control_id = this.id;
@@ -22,7 +22,7 @@ jQuery(document).ready(function() {
 		jQuery("#" + help_id + "-container").addClass("active");
 	});
 
-	jQuery(".tip-field").blur(function() {
+	jQuery(".tip-field").live('blur', function() {
 		jQuery('#' + this.id + '-tip').hide(1);
 	});
 });

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

@@ -22,9 +22,16 @@ function add_headers(xhr){
 }
 
 jQuery(document).ready(function() {
-	
+
   jQuery('a.ajax-delete').live('click', function() {
-    jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    var title = jQuery(this).attr('title');
+    var do_delete = true;
+    if(title.length > 0){
+      do_delete = confirm(title);
+    }
+    if (do_delete){
+      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    }
     return false;
   });
 
@@ -33,15 +40,15 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery(".submit-form").click(function() {
+  jQuery(".submit-form").click(function() {
     jQuery(this).parent('form').submit();
   });
 
-	apply_ajax_forms();
-	
-	jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
-	
-	jQuery('a.dialog-pop').live('click', function() {
+  apply_ajax_forms();
+
+  jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
+
+  jQuery('a.dialog-pop').live('click', function() {
     var d = jQuery('<div class="dialog"></div>').appendTo("body");
     d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
     d.load(jQuery(this).attr('href'), '', function(){

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

@@ -1,5 +1,6 @@
 /* header */
 a {color:#000;}
+fieldset {border:none;}
 #main-navigation{}
 #account-navigation {}
 .navigation ul{padding:2px;margin:0;}
@@ -26,9 +27,10 @@ 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:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#errorExplanation #field-errors{margin:0;padding:0.4em 1.5em;width:96%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
 #admin-messages{display:none;}
-
+/* ui elements */
+#ui-datepicker-div{z-index:2005;}
 /* 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/stylesheets/styles.css

@@ -37,7 +37,7 @@ ul.icon-list a{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-dec
 .availability{color:#b61e12;position:absolute;}
 .hidden-tips{display:none;}
 .required-tip{color:#555555;font-size:1.2em;margin:0pt;font-weight:bolder;height:0px;}
-.tip{position:absolute;z-index:100;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
+.tip{position:absolute;z-index:2000;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
 #tip-title{font-size:1.1em;background-color:#CCCCCC;text-align:left;padding:2px 0px 5px 8px;font-weight:bold;}
 #tip-main{padding:10px;color:#333333;}
 #tip-main p,#tip-main ul{font-size:1.3em;}
@@ -55,7 +55,7 @@ ul.icon-list a{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-dec
 .bottom-tip #tip-header, .right-tip #tip-header{background-position:left top;}
 
 /*jGrowl*/
-div.jGrowl{padding:10px;z-index:9999;}
+div.jGrowl{padding:10px;z-index:9999;color:#fff;font-size:12px;}
 /** Special IE6 Style Positioning **/
 div.ie6{position:absolute;}
 div.ie6.top-right{right:auto;bottom:auto;left:expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth :document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );}
@@ -72,14 +72,15 @@ body > div.jGrowl.bottom-right{right:0px;bottom:0px;}
 body > div.jGrowl.center{top:0px;width:50%;left:25%;}
 /** Cross Browser Styling **/
 div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto;}
-div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#F0F7F9;color:#000;opacity:.95;filter:alpha(opacity = 95);zoom:1;width:550px;padding:10px;margin-top:5px;margin-bottom:5px;font-size:1.5em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px;border:solid 3px #555;}
+div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;opacity:.85;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=85);zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px;}
 div.jGrowl div.jGrowl-notification{min-height:40px;}
-div.jGrowl div.jGrowl-notification div.header{font-weight:bold;font-size:1.6em;}
-div.jGrowl div.jGrowl-notification div.close{float:right;font-weight:bold;font-size:2em;cursor:pointer;color:#555;}
-div.jGrowl div.jGrowl-notification div.close:hover{color:#ccc;}
-div.jGrowl div.jGrowl-closer{height:15px;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:11px;font-weight:bold;text-align:center;}
-div.jGrowl div.jGrowl-notification .notice, div.jGrowl div.jGrowl-notification .error, div.jGrowl div.jGrowl-notification .success{background:none;border:none;}
-div.jGrowl div.jGrowl-notification h2{text-align:left;font-weight:bold;padding:5px 5px 5px 15px;font-size:1.1em;}
+div.jGrowl div.jGrowl-notification div.header{font-weight:bold;font-size:.85em;}
+div.jGrowl div.jGrowl-notification div.close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer;}
+div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center;}
+/** Hide jGrowl when printing **/
+@media print{div.jGrowl{display:none;}
+}
+
 
 /* Errors */
 .help-box{font-size:1.2em;color:#555;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -07:00
+date: 2010-02-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +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/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