muck-engine 3.2.10 → 3.3.0

data/VERSION

@@ -1 +1 @@
-3.2.10
+3.3.0

data/app/views/forms/_color_picker_field.erb

@@ -5,6 +5,7 @@
 	<div id="colorSelector<%=html_id%>" class="color-selector">
 		<div id="colorSelectorDisplay<%=html_id%>" style="background-color:#<%=color%>;"></div>
 	</div>
+	<% content_for :javascript do -%>
 	<script type="text/javascript" language="JavaScript">
 	jQuery(document).ready(function() {
 		jQuery('#colorSelector<%=html_id%>').ColorPicker({
@@ -24,4 +25,5 @@
 		});
 	});
 	</script>
+	<% end -%>
 </div>

data/app/views/layouts/admin.html.erb

@@ -15,5 +15,6 @@
 		  </div>
 		</div>
 		<%= render :partial => 'layouts/admin/footer' %>
+		<%= yield :javascript %>
 	</body>
 </html>

data/app/views/layouts/admin/_footer.html.erb

@@ -1,7 +1,3 @@
 <div id="footer">
 
-</div>
-
-<script type="text/javascript" language="JavaScript">
-  <%= yield :javascript %>
-</script>
+</div>

data/app/views/layouts/admin/_head.html.erb

@@ -1,20 +1,12 @@
 <title><%= @page_title || MuckEngine.configuration.application_name %></title>
 <meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
-<%= google_load_jquery_ui_css(http_protocol, 'smoothness', '1.8.9') %>
-<%= stylesheet_link_tag 'blueprint/print.css', :media => "print" %>
-<!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-<%= stylesheet_link_tag %W{ reset styles blueprint/liquid_screen jquery/jquery.autocomplete jquery/jquery.fancybox admin }, :cache => 'admin_styles' %>
-<%= stylesheet_link_tag MuckEngine.configuration.muck_admin_css -%>
-<%= google_load_jquery(http_protocol, '1.5.1') %>
-<%= google_load_jquery_ui(http_protocol, '1.8.9') %>
-<%= javascript_include_tag %w{
-  jquery/jquery.form.js
-  jquery/jquery.jgrowl.js
-  jquery/jquery.tips.js
-  jquery/jquery.fancybox.js
-  rails.js
-  muck_admin.js
-  muck.js
-  application.js }, :cache => 'admin_js_cached' %>
+<meta http-equiv="imagetoolbar" content="no" />
+<meta name="distribution" content="all" />
+<meta name="robots" content="all" />	
+<meta name="resource-type" content="document" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+<%= include_stylesheets :admin -%>
+<%= include_javascripts :admin -%>
 <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
-<%= yield :head -%>
+<%= yield :head -%>
+<%= csrf_meta_tag %>

data/app/views/layouts/global/_head.html.erb

@@ -5,25 +5,8 @@
 <meta name="robots" content="all" />	
 <meta name="resource-type" content="document" />
 <meta name="MSSmartTagsPreventParsing" content="true" />
-<%= stylesheet_link_tag 'blueprint/print.css', :media => "print" %>
-<!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-<% if MuckEngine.configuration.local_jquery -%>
-  <link rel="stylesheet" href="/stylesheets/jquery/smoothness/jquery-ui-1.8.4.custom.css" type="text/css" />
-  <script src="/javascripts/jquery/jquery.js" type="text/javascript"></script>
-  <script src="/javascripts/jquery/jquery-ui-1.8.4.custom.min.js" type="text/javascript"></script>
-<% else -%>
-  <%= google_load_jquery_ui_css(http_protocol, 'smoothness', '1.8.4') %>
-  <%= google_load_jquery(http_protocol, '1.4.2') %>
-  <%= google_load_jquery_ui(http_protocol, '1.8.4') %>
-<% end -%>
-<%= stylesheet_link_tag %W{ reset styles blueprint/screen.css default }, :cache => true %>
-<%= javascript_include_tag %w{
-  jquery/jquery.form.js
-  jquery/jquery.jgrowl.js
-  jquery/jquery.tips.js
-  jquery/jquery.easing.js
-  jquery/jquery.fancybox.js
-  muck.js
-  application.js }, :cache => 'all_js_cached' %>
+<%= include_stylesheets :common %>
+<%= include_javascripts :common, :site %>
 <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
