muck-engine 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

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

@@ -29,4 +29,11 @@ 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)
+      render :update do |page|
+        page.replace_html 'admin-messages', output_errors(title, options, fields, flash_only)
+      end
+    end
+    
 end

data/app/helpers/muck_admin_helper.rb

@@ -4,4 +4,10 @@ module MuckAdminHelper
     render :partial => @sub_navigation_path if @sub_navigation_path
   end
 
+  def header_nav_item_image(header_nav_item)
+    if !header_nav_item.image.blank?
+      style="background-image:url('#{header_nav_item.image}');"
+    end
+  end
+  
 end

data/app/helpers/muck_engine_helper.rb

@@ -2,6 +2,13 @@ require 'md5'
 
 module MuckEngineHelper
 
+  # Outputs the appropriate http protocol based on 
+  # the request type.  if https is desired then 
+  # pass true to override default behavior
+  def http_protocol(use_ssl = request.ssl?)
+    (use_ssl ? "https://" : "http://")
+  end
+
   # Outputs a small bit of javascript that will enable message 
   # output to jgrowl or to the given message dom id
   #
@@ -36,33 +43,6 @@ module MuckEngineHelper
     remote_form_for(record_or_name_or_array, *args, &proc) 
   end
   
-  def output_flash(options = {})
-    output_errors('', options, nil, true)
-  end
-  
-  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?
-    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, 
-        :field_errors => field_errors,
-        :css_class => css_class,
-        :extra_html => options[:extra_html]})
-    else
-      #nothing
-      ''
-    end
-  end
-  
   # generates javascript that will hide a link or button
   # when click and then show a different dom object
   def show_hide_on_click(id_to_show, id_to_hide)
@@ -274,4 +254,9 @@ module MuckEngineHelper
     term = term.gsub('.', '%2E')
   end
   
+  def format_date(date)
+    return '' if date.nil?
+    date.to_date.to_s(:long)
+  end
+  
 end

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

@@ -4,7 +4,4 @@
 
 <script type="text/javascript" language="JavaScript">
   <%= yield :javascript %>
-</script>
-
-<%= yield :messages -%>
-<%= output_flash(:class => 'notify-box') %>
+</script>

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

@@ -2,12 +2,14 @@
 <meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
 <%= 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.css admin }, :cache => true %>
+<%= stylesheet_link_tag %W{ reset styles blueprint/liquid_screen jquery/jquery.autocomplete jquery/jquery.fancybox admin }, :cache => true %>
+<%= google_load_jquery_ui_css(http_protocol) %>
 <%= stylesheet_link_tag MuckEngine.muck_admin_css -%>
-<%= google_load_jquery %>
-<%= google_load_jquery_ui %>
+<%= google_load_jquery(http_protocol) %>
+<%= google_load_jquery_ui(http_protocol) %>
 <%= javascript_include_tag %w{
   jquery/jrails.js
+  jquery/jquery.form.js
   jquery/jquery.jgrowl.js
   jquery/jquery.tips.js
   jquery/jquery.fancybox.js

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

@@ -1,3 +1,7 @@
+<div id="admin-messages" class="span-24">
+  <%= yield :messages -%>
+  <%= output_flash(:class => 'notify-box') %>
+</div>
 <div id="admin-account" class="navigation span-24">
   <ul>
     <li><%=translate('muck.engine.admin_welcome', :user => current_user.display_name) %></li>

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

@@ -1,5 +1,3 @@
 <li id="<%=header_nav_item.name.parameterize%>">
-  <a style="background-image: url('<%=header_nav_item.image%>')" href="<%=header_nav_item.path %>">
-    <%= header_nav_item.name %>
-  </a>
+  <a <%= header_nav_item_image(header_nav_item) -%> href="<%=header_nav_item.path %>"><%= header_nav_item.name %></a>
 </li>

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

@@ -7,13 +7,17 @@
 <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]-->
