muck-engine 0.1.2 → 0.1.4

data/README.rdoc

@@ -24,7 +24,24 @@ If you build your own layout be sure to include the following script in your lay
     <%= yield :javascript %>
   </script>
 
+== CSS
 
+The css provided by the muck engine comes from blueprint:
+http://www.blueprintcss.org/
+
+We've also included a liquid version:
+http://www.ixda.org/discuss.php?post=23298&search=blueprint
+
+And icons:
+http://www.ajaxbestiary.com/Labs/SilkSprite/
+
+== Javascript
+
+The muck engine uses jRails and thus jQuery for javascript:
+http://ennerchi.com/projects/jrails
+
+jGrowl is optional but included in case you'd like to use it for flash and error messages:
+http://www.stanlemon.net/projects/jgrowl.html
 
 
 Copyright (c) 2009 Justin Ball, released under the MIT license

data/Rakefile

@@ -40,7 +40,8 @@ begin
                           locales/*
                           rails/*
                           test/*
-                          lib/**/* )
+                          lib/**/*
+                          public/javascripts/* )
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -62,7 +63,7 @@ begin
         )
 
         host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/muck_engine/"
+        remote_dir = "/var/www/gforge-projects/muck-engine/"
         local_dir = 'rdoc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/app/helpers/muck_engine_helper.rb

@@ -13,6 +13,7 @@ module MuckEngineHelper
   def output_errors(title, options = {}, fields = nil)
     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?
     
@@ -31,12 +32,6 @@ module MuckEngineHelper
       ''
     end
   end
-
-  def error_styles
-    if GlobalConfig.growl_all_messages
-      ' style="display:none;" '
-    end
-  end
   
   def icon(object, size = :icon)
     return "" if object.blank? || object.photo.blank?

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

@@ -1,7 +1,7 @@
-<div <%=css_class%> id="errorExplanation" <%=error_styles%>>
-	<h2><%= title %></h2>
+<div <%=css_class%> id="errorExplanation">
+  <h2><%= title %></h2>
   <%= flash_html %>
-	<%= field_errors %>
-	<%= extra_html %>
+  <%= field_errors %>
+  <%= extra_html %>
 </div>
 <%= render(:partial => 'shared/growl') -%>

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

@@ -1,3 +1,3 @@
 <% if !field_error.nil? && field_error.errors.length > 0 -%>
-<ul><%=field_error.errors.full_messages.map {|msg| content_tag(:li, msg)} %></ul>
+<ul id="field-errors"><%=field_error.errors.full_messages.map {|msg| content_tag(:li, msg)} %></ul>
 <% end -%>

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

@@ -1,4 +1,4 @@
-<div <%=css_class%> id="errorExplanation" <%=error_styles%>>
+<div <%=css_class%> id="errorExplanation">
   <%= flash_html %>
 </div>
 <%= render(:partial => 'shared/growl') -%>

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

@@ -1,7 +1,7 @@
 <% if flash.keys.any? {|key| flash[key].length > 0} -%>
-	<div id="flashMessage" class="message">
-		<% flash.each do |key, msg| -%>
-		    <%= content_tag :div, msg, :class => [key, " message"], :id => "notice_#{key}" %>
-		<% end -%>
-	</div>
+  <div id="flashMessage" class="message">
+    <% flash.each do |key, msg| -%>
+      <%= content_tag :div, msg, :class => [key, " message"], :id => "notice_#{key}" %>
+    <% end -%>
+  </div>
 <% end -%>

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

@@ -1,11 +1,16 @@
-<% if GlobalConfig.growl -%>
+<% if GlobalConfig.growl_enabled -%>
   <script type="text/javascript">
   jQuery(document).ready(function() {
+    jQuery('#errorExplanation').hide();
     var message = jQuery('#errorExplanation').html();
     var title = jQuery('#errorExplanation h2').html();
     if(message) {
-      jQuery.jGrowl.info(message, {header:title});
+      if (jQuery('#field-errors').length > 0){
+        jQuery.jGrowl.error(message, {header:title});
+      } else {
+        jQuery.jGrowl.info(message, {header:title});
+      }
     }
-  });  
+  });
   </script>
 <% end -%>

data/muck-engine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.1.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-06-12}
+  s.date = %q{2009-06-13}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -91,13 +91,14 @@ Gem::Specification.new do |s|
      "public/images/icons/vote.png",
      "public/images/loading.gif",
      "public/images/spinner.gif",
-     "public/javascripts/application.js",
+     "public/javascripts/fancyzoom.min.js",
      "public/javascripts/fancyzoom.min.js",
      "public/javascripts/jquery/jquery-ui.js",
      "public/javascripts/jquery/jquery.form.js",
      "public/javascripts/jquery/jquery.jgrowl.js",
      "public/javascripts/jquery/jquery.js",
      "public/javascripts/jquery/jquery.tips.js",
+     "public/javascripts/muck.js",
      "public/stylesheets/admin.css",
      "public/stylesheets/blueprint/ie.css",
      "public/stylesheets/blueprint/liquid_screen.css",

data/public/javascripts/{application.js → muck.js}

@@ -50,7 +50,7 @@ function show_hide_obj (ary_objs_to_show, ary_objs_to_hide)
 jQuery.jGrowl.defaults.position = 'center';
 
 jQuery.jGrowl.info = function(msg){
-	jQuery.jGrowl(msg, {sticky:true});
+	jQuery.jGrowl(msg);
 }
 
 jQuery.jGrowl.warn = function(msg){

data/public/stylesheets/styles.css

@@ -12,6 +12,7 @@ fieldset{border:none;margin:0;padding:0;}
 form fieldset{margin:0 0 2px;padding:0px;}
 form fieldset input[type="text"],form fieldset input[type="password"]{width:500px;}
 .common-form{width:500px;margin:40px auto;}
+.common-form h1{font-size:1.8em;}
 .form-item{float:left;}
 .common-content{width:500px;margin:40px auto;font-size:1.2em;color:#555;}
 .button-link {background-color:transparent;border-top-width: 0px;border-left-width: 0px;border-right-width: 0px;border-bottom-width: 0px;}
@@ -60,13 +61,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:#FCFAE1;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:#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{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;}
+
 /* Errors */
 .help-box{font-size:1.2em;color:#555;}
 .fieldWithErrors input{border:solid 2px #B61E12;}

data/rdoc/created.rid

@@ -1 +1 @@
-Thu, 11 Jun 2009 23:55:40 -0600
+Fri, 12 Jun 2009 00:13:06 -0600

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -06:00
+date: 2009-06-13 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -69,13 +69,13 @@ files:
 - public/images/icons/vote.png
 - public/images/loading.gif
 - public/images/spinner.gif
-- public/javascripts/application.js
 - public/javascripts/fancyzoom.min.js
 - public/javascripts/jquery/jquery-ui.js
 - public/javascripts/jquery/jquery.form.js
 - public/javascripts/jquery/jquery.jgrowl.js
 - public/javascripts/jquery/jquery.js
 - public/javascripts/jquery/jquery.tips.js
+- public/javascripts/muck.js
 - public/stylesheets/admin.css
 - public/stylesheets/blueprint/ie.css
 - public/stylesheets/blueprint/liquid_screen.css