-<%= yield :head -%>
+<%= yield :head -%>
+<%= csrf_meta_tag %>

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

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

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

@@ -1,4 +1,5 @@
-<script type="text/javascript">
+<% content_for :javascript do -%>
+<script type="text/javascript" language="JavaScript">
 // parseUri 1.2.2
 // (c) Steven Levithan <stevenlevithan.com>
 // MIT License
@@ -27,4 +28,5 @@ parseUri.options = {
     loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
   }
 };
-</script>
+</script>
+<% end -%>

data/app/views/shared/_growl.erb

@@ -1,5 +1,6 @@
 <% if MuckEngine.configuration.growl_enabled -%>
-  <script type="text/javascript">
+  <% content_for :javascript do -%>
+  <script type="text/javascript" language="JavaScript">
   jQuery(document).ready(function() {
     jQuery('#errorExplanation').hide();
     var message = jQuery('#errorExplanation').html();
@@ -13,4 +14,5 @@
     }
   });
   </script>
+  <% end -%>
 <% end -%>

data/app/views/shared/_growl_box.erb

@@ -1,3 +1,5 @@
 <% content_for :javascript do -%>
+  <script type="text/javascript" language="JavaScript">
   jQuery.jGrowl('<%=msg%>', <%=options%>);
+  </script>
 <% end -%>

data/lib/muck-engine/config.rb

@@ -69,15 +69,6 @@ module MuckEngine
       muck_dashboard_items << OpenStruct.new(:path => path,
                                              :locals => locals)
     end