-<%= stylesheet_link_tag %W{ reset styles blueprint/screen.css }, :cache => true %>
-<%= google_load_jquery %>
-<%= google_load_jquery_ui %>
+<%= google_load_jquery_ui_css(http_protocol) %>
+<%= stylesheet_link_tag %W{ reset styles blueprint/screen.css default }, :cache => true %>
+<%= google_load_jquery(http_protocol) %>
+<%= google_load_jquery_ui(http_protocol) %>
 <%= javascript_include_tag %w{
   jquery/jrails.js
+  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' %>
 <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>

data/lib/muck_engine.rb

@@ -1,9 +1,12 @@
+require 'muck_engine/flash_errors'
 
 ActionController::Base.send :include, ActionController::MuckApplication
+ActionController::Base.send :include, MuckEngine::FlashErrors
 ActiveRecord::Base.send :include, ActiveRecord::MuckModel
 ActionMailer::Base.send :include, ActionMailer::MuckMailer
 ActionController::Base.send :helper, MuckEngineHelper
 ActionController::Base.send :helper, MuckAdminHelper
+ActionController::Base.send :helper, MuckEngine::FlashErrors
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'rails_i18n', '*.{rb,yml}') ]
@@ -21,7 +24,7 @@ end
 class MuckEngine
   
   def self.muck_admin_nav_items
-    @@muck_admin_nav_items || []
+    @@muck_admin_nav_items ||= []
   end
 
   # Add an item to the main admin navigation menu
@@ -30,38 +33,36 @@ class MuckEngine
   # path:                 Url to link to
   # image:                Image for the link
   def self.add_muck_admin_nav_item(name, path, image = '')
-    @@muck_admin_nav_items ||= []
-    @@muck_admin_nav_items << OpenStruct.new(:name => name,
-                                             :path => path,
-                                             :image => image)
+    muck_admin_nav_items << OpenStruct.new(:name => name,
+                                           :path => path,
+                                           :image => image)
   end
 
 
   def self.muck_dashboard_items
-    @@muck_dashboard_items || []
+    @@muck_dashboard_items ||= []
   end
 
   # Add an item to the admin dashboard
   # path:   Path to the partial
   # locals: Hash of values to pass as locals to the partial
   def self.add_muck_dashboard_item(path, locals = {})
-    @@muck_dashboard_items ||= []
-    @@muck_dashboard_items << OpenStruct.new(:path => path,
-                                             :locals => locals)
+    muck_dashboard_items << OpenStruct.new(:path => path,
+                                           :locals => locals)
   end
 
 
   def self.muck_admin_css
-    @@muck_admin_css || []
+    @@muck_admin_css ||= [] 
   end
 
   # Add css for the admin UI
   def self.add_muck_admin_css(css_file)
-    @@muck_admin_css ||= []
-    @@muck_admin_css << css_file
+    muck_admin_css << css_file
   end
   
 end
 
 # Add a link to admin home
-MuckEngine.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_home'), '/admin', '/images/admin/home.gif')
+#MuckEngine.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_home'), '/admin', '/images/admin/home.gif')
+MuckEngine.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_home'), '/admin')

data/lib/muck_engine/flash_errors.rb

@@ -0,0 +1,32 @@
+class MuckEngine
+  module FlashErrors
+    
+    def output_flash(options = {})
+      output_errors('', options, nil, true)
+    end
+
+    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?
+      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, 
+          :field_errors => field_errors,
+          :css_class => css_class,
+          :extra_html => options[:extra_html]})
+      else
+        #nothing
+        ''
+      end
+    end
+    
+  end
+end

data/lib/test/muck_factories.rb

@@ -81,6 +81,14 @@ Factory.define :role do |f|
   f.rolename 'administrator'
 end
 
+Factory.define :access_code do |f|
+  f.code { Factory.next(:name) }
+  f.uses 0
+  f.unlimited false
+  f.expires_at  { DateTime.now + 2.weeks }
+  f.use_limit 1
+end
+
 Factory.define :activity do |f|
   f.item {|a| a.association(:user)}
   f.template ''

data/locales/en.yml

@@ -14,6 +14,7 @@ en:
       admin_logout: Logout
       admin_home: Home
       admin_roles: Roles
