muck-engine 0.4.21 → 0.4.23

data/VERSION

@@ -1 +1 @@
-0.4.21
+0.4.23

data/app/helpers/muck_custom_form_builder.rb

@@ -23,8 +23,14 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
   # tip_key                The id of the div that contains the tip text.
   # tip_position           Position for tip text.  Valid values are 'top', 'right', 'bottom', 'left'.  Default is 'right'
   # wrapper_id             Alternate id for the container.  Each field is typically wrapper in a div.  This is the id of that div.
+  # wrapper_class          Css class for the container. All containers have the class form-row. This value will be in addition to that class.
+  # label_class            Css class for the label
+  # hide_label             Prevents a label from being output
   # hide_required          Do not show 'required' label even though field is required
   # hide_control_error     Hide errors that show up next to the field
+  # required_text_mark     By default '(required)' is used to show required fields. Override this by setting required_text_mark to something else - ie '*'
+  #                        Alternatively override 'muck.engine.required_text_mark' in your app's en.yml or the appropriate localization file. You can also
+  #                        specify a value in global_config.yml with required_text_mark: *
   def render_field_template(name, field, options)
 
     tippable = !options[:tip].nil?
@@ -33,22 +39,26 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
     field_id = options[:field_id]
     
     local_options = {
-      :extra_html   => options.delete(:extra_html),
-      :tip          => options.delete(:tip),
-      :tip_title    => options.delete(:tip_title),
-      :tip_key      => options.delete(:tip_key),
-      :tip_position => options.delete(:tip_position) || 'right',
-      :wrapper_id   => options.delete(:wrapper_id),
-      :pre_html     => options.delete(:pre_html),
-      :hide_required => options.delete(:hide_required),
+      :pre_html         => options.delete(:pre_html),
+      :after_label_html => options.delete(:after_label_html),
+      :extra_html       => options.delete(:extra_html),
+      :tip              => options.delete(:tip),
+      :tip_title        => options.delete(:tip_title),
+      :tip_key          => options.delete(:tip_key),
+      :tip_position     => options.delete(:tip_position) || 'right',
+      :wrapper_id       => options.delete(:wrapper_id),
+      :wrapper_class    => options.delete(:wrapper_class),
+      :hide_required    => options.delete(:hide_required),
       :hide_control_error => options.delete(:hide_control_error),
-      :css_class    => options.delete(:css_class)
+      :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)
     
+    required_text_mark = options.delete(:required_text_mark)
+    
     type = options.delete(:type)
     type ||= :tippable if tippable
 
@@ -67,7 +77,7 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
     else
       required = required_field?(field)
       label_text = (options[:label] || field.to_s.camelize)
-      label_text = label_text + required_mark(field) if required
+      label_text = label_text + required_mark(field, required_text_mark) if required
     end
     label_name = options.delete(:label)
 
@@ -79,11 +89,17 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
       options[:label_class] = 'desc'
     end
 
+    if options.delete(:hide_label)
+      label_element = ''
+    else
+      label_element = label(field, label_text, label_options)
+    end
+    
     locals = {
       :field_element  => yield,
       :field_name     => field_id || field_name(field),
       :label_name     => options.delete(:required_label) || label_name || '',
-      :label_element  => label(field, label_text, label_options),
+      :label_element  => label_element,
       :is_checkbox    => is_checkbox,
       :required       => required
     }.merge(local_options)
@@ -197,8 +213,9 @@ class MuckCustomFormBuilder < ActionView::Helpers::FormBuilder
     "#{@object_name.to_s}_#{field.to_s}"
   end
 
-  def required_mark(field)
-    required_field?(field) ? " <em id=\"#{field_name(field)}-label-required\">(required)</em>" : ''
+  def required_mark(field, required_text_mark = nil)
+    required_text_mark ||= GlobalConfig.required_text_mark || I18n.translate('muck.engine.required_text_mark')
+    required_field?(field) ? " <em id=\"#{field_name(field)}-label-required\">#{required_text_mark}</em>" : ''
   end
 
   def required_field?(field)

data/app/views/forms/_base_field.erb

@@ -2,8 +2,10 @@
 <% if is_checkbox -%>
 	<%= field_element %>
 	<%= label_element %>
+	<%= after_label_html %>
 <% else -%>
 	<%= label_element %>
+	<%= after_label_html %>
 	<%= field_element %>
 <% end -%>
 <% if required -%><div id="<%= field_name %>_required" class="required-tip" style="display:none;"><em><%= I18n.t('muck.forms.please_enter_a_value', :label => label_name) %></em></div><% end -%>

data/app/views/forms/_color_picker_field.erb

@@ -1,6 +1,6 @@
 <% color = value
 	 html_id = '_' + id.to_s + '_' + field_name %>
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row color-selector-container">
+<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row color-selector-container <%= wrapper_class %>">
 	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
 	<div id="colorSelector<%=html_id%>" class="color-selector">
 		<div id="colorSelectorDisplay<%=html_id%>" style="background-color:#<%=color%>;"></div>

data/app/views/forms/_field.erb

@@ -1,3 +1,3 @@
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row">
+<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row <%= wrapper_class %>">
 	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
 </div>

data/app/views/forms/_menu_field.erb

@@ -1,4 +1,4 @@
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="chooseMenu">
+<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="chooseMenu <%= wrapper_class %>">
 	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
   <%= render :partial => 'forms/tips', :locals => local_assigns  %>
 </div>

data/lib/action_controller/muck_application.rb

@@ -141,8 +141,11 @@ module ActionController
       
       # Attempts to create an @parent object using params
       # or the url.