-
-    def muck_admin_css
-      @@muck_admin_css ||= [] 
-    end
-
-    # Add css for the admin UI
-    def add_muck_admin_css(css_file)
-      muck_admin_css << css_file
-    end
       
     def initialize
       self.application_url = 'localhost:3000' 

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "3.2.10"
+  s.version = "3.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-03-15}
+  s.date = %q{2011-03-19}
   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 = [
@@ -151,10 +151,9 @@ Gem::Specification.new do |s|
     "lib/test/shoulda_macros/plugins.rb",
     "lib/test/shoulda_macros/scopes.rb",
     "muck-engine.gemspec",
-    "public/javascripts/muck-countries.js",
-    "public/javascripts/muck-src.js",
     "public/javascripts/muck.js",
     "public/javascripts/muck_admin.js",
+    "public/javascripts/muck_countries.js",
     "public/javascripts/muck_time/en.js",
     "public/stylesheets/admin.css",
     "public/stylesheets/reset.css",

data/public/javascripts/muck.js

@@ -1,5 +1,149 @@
-jQuery(document).ajaxSend(function(a,b,c){add_headers(b);if(!(c.type.toUpperCase()=="GET"||typeof AUTH_TOKEN=="undefined")){c.data=c.data||"";if(typeof AUTH_TOKEN!="undefined")c.data+=(c.data?"&":"")+"authenticity_token="+encodeURIComponent(AUTH_TOKEN)}});function apply_ajax_forms(){jQuery("form.ajax").ajaxForm({dataType:"script",beforeSend:add_headers});jQuery("form.ajax").append('<input type="hidden" name="format" value="js" />')}
-function add_headers(a){a.setRequestHeader("Accept","text/javascript");a.setRequestHeader("X-Requested-With","XMLHttpRequest")}
-jQuery(document).ready(function(){jQuery("a.ajax-delete").live("click",function(){var a=jQuery(this).attr("title"),b=true;if(a.length>0)b=confirm(a);b&&jQuery.post(this.href,{_method:"delete",format:"js"},null,"script");return false});jQuery("a.ajax-update").live("click",function(){jQuery.post(this.href,{_method:"put",format:"js"},null,"script");return false});jQuery(".submit-form").click(function(){jQuery(this).parent("form").submit()});apply_ajax_forms();jQuery("a.dialog-pop").live("click",function(){var a=
-jQuery('<div class="dialog"></div>').appendTo("body");a.dialog({modal:true,autoOpen:false,width:"auto",title:jQuery(this).attr("title")});a.load(jQuery(this).attr("href"),"",function(){a.dialog("open");apply_ajax_forms()});return false});jQuery(".submit-delete").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".json",a.serialize(),function(b){b=eval("("+b+")");b.success||jQuery.jGrowl.info(b.message)});return false});
-jQuery(".submit-delete-js").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".js",a.serialize(),function(){});return false});jQuery(document).ready(function(){jQuery(".waiting").hide();jQuery(".wait-button").click(function(){jQuery(".waiting").show();jQuery(this).hide()})})});
+// compress with http://closure-compiler.appspot.com/home
+//jQuery.noConflict();
+jQuery(document).ajaxSend(function(event, request, settings) {
+  add_headers(request);
+  if (settings.type.toUpperCase() == 'GET' || typeof(AUTH_TOKEN) == "undefined") return; // for details see: http://www.justinball.com/2009/07/08/jquery-ajax-get-in-firefox-post-in-internet-explorer/
+  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
+  settings.data = settings.data || "";
+ 	if (typeof(AUTH_TOKEN) != "undefined")
+  	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
+});
+
+function apply_ajax_forms() {
+  jQuery('form.ajax').ajaxForm({
+    dataType: 'script',
+    beforeSend: add_headers
+  });
+	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
+}
+
+function add_headers(xhr){
+	xhr.setRequestHeader("Accept", "text/javascript");
+	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+}
+
+jQuery(document).ready(function() {
+
+  jQuery('a.ajax-delete').live('click', function() {
+    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;
+  });
+
+  jQuery('a.ajax-update').live('click', function() {
+    jQuery.post(this.href, { _method: 'put', format: 'js' }, null, "script");
+    return false;
+  });
+
+  jQuery(".submit-form").click(function() {
+    jQuery(this).parent('form').submit();
+  });
+	
+	//jQuery("ul.drop-menu").menu();
+	
+  apply_ajax_forms();
+
+  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(){
+      d.dialog("open");
+      apply_ajax_forms();
+    });
+    return false;
+  });
+
+  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;
+  });
+
+  jQuery(document).ready(function() {
+    jQuery('.waiting').hide();
+    jQuery(".wait-button").live('click', function() {
+      jQuery(this).siblings('.waiting').show();
+      jQuery(this).hide();
+    });
+  });
+
+});
+
+// String list methods. These are handy for dealing with comma delimited lists
+// in text boxes such as a list of emails or tags.
+// Given a comma delimited string add a new item if it isn't in the string
+function add_to_list(items_string, new_item){
+  var items = split_list(items_string);
+  var add = true;
+  for(i=0;i<items.length;i++){
+    if(items[i] == new_item){ add = false; }
+  }
+  if(add){ 
+    items.push(new_item);
+  }
+  return items.join(', ');
+}
+
+// Given a comma delimited list remove an item from the string
+function remove_from_list(items_string, remove_item){
+  var items = split_list(items_string);
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    if(items[i] != remove_item){
+      cleaned.push(items[i]);
+    }
+  }
+  return cleaned.join(', ');
+}
+
+// Split a string on commas
+function split_list(items_string){
+  if(undefined != items_string && items_string.length > 0){
+    var items = items_string.split(',');
+  } else {
+    var items = [];
+  }
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    var cleaned_item = jQuery.trim(items[i]);
+    if(cleaned_item.length > 0){ 
+      cleaned.push(cleaned_item); 
+    }
+  }
+  return cleaned;
+}
+
+function isEncodedHtml(str) { 
+  if(str.search(/&amp;/g) != -1 || str.search(/&lt;/g) != -1 || str.search(/&gt;/g) != -1) 
+    return true; 
+  else 
+    return false; 
+}; 
+ 
+function decodeHtml(str){ 
+    if(isEncodedHtml(str)) 
+      return str.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>'); 
+    return str; 
+}

data/public/javascripts/muck_admin.js

@@ -1,13 +0,0 @@
- jQuery(function(){
-	// BUTTONS
-	jQuery('.fg-button').hover(
-		function(){ jQuery(this).removeClass('ui-state-default').addClass('ui-state-focus'); },
-		function(){ jQuery(this).removeClass('ui-state-focus').addClass('ui-state-default'); }
-	);
-	jQuery('.flat').each(function() {
-		jQuery(this).menu({ 
-			content: jQuery(this).next().html(), // grab content from this page
-			showSpeed: 200 
-		});
-	});
-});

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
-  - 10
-  version: 3.2.10
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -06:00
+date: 2011-03-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -418,10 +418,9 @@ files:
 - lib/test/shoulda_macros/plugins.rb
 - lib/test/shoulda_macros/scopes.rb
 - muck-engine.gemspec
