inline_forms 1.1.20 → 1.2.0

data/bin/inline_forms

@@ -15,7 +15,7 @@ end
 Signal.trap("INT") { puts; exit }
 
 src = File.join(File.dirname(__FILE__), "..")
-
+require "#{src}/lib/inline_forms/version.rb"
 
 USAGE = "
 USAGE: inline_forms <options> <app-name>
@@ -29,6 +29,7 @@ Options:
   --skip-db-setup             # skip setup of mysql development database
   --help                      # show this message
 
+VERSION: #{InlineForms::VERSION}
 "
 
 
@@ -144,13 +145,13 @@ puts "\nDevise User model install with added name field..."
 system('bundle exec rails g devise User name:string')
 puts "\nInstall ckeditor..."
 system('bundle exec rails g ckeditor:install')
-puts "Create config file in app/assets/javascripts/ckeditor/config.js"
-FileUtils.mkdir_p 'app/assets/javascripts/ckeditor'
-system("cp #{src}/app/assets/javascripts/ckeditor/config.js app/assets/javascripts/ckeditor")
-puts "Add remotipart to app/assets/javascripts/application.js..."
-system('echo >> app/assets/javascripts/application.js')
-system('echo "//= require jquery.remotipart" >> app/assets/javascripts/application.js')
-system('echo >> app/assets/javascripts/application.js')
+puts "Create config file in lib/app/assets/javascripts/ckeditor/config.js"
+FileUtils.mkdir_p 'lib/app/assets/javascripts/ckeditor'
+system("cp #{src}/lib/app/assets/javascripts/ckeditor/config.js lib/app/assets/javascripts/ckeditor")
+puts "Add remotipart to lib/app/assets/javascripts/application.js..."
+system('echo >> lib/app/assets/javascripts/application.js')
+system('echo "//= require jquery.remotipart" >> lib/app/assets/javascripts/application.js')
+system('echo >> lib/app/assets/javascripts/application.js')
 puts "Paper_trail install..."
 system('bundle exec rails g paper_trail:install')
 
@@ -162,7 +163,7 @@ else
   system('bundle exec rake db:migrate')
 end
 
-puts "Creating header in app/views/inline_forms/_header.html.erb...\n"
+puts "Creating header in lib/app/views/inline_forms/_header.html.erb...\n"
 header_src = "
 <div id='Header'>
   <div id='title'>
@@ -176,8 +177,8 @@ header_src = "
   <div style='clear: both;'></div>
 </div>
 "
-FileUtils.mkdir_p 'app/views/inline_forms'
-File.open( 'app/views/inline_forms/_header.html.erb', 'w') {|f| f.write(header_src) }
+FileUtils.mkdir_p 'lib/app/views/inline_forms'
+File.open( 'lib/app/views/inline_forms/_header.html.erb', 'w') {|f| f.write(header_src) }
 
 puts "Capify...\n"
 system('capify .')

data/lib/app/assets/javascripts/validation_tooltips.js

@@ -1,11 +1,18 @@
+//http://flowplayer.org/tools/forum/30/37281
 $(document).ready(function() {
-    $(document).delegate(".attribute_name", "mouseover", function() {
+    $(document).delegate(".has_validations", "mouseover", function() {
         if (!$(this).data("tooltip")) {
             $(this).tooltip({
                 effect: "fade",
-                predelay: 200
+                fadeInSpeed: 300,
+                fadeOutSpeed: 150,
+                opacity: 0.9,
+                position: 'top right',
+                offset: [ 25, 20 ],
+//                positioning is NOT according to documentation! Should be relative to parent element but it is not.'
+                relative: true
             });
             $(this).trigger("mouseover");
         }
     });
-});
+});

data/lib/app/assets/stylesheets/inline_forms.css

@@ -134,6 +134,10 @@ a {
     -webkit-border-radius: 5px;
 }
 
+.edit_form_field {
+    position: relative;
+}
+
 .edit_form_checklist ul {
     list-style-type: none;
 }

data/lib/app/assets/stylesheets/validation_tooltips.css

@@ -1,9 +1,17 @@
 .validation_help_tooltip {
-    display:none;
-    height:163px;
-    padding:40px 30px 10px 30px;
-    width:310px;
-    font-size:11px;
-    color:#fff;
-    background-color: #B94C32
-}
+    display: none;
+    width: 250px;
+    height: 175px;
+    background-image: url('/assets/tooltip-bubble-up-left.png');
+    background-color: transparent;
+}
+
+.validation_help_content {
+    margin-top: 18px;
+    margin-left: 18px;
+    font-size: 9pt;
+    color: #3399cc;
+    height: 100px;
+    width: 215px;
+    overflow: auto;
+}

data/lib/app/helpers/inline_forms_helper.rb

@@ -13,6 +13,10 @@ module InlineFormsHelper
     InlineForms::VERSION
   end
 
+  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 ) }.to_s.html_safe )

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

@@ -24,9 +24,16 @@
             <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
             <tr>
               <td valign="top">
-                <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <div class='<%= has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
                   <%= h(name) -%>
                 </div>
+                <% if has_validations(@object, attribute) %>
+                  <div class='validation_help_tooltip'>
+                    <div class='validation_help_content'>
+                      <%= validation_help_as_list_for(@object, attribute) -%>
+                    </div>
+                  </div>
+                <% end -%>
               </td>
               <td valign="top">
                 <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
@@ -51,6 +58,6 @@
     <div style="clear: both;"></div>
   <% end %>
 </li>
-  <script type="text/javascript">
-    $(function() { $("#newnew").slideDown(4000); } );
-  </script>
+<script type="text/javascript">
+  $(function() { $("#newnew").slideDown(4000); } );
+</script>

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

@@ -16,12 +16,16 @@
     <% css_class_id = "#{@object.class.to_s.underscore}_#{@object.id}_#{attribute}" -%>
     <tr>
       <td valign="top">
-        <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+        <div class='<%= has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
           <%= h(name) -%>
         </div>
-        <div class='validation_help_tooltip'>
-          <%= validation_help_as_list_for(@object, attribute) -%>
-        </div>
+        <% if has_validations(@object, attribute) %>
+          <div class='validation_help_tooltip'>
+            <div class='validation_help_content'>
+              <%= validation_help_as_list_for(@object, attribute) -%>
+            </div>
+          </div>
+        <% end -%>
       </td>
       <td valign="top">
         <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >

data/lib/generators/inline_forms/USAGE

@@ -6,12 +6,12 @@ Example:
     rails generate inline_forms Thing name:text_field description:text_area yesno:check_box gender:boolean_with_values
 
 This will create:
-      create  app/models/thing.rb
-      create  app/controllers/things_controller.rb
+      create  lib/app/models/thing.rb
+      create  lib/app/controllers/things_controller.rb
        route  resources :things
       create  db/migrate/20110204074707_inline_forms_create_things.rb
 
-      app/models/thing.rb:
+      lib/app/models/thing.rb:
         class Thing < ActiveRecord::Base
           def _presentation
             #define your presentation here
@@ -26,7 +26,7 @@ This will create:
          end
         end
 
-        app/controllers/things_controller.rb
+        lib/app/controllers/things_controller.rb
             class ThingsController < InlineFormsController
             end
 

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -153,7 +153,7 @@ module InlineForms
                                       "  end\n" +
                                       "\n"
         end
-        template "model.erb", "app/models/#{model_file_name}.rb"
+        template "model.erb", "lib/app/models/#{model_file_name}.rb"
       end
     end
 
@@ -189,15 +189,15 @@ module InlineForms
 
     def add_tab
       unless @flag_not_accessible_through_html
-        copy_file "_inline_forms_tabs.html.erb", "app/views/_inline_forms_tabs.html.erb" unless File.exists?('app/views/_inline_forms_tabs.html.erb')
-        inject_into_file "app/views/_inline_forms_tabs.html.erb",
+        copy_file "_inline_forms_tabs.html.erb", "lib/app/views/_inline_forms_tabs.html.erb" unless File.exists?('lib/app/views/_inline_forms_tabs.html.erb')
+        inject_into_file "lib/app/views/_inline_forms_tabs.html.erb",
                 "  <%= tab.#{name.underscore} '#{name}', #{name.pluralize.underscore + '_path'} %>\n",
                 :after => "<% tabs_tag :open_tabs => { :id => \"tabs\" } do |tab| %>\n"
       end
     end
 
     def generate_controller
-      template "controller.erb", "app/controllers/#{controller_file_name}.rb" if @flag_create_controller
+      template "controller.erb", "lib/app/controllers/#{controller_file_name}.rb" if @flag_create_controller
     end 
 
 

data/lib/inline_forms.rb

@@ -41,7 +41,7 @@ module InlineForms
   }
 
   # DEFAULT_FORM_ELEMENTS holds a mapping from Default Column Types to
-  # Form Elements. Form Elements are defined in app/helpers/form_elements
+  # Form Elements. Form Elements are defined in lib/app/helpers/form_elements
   # and are pieces of code that display a form for a field.
   #
   # Example:
@@ -73,10 +73,10 @@ module InlineForms
   }
 
   # SPECIAL_COLUMN_TYPES maps the column types that we define here and in
-  # app/helpers/form_elements to the standard ActiveRecord::Migration column
+  # lib/app/helpers/form_elements to the standard ActiveRecord::Migration column
   # types
   #
-  # Example: in app/helpers/form_elements/dropdown.rb
+  # Example: in lib/app/helpers/form_elements/dropdown.rb
   #  InlineForms::SPECIAL_COLUMN_TYPES[:dropdown]=:belongs_to
   # this maps the :dropdown form element to the :belongs_to column type.
   #

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.1.20"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 20
-  version: 1.1.20
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -113,6 +113,10 @@ files:
 - lib/app/assets/images/add.png
 - lib/app/assets/images/close.png
 - lib/app/assets/images/glass_plate.gif
+- lib/app/assets/images/tooltip-bubble-down-left.png
+- lib/app/assets/images/tooltip-bubble-down-right.png
+- lib/app/assets/images/tooltip-bubble-up-left.png
+- lib/app/assets/images/tooltip-bubble-up-right.png
 - lib/app/assets/images/trash.png
 - lib/app/assets/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
 - lib/app/assets/images/ui-bg_flat_30_cccccc_40x100.png