-      def setup_parent(*ignore)
-        @parent = get_parent(ignore)
+      # scope:  Friendly id can require a scope to find the object.  Pass the scope as needed.
+      # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
+      #         you might want to ignore thing_id so pass :thing.
+      def setup_parent(args = {})
+        @parent = get_parent(args)
         if @parent.blank?
           render :text => t('muck.engine.missing_parent_error')
           return false
@@ -152,28 +155,39 @@ module ActionController
       # Tries to get parent using parent_type and parent_id from the url.
       # If that fails and attempt is then made using find_parent
       # parameters:
+      # scope:  Friendly id can require a scope to find the object.  Pass the scope as needed.
       # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
       #         you might want to ignore thing_id so pass :thing.
-      def get_parent(*ignore)
+      def get_parent(args = {})
         if params[:parent_type].blank? || params[:parent_id].blank?
-          find_parent(ignore)
+          find_parent(args)
         else
           klass = params[:parent_type].to_s.constantize
-          klass.find(params[:parent_id])
+          if args.has_key?(:scope)
+            klass.find(params[:parent_id], :scope => args[:scope])
+          else
+            klass.find(params[:parent_id])
+          end
         end
       end
 
       # Searches the params to try and find an entry ending with _id
       # ie article_id, user_id, etc.  Will return the first value found.
       # parameters:
+      # scope:  Friendly id can require a scope to find the object.  Pass the scope as needed.
       # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
       #         you might want to ignore thing_id so pass 'thing' to be ignored.
-      def find_parent(*ignore)
+      def find_parent(args = {})
+        ignore = args.delete(:ignore) || []
         ignore.flatten!
         params.each do |name, value|
           if name =~ /(.+)_id$/
             if !ignore.include?($1)
-              return $1.classify.constantize.find(value)
+              if args.has_key?(:scope)
+                return $1.classify.constantize.find(value, :scope => args[:scope])
+              else
+                return $1.classify.constantize.find(value)
+              end
             end
           end
         end

data/locales/en.yml

@@ -4,6 +4,7 @@ en:
     forms: 
       please_enter_a_value: Please enter a value for {{label}}
     engine: 
+      required_text_mark: (required)
       choose_state: Choose State
       select_state_prompt: Please select a state
       choose_language: Choose Language
@@ -12,29 +13,29 @@ en:
       select_country_prompt: Please select a country
       missing_parent_error: Please specify a parent object
       admin_logout: Logout
-      admin_home: Home
       admin_roles: Roles
       admin_access_codes: Access Codes
+      admin_home: Home
       admin_welcome: Welcome back {{user}}
       admin_home_title: Admin Home
       select_language_prompt: Please select a language
     general: 
-      no_text: "No"
       deactivate: Deactivate
-      help: Help
+      no_text: "No"
       previous: "« Previous"
-      settings_saved: Settings have been saved.
+      help: Help
       delete: Delete
+      settings_saved: Settings have been saved.
       time_ago: "{{time_in_words}} ago"
-      yes_text: "Yes"
-      enable: Disable
       enabled: Enabled?
+      enable: Disable
+      yes_text: "Yes"
       loading: Loading...
       save: Save
-      disable: Enable
-      activate: Activate
       next: Next »
-      general_info: General info
+      activate: Activate
+      disable: Enable
       update: Update
-      read_more: read more
+      general_info: General info
       deleting: Deleting...
+      read_more: read more

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.21"
+  s.version = "0.4.23"
 
   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-04-08}
+  s.date = %q{2010-04-16}
   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 = [

data/public/javascripts/muck-src.js

@@ -125,7 +125,7 @@ function split_list(items_string){
   }
   var cleaned = [];
   for(i=0;i<items.length;i++){
-    var cleaned_item = items[i].split(" ").join("");
+    var cleaned_item = jQuery.trim(items[i]);
     if(cleaned_item.length > 0){ 
       cleaned.push(cleaned_item); 
     }

data/public/javascripts/muck.js

@@ -3,4 +3,4 @@ function add_headers(a){a.setRequestHeader("Accept","text/javascript");a.setRequ
 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").live("click",function(){jQuery(this).siblings(".waiting").show();jQuery(this).hide()})})});
-function add_to_list(a,b){a=split_list(a);var c=true;for(i=0;i<a.length;i++)if(a[i]==b)c=false;c&&a.push(b);return a.join(", ")}function remove_from_list(a,b){a=split_list(a);var c=[];for(i=0;i<a.length;i++)a[i]!=b&&c.push(a[i]);return c.join(", ")}function split_list(a){a=undefined!=a&&a.length>0?a.split(","):[];var b=[];for(i=0;i<a.length;i++){var c=a[i].split(" ").join("");c.length>0&&b.push(c)}return b};
+function add_to_list(a,b){a=split_list(a);var c=true;for(i=0;i<a.length;i++)if(a[i]==b)c=false;c&&a.push(b);return a.join(", ")}function remove_from_list(a,b){a=split_list(a);var c=[];for(i=0;i<a.length;i++)a[i]!=b&&c.push(a[i]);return c.join(", ")}function split_list(a){a=undefined!=a&&a.length>0?a.split(","):[];var b=[];for(i=0;i<a.length;i++){var c=jQuery.trim(a[i]);c.length>0&&b.push(c)}return b};

data/test/rails_root/test/functional/default_controller_test.rb

@@ -2,4 +2,14 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class DefaultControllerTest < ActionController::TestCase
 
+  tests DefaultController
+  
+  context "MuckApplication methods" do
+
+    setup do
+
+    end
+    
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 21
-  version: 0.4.21
+  - 23
+  version: 0.4.23
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -06:00
+date: 2010-04-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency