inline_forms 1.3.6 → 1.3.7

data/lib/app/helpers/form_elements/text_area.rb

@@ -1,7 +1,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:text_area]=:text
 
 def text_area_show(object, attribute)
-  if defined? Ckeditor
+  if defined? Ckeditor 
     link_to_inline_edit object,
       attribute,
       '<div class="ckeditor_area">'.html_safe +

data/lib/app/helpers/form_elements/text_area_without_ckeditor.rb

@@ -0,0 +1,13 @@
+InlineForms::SPECIAL_COLUMN_TYPES[:text_area_without_ckeditor]=:text
+
+def text_area_without_ckeditor_show(object, attribute)
+  link_to_inline_edit object, attribute, object[attribute]
+end
+
+def text_area_without_ckeditor_edit(object, attribute)
+  text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
+end
+
+def text_area_without_ckeditor_update(object, attribute)
+  object[attribute.to_sym] = params[attribute.to_sym]
+end

data/lib/app/helpers/inline_forms_helper.rb

@@ -9,17 +9,14 @@ module InlineFormsHelper
 
   private
 
-  def inline_forms_version
-    InlineForms::VERSION
-  end
-
+  # used as class name
   def has_validations(object, attribute)
     "has_validations " unless object.class.validators_on(attribute).empty?
   end
 
   def validation_help_as_list_for(object, attribute)
     "" and return if object.class.validators_on(attribute).empty?
-    content_tag(:ul, validation_help_for(object, attribute).map { |help_message| content_tag(:li, help_message.html_safe ) }.to_s.html_safe )
+    content_tag(:ul, validation_help_for(object, attribute).map { |help_message| content_tag(:li, help_message ) }.to_s.html_safe )
   end
 
   # validation_help_for(object, attribute) extracts the help messages for
@@ -27,7 +24,7 @@ module InlineFormsHelper
   def validation_help_for(object, attribute)
     "" and return if object.class.validators_on(attribute).empty?
     object.class.validators_on(attribute).map do |v|
-      v.help_message if v.respond_to?(:help_message)
+      t("inline_forms.validators.help.#{ActiveModel::Name.new(v.class).i18n_key.to_s.gsub(/active_model\/validations\//, '')}")
     end.compact
   end
 
@@ -35,7 +32,7 @@ module InlineFormsHelper
   def close_link( object, update_span )
     link_to image_tag(  'close.png',
       :class => "close_icon",
-      :title => 'close' ),
+      :title => t('inline_forms.view.close') ),
       send( object.class.to_s.underscore + '_path',
       object,
       :update => update_span,
@@ -44,11 +41,11 @@ module InlineFormsHelper
   end
 
   # destroy link
-  def link_to_destroy( msg, object, update_span )
+  def link_to_destroy( object, update_span )
     if cancan_disabled? || ( can? :destroy, object )
       link_to image_tag(  'trash.png',
         :class => "trash_icon",
-        :title => 'trash' ),
+        :title => t('inline_forms.view.trash') ),
         send( object.class.to_s.underscore + '_path',
         object,
         :update => update_span ),
@@ -57,12 +54,10 @@ module InlineFormsHelper
     end
   end
 
-  # undo link
-  def link_to_undo_destroy(msg, object, update_span )
-    link_to("undo", revert_version_path(object.versions.scoped.last), :method => :post)
-  end
-
-
+#  # undo link
+#  def link_to_undo_destroy(object, update_span )
+#    link_to(t('inline_forms.view.undo'), revert_version_path(object.versions.scoped.last), :method => :post)
+#  end
 
   # link_to_inline_edit
   def link_to_inline_edit(object, attribute, attribute_value='')
@@ -83,19 +78,19 @@ module InlineFormsHelper
   end
 
   # link to new record
-  def link_to_new_record(text, model, path_to_new, update_span, parent_class, parent_id)
+  def link_to_new_record(model, path_to_new, update_span, parent_class, parent_id)
     out = ""
     out << "<li class='new_record_link'>"
     out << (link_to image_tag(  'add.png',
         :class => "new_record_icon",
-        :title => text ),
+        :title => t('inline_forms.view.add_new', :model => model.model_name.human ) ),
       send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ),
       :remote => true)
     out << "<div style='clear: both;'></div>"
     out << "</li>"
     ""
     if cancan_enabled?
-      if can?(:create, model.constantize)
+      if can?(:create, model)
         if parent_class.nil?
           raw out
         else
@@ -107,6 +102,25 @@ module InlineFormsHelper
     end
   end
 