+      admin_access_codes: Access Codes
       admin_welcome: Welcome back {{user}}
       admin_home_title: Admin Home
       select_language_prompt: Please select a language

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.3.3"
+  s.version = "0.4.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{2010-01-22}
+  s.date = %q{2010-01-30}
   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 = [
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
      "lib/action_mailer/muck_mailer.rb",
      "lib/active_record/muck_model.rb",
      "lib/muck_engine.rb",
+     "lib/muck_engine/flash_errors.rb",
      "lib/muck_engine/initialize_routes.rb",
      "lib/muck_engine/populate.rb",
      "lib/muck_engine/tasks.rb",
@@ -577,70 +578,12 @@ Gem::Specification.new do |s|
      "public/stylesheets/blueprint/src/print.css",
      "public/stylesheets/blueprint/src/reset.css",
      "public/stylesheets/blueprint/src/typography.css",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-thick_15_444444_40x40.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_glass_100_f0f0f0_1x400.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_glass_50_99c2ff_1x400.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_glass_55_fbf5d0_1x400.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_glass_80_e6e6e6_1x400.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_glass_95_fef1ec_1x400.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png",
-     "public/stylesheets/jquery/cupertino/images/ui-bg_highlight-soft_100_e7eef3_1x100.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_222222_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_2694e8_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_2e83ff_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_72a7cf_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_888888_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_cd0a0a_256x240.png",
-     "public/stylesheets/jquery/cupertino/images/ui-icons_ffffff_256x240.png",
-     "public/stylesheets/jquery/cupertino/jquery-ui-1.7.1.custom.css",
+     "public/stylesheets/jquery/cupertino/jquery-ui-1.7.2.custom.css",
      "public/stylesheets/jquery/jquery.autocomplete.css",
      "public/stylesheets/jquery/jquery.fancybox.css",
-     "public/stylesheets/jquery/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_flat_55_fbec88_40x100.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_glass_85_dfeffc_1x400.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_glass_95_fef1ec_1x400.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png",
-     "public/stylesheets/jquery/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_217bc0_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_2e83ff_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_469bdd_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_6da8d5_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_cd0a0a_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_d8e7f3_256x240.png",
-     "public/stylesheets/jquery/redmond/images/ui-icons_f9bd01_256x240.png",
-     "public/stylesheets/jquery/redmond/jquery-ui-1.7.1.custom.css",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_flat_75_ffffff_40x100.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_glass_65_ffffff_1x400.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_glass_75_dadada_1x400.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png",
-     "public/stylesheets/jquery/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-     "public/stylesheets/jquery/smoothness/images/ui-icons_222222_256x240.png",
-     "public/stylesheets/jquery/smoothness/images/ui-icons_2e83ff_256x240.png",
-     "public/stylesheets/jquery/smoothness/images/ui-icons_454545_256x240.png",
-     "public/stylesheets/jquery/smoothness/images/ui-icons_888888_256x240.png",
-     "public/stylesheets/jquery/smoothness/images/ui-icons_cd0a0a_256x240.png",
-     "public/stylesheets/jquery/smoothness/jquery-ui-1.7.1.custom.css",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_flat_10_000000_40x100.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-icons_222222_256x240.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-icons_228ef1_256x240.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-icons_ef8c08_256x240.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png",
-     "public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png",
-     "public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css",
+     "public/stylesheets/jquery/redmond/jquery-ui-1.7.2.custom.css",
+     "public/stylesheets/jquery/smoothness/jquery-ui-1.7.2.custom.css",
+     "public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.2.custom.css",
      "public/stylesheets/reset.css",
      "public/stylesheets/styles.css",
      "rails/init.rb",

data/public/javascripts/muck.js

@@ -1,8 +1,6 @@
 //jQuery.noConflict();
 jQuery(document).ajaxSend(function(event, request, settings) {
-  request.setRequestHeader("Accept", "text/javascript");
-  request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-
+  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 || "";
@@ -92,21 +90,49 @@ 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);	
+function apply_ajax_forms() {
+  jQuery('form.ajax').ajaxForm({
+    dataType: 'script',
+    beforeSend: add_headers
+  });
+	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
 }
 
-jQuery.jGrowl.error = function(msg){
-	jQuery.jGrowl(msg, {sticky:true,header:"Please correct the following errors:"});	
+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() {
+    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.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(){
+      d.dialog("open");
+      apply_ajax_forms();
+    });
+    return false;
+  });
+
 	jQuery("#global-login").focus(function() {
 		jQuery("#global-login").val("");
 	});