-- public/javascripts/muck-countries.js
-- public/javascripts/muck-src.js
 - public/javascripts/muck.js
 - public/javascripts/muck_admin.js
+- public/javascripts/muck_countries.js
 - public/javascripts/muck_time/en.js
 - public/stylesheets/admin.css
 - public/stylesheets/reset.css

data/public/javascripts/muck-src.js

@@ -1,149 +0,0 @@
-// compress with http://closure-compiler.appspot.com/home
-//jQuery.noConflict();
-jQuery(document).ajaxSend(function(event, request, settings) {
-  add_headers(request);
-  if (settings.type.toUpperCase() == 'GET' || typeof(AUTH_TOKEN) == "undefined") return; // for details see: http://www.justinball.com/2009/07/08/jquery-ajax-get-in-firefox-post-in-internet-explorer/
-  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
-  settings.data = settings.data || "";
- 	if (typeof(AUTH_TOKEN) != "undefined")
-  	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
-});
-
-function apply_ajax_forms() {
-  jQuery('form.ajax').ajaxForm({
-    dataType: 'script',
-    beforeSend: add_headers
-  });
-	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
-}
-
-function add_headers(xhr){
-	xhr.setRequestHeader("Accept", "text/javascript");
-	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-}
-
-jQuery(document).ready(function() {
-
-  jQuery('a.ajax-delete').live('click', function() {
-    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;
-  });
-
-  jQuery('a.ajax-update').live('click', function() {
-    jQuery.post(this.href, { _method: 'put', format: 'js' }, null, "script");
-    return false;
-  });
-
-  jQuery(".submit-form").click(function() {
-    jQuery(this).parent('form').submit();
-  });
-	
-	//jQuery("ul.drop-menu").menu();
-	
-  apply_ajax_forms();
-
-  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(){
-      d.dialog("open");
-      apply_ajax_forms();
-    });
-    return false;
-  });
-
-  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;
-  });
-
-  jQuery(document).ready(function() {
-    jQuery('.waiting').hide();
-    jQuery(".wait-button").live('click', function() {
-      jQuery(this).siblings('.waiting').show();
-      jQuery(this).hide();
-    });
-  });
-
-});
-
-// String list methods. These are handy for dealing with comma delimited lists
-// in text boxes such as a list of emails or tags.
-// Given a comma delimited string add a new item if it isn't in the string
-function add_to_list(items_string, new_item){
-  var items = split_list(items_string);
-  var add = true;
-  for(i=0;i<items.length;i++){
-    if(items[i] == new_item){ add = false; }
-  }
-  if(add){ 
-    items.push(new_item);
-  }
-  return items.join(', ');
-}
-
-// Given a comma delimited list remove an item from the string
-function remove_from_list(items_string, remove_item){
-  var items = split_list(items_string);
-  var cleaned = [];
-  for(i=0;i<items.length;i++){
-    if(items[i] != remove_item){
-      cleaned.push(items[i]);
-    }
-  }
-  return cleaned.join(', ');
-}
-
-// Split a string on commas
-function split_list(items_string){
-  if(undefined != items_string && items_string.length > 0){
-    var items = items_string.split(',');
-  } else {
-    var items = [];
-  }
-  var cleaned = [];
-  for(i=0;i<items.length;i++){
-    var cleaned_item = jQuery.trim(items[i]);
-    if(cleaned_item.length > 0){ 
-      cleaned.push(cleaned_item); 
-    }
-  }
-  return cleaned;
-}
-
-function isEncodedHtml(str) { 
-  if(str.search(/&amp;/g) != -1 || str.search(/&lt;/g) != -1 || str.search(/&gt;/g) != -1) 
-    return true; 
-  else 
-    return false; 
-}; 
- 
-function decodeHtml(str){ 
-    if(isEncodedHtml(str)) 
-      return str.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>'); 
-    return str; 
-}