+  # url to other language
+  def locale_url(request, locale)
+    subdomains = request.subdomains
+    # if there are no subdomains, prepend the locale to the domain
+    return request.protocol + [ locale, request.domain ].join('.') + request.port_string if subdomains.empty?
+    # if there is a subdomain, find out if it's an available locale and strip it
+    subdomains.shift if I18n.available_locales.include?(subdomains.first.to_sym)
+    # if there are no subdomains, prepend the locale to the domain
+    return request.protocol + [ locale, request.domain ].join('.') + request.port_string if subdomains.empty?
+    # else return the rest
+    request.protocol + [ locale, subdomains.join('.'), request.domain ].join('.') + request.port_string
+  end
+
+  def translated_attribute(object,attribute)
+    t("activerecord.attributes.#{object.class.name.underscore}.#{attribute}")
+#          "activerecord.attributes.#{attribute}",
+#          "attributes.#{attribute}" ] )
+  end
+
   # get the values for an attribute
   #
   # values should be a Hash { integer => string, ... }
@@ -142,7 +156,7 @@ module InlineFormsHelper
 
     attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list # if we do this as a form_element, @inline.. is nil!!!
     values = attributes.assoc(attribute.to_sym)[3]
-    raise "No Values defined in #{@Klass}, #{attribute}" if values.nil?
+    raise t("fatal.no_values_defined_in", @Klass, attribute) if values.nil?
     if values.is_a?(Hash)
       temp = Array.new
       values.to_a.each do |k,v|

data/lib/app/validators/is_a_curacao_id_number_validator.rb

@@ -3,10 +3,6 @@
 #  validates :id_number, must_be_present => true, is_a_curacao_id_number => true;
 class IsACuracaoIdNumberValidator < ActiveModel::EachValidator
 
-  def help_message
-    "Een geldig ID nummer bestaat uit:<br />4 cijfers voor het jaar<br />2 cijfers voor de maand<br />2 cijfers voor de dag<br />2 cijfers voor het volgnummer<br />Bijvoorbeeld: 1990021123."
-  end
-
   def validate_each(record, attribute, value)
     if value =~ /^[0-9]{10}$/
       year  = value[0..3].to_i
@@ -16,11 +12,13 @@ class IsACuracaoIdNumberValidator < ActiveModel::EachValidator
       begin
         DateTime.civil(year, month, day)
       rescue ArgumentError
-        record.errors[attribute] << (options[:message] || "is geen geldig ID nummer voor Curacao." )
+        record.errors.add(attribute.to_sym, options[:message] || "too_short" )
       end
     else
-      record.errors[attribute] << (options[:message] || "moet bestaan uit tien cijfers (bijvoorbeeld 1983040812)." )
+      record.errors.add(attribute.to_sym, options[:message] || "not_a_number" )
     end
   end
 
 end
+
+#"moet bestaan uit tien cijfers (bijvoorbeeld 1983040812)."

data/lib/app/validators/is_email_address_validator.rb

@@ -25,10 +25,6 @@ class IsEmailAddressValidator < ActiveModel::EachValidator
     "is not a valid email address."
   end
   
-  def help_message
-    "Needs to be a valid email address."
-  end
-
   def validate_each(record, attribute, value)
     unless value =~ EmailAddress
       record.errors[attribute] << (options[:message] || error_message )

data/lib/app/validators/must_be_a_value_validator.rb

@@ -10,7 +10,6 @@ class MustBeAValueValidator < ActiveModel::EachValidator
   end
 
   def help_message
-    "U dient een keuze te maken."
   end
 
   def validate_each(record, attribute, value)

data/lib/app/validators/must_be_unique_validator.rb

@@ -4,8 +4,5 @@ class MustBeUniqueValidator  < ActiveRecord::Validations::UniquenessValidator
     "is not a unique."
   end
 
-  def help_message
-    "Moet uniek zijn (mag niet twee keer voorkomen)."
-  end
 
 end

data/lib/app/views/devise/confirmations/new.html.erb

@@ -1,16 +1,13 @@
-<div id="large_title"><%= application_name -%></div>
-<div id="flash_message">
-  <%= devise_error_messages!.empty? ? 'Please provide your email and we will send you instructions' : devise_error_messages! -%>
-</div>
+<% @default_message = 'provide_email_and_we_send_instructions' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
 <div id="sign_in">
   <div id="sign_in_form">
     <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
       <br /> <%= f.email_field :email %><br /><br />
-      <div><%= f.submit "Send me instructions" %></div>
+      <div><%= f.submit t("inline_forms.devise.send_instructions") %></div>
     <% end %>
   </div>
 </div>
-<div id="shared_links">
-  <%= render :partial => "devise/shared/links" %>
-</div>
+
+<%= render :partial => "devise/shared/links" %>

data/lib/app/views/devise/passwords/edit.html.erb

@@ -1,16 +1,17 @@
-<h2>Change your password</h2>
+<% @default_message = 'change_password' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
+<div id="sign_in">
+  <div id="sign_in_form">
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
-
-  <p><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
+      <div class="float_right"><%= f.label :password %>&nbsp;&nbsp;<%= f.password_field :password %></div>
+      <div style="clear: both"></div>
+      <div class="float_right"><%= f.label :password_confirmation %>&nbsp;&nbsp;<%= f.password_field :password_confirmation %></div>
+      <div style="clear: both"></div>
+      <div><%= f.submit t("inline_forms.devise.submit.change_password") %></div>
+    <% end %>
+  </div>
+</div>
 
 <%= render :partial => "devise/shared/links" %>

data/lib/app/views/devise/passwords/new.html.erb

@@ -1,17 +1,14 @@
-<div id="large_title"><%= application_name -%></div>
-<div id="flash_message">
-  <%= devise_error_messages!.empty? ? 'Please provide your email and we will send you instructions' : devise_error_messages! -%>
-</div>
+<% @default_message = 'provide_email_and_we_send_instructions' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
 <div id="sign_in">
   <div id="sign_in_form">
     <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
       <br /> <%= f.email_field :email %><br /><br />
-      <div><%= f.submit "Send me instructions" %></div>
+      <div><%= f.submit t("inline_forms.devise.send_instructions") %></div>
     <% end %>
   </div>
 </div>
-<div id="shared_links">
-  <%= render :partial => "devise/shared/links" %>
-</div>
+
+<%= render :partial => "devise/shared/links" %>
 

data/lib/app/views/devise/registrations/new.html.erb

@@ -1,7 +1,5 @@
-<div id="large_title"><%= application_name -%></div>
-<div id="flash_message">
-  <%= devise_error_messages!.empty? ? 'Please signup with your name, email and password' : devise_error_messages! -%>
-</div>
+<% @default_message = 'signup_with_email_name_and_password' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
 <div id="sign_in">
   <div id="sign_in_form">
@@ -15,11 +13,10 @@
       <div class="float_right"><%= f.label :password_confirmation %>&nbsp;&nbsp;<%= f.password_field :password_confirmation %></div>
       <div style="clear: both"></div>
       
-      <div><%= f.submit "Sign up" %></div>
+      <div><%= f.submit t("inline_forms.devise.sign_up") %></div>
     <% end %>
   </div>
 </div>
-<div id="shared_links">
-  <%= render :partial => "devise/shared/links" %>
-</div>
+
+<%= render :partial => "devise/shared/links" %>
 

data/lib/app/views/devise/sessions/new.html.erb

@@ -1,17 +1,13 @@
-<div id="large_title"><%= application_name -%></div>
-<div id="flash_message">
-  <%= devise_error_messages!.empty? ? 'Please login with your email address and password' : devise_error_messages! -%>
-</div>
+<% @default_message = 'login_with_email_and_password' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
 <div id="sign_in">
   <div id="sign_in_form">
     <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
       <br /> <%= f.email_field :email %><br />
       <%= f.password_field :password %><br />
-      <p><%= f.submit "Sign in" %></p>
+      <p><%= f.submit t("inline_forms.devise.sign_in") %></p>
     <% end %>
   </div>
 </div>
-<div id="shared_links">
-  <%= render :partial => "devise/shared/links" %>
-</div>
+<%= render :partial => "devise/shared/links" %>

data/lib/app/views/devise/shared/_header_and_errors.html.erb

@@ -0,0 +1,4 @@
+<div id="large_title"><%= t application_name -%></div>
+<div id="flash_message">
+  <%= devise_error_messages!.empty? ? t("inline_forms.devise.#{@default_message}") : devise_error_messages! -%>
+</div>

data/lib/app/views/devise/shared/_links.erb

@@ -1,25 +1,27 @@
-| <%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_session_path(resource_name) %> |
-<% end -%>
+<div id="shared_links">
+  | <%- if controller_name != 'sessions' %>
+    <%= link_to t("inline_forms.devise.links.sign_in"), new_session_path(resource_name) %> |
+  <% end -%>
 
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %> |
-<% end -%>
+  <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+    <%= link_to t("inline_forms.devise.links.sign_up"), new_registration_path(resource_name) %> |
+  <% end -%>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %> |
-<% end -%>
+  <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+    <%= link_to t("inline_forms.devise.links.forgot_password"), new_password_path(resource_name) %> |
+  <% end -%>
 
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %> |
-<% end -%>
+  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+    <%= link_to t("inline_forms.devise.links.no_instructions"), new_confirmation_path(resource_name) %> |
+  <% end -%>
 
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %> |
-<% end -%>
+  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+    <%= link_to t("inline_forms.devise.links.no_unlock_instructions"), new_unlock_path(resource_name) %> |
+  <% end -%>
 
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %> |
+  <%- if devise_mapping.omniauthable? %>
+    <%- resource_class.omniauth_providers.each do |provider| %>
+      <%= link_to t("inline_forms.devise.links.sign_in_with", :provider => provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %> |
+    <% end -%>
   <% end -%>
-<% end -%>
+</div>

data/lib/app/views/devise/unlocks/new.html.erb

@@ -1,16 +1,13 @@
-<div id="large_title"><%= application_name -%></div>
-<div id="flash_message">
-  <%= devise_error_messages!.empty? ? 'Please provide your email and we will send you instructions' : devise_error_messages! -%>
-</div>
+<% @default_message = 'provide_email_and_we_send_instructions' -%>
+<%= render :partial => "devise/shared/header_and_errors" %>
 
 <div id="sign_in">
   <div id="sign_in_form">
     <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
       <br /> <%= f.email_field :email %><br /><br />
-      <div><%= f.submit "Send me instructions" %></div>
+      <div><%= f.submit t("inline_forms.devise.send_instructions") %></div>
     <% end %>
   </div>
 </div>
-<div id="shared_links">
-  <%= render :partial => "devise/shared/links" %>
-</div>
+
+<%= render :partial => "devise/shared/links" %>

data/lib/app/views/inline_forms/_close.html.erb

@@ -1,2 +1,2 @@
-<%= link_to_destroy('del',@object, @update_span) -%>
+<%= link_to_destroy(@object, @update_span) -%>
 <%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>

data/lib/app/views/inline_forms/_list.html.erb

@@ -1,8 +1,8 @@
 <% flash.each do |key, value| %>
   <div id="flash" class="flash <%= key %>"><%= value %></div>
-  <script type="text/javascript">
-    $(function() { $("#flash").delay(1000).fadeToggle('2000'); } );
-  </script>
+  <%#*<script type="text/javascript">%>
+    <%#*$(function() { $("#flash").delay(1000).fadeToggle('2000'); } );%>
+  <%#*</script>%>
 <% end %>
 
 <!-- purpose: list objects. we come here from #index and from #new.
@@ -18,31 +18,28 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% # the controller didn't give us a parent_class, this means we are here for the 'first' time  %>
     <% # we have to rely on the @Klass set in the controller %>
     <% update_span = @Klass.to_s.pluralize.downcase + '_list'  %>
-    <% human_readable_class = @Klass.to_s.humanize.downcase  %>
     <% path_to_new = "new_#{@Klass.to_s.singularize.underscore}_path" %>
     <% parent_class = nil %>
     <% parent_id = nil  %>
     <% objects = @objects %>
-    <% model_name = @Klass.to_s %>
+    <% model = @Klass %>
   <% else %>
     <% # the controller gave us an @parent_class, so ... %>
     <% attribute = @Klass.to_s.underscore.pluralize %>
     <% update_span = "#{@parent_class.to_s.underscore}_#{@parent_id}_#{attribute}_list" -%>
-    <% human_readable_class= attribute.to_s.singularize.humanize.downcase %>
     <% path_to_new='new_' + attribute.to_s.underscore.singularize + '_path' %>
     <% parent_class=@parent_class.constantize %>
     <% parent_id=@parent_id %>
     <% objects = @objects %>
     <% ul_needed = false unless @ul_needed %>
-    <% model_name = attribute.to_s.singularize.camelcase %>
+    <% model = attribute.to_s.singularize.camelcase.constantize %>
   <% end %>
 <% else %>
   <% # here we come from _show %>
   <% update_span = "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}_list" -%>
-  <% human_readable_class = attribute.to_s.singularize.humanize.downcase %>
   <% path_to_new='new_' + attribute.to_s.singularize + '_path' %>
   <% conditions =  [ "#{parent_class.name.foreign_key} = ?", parent_id ] %>
-  <% model_name = attribute.to_s.singularize.camelcase %>
+  <% model = attribute.to_s.singularize.camelcase.constantize %>
 
   <% if cancan_enabled? %>
     <% objects = parent_class.find(parent_id).send(attribute).accessible_by(current_ability).order(attribute.to_s.singularize.camelcase.constantize.order_by_clause).paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
@@ -54,7 +51,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
 
 <%= raw "<ul id=\"#{update_span}\" class=\"inline_forms_list\">" if ul_needed -%>
 <!--  # link to new -->
-<%= link_to_new_record("Add a new #{human_readable_class}", model_name, path_to_new, update_span, parent_class, parent_id) -%>
+<%= link_to_new_record(model, path_to_new, update_span, parent_class, parent_id) -%>
 <!--  # list of objects -->
 <% for object in objects %>
   <% if parent_class.nil?  %>
@@ -65,7 +62,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
   <li id="<%= css_class_id -%>" class="<%= cycle('odd', 'even') -%>" >
-    <%= link_to_destroy('del',object, css_class_id) -%>
+    <%= link_to_destroy(object, css_class_id) -%>
     <%= link_to h(object._presentation),
       send( path_to_object, object, :update => css_class_id),
       :remote => true -%>