formatted_form 1.0.1 → 1.0.2

data/README.md

@@ -18,6 +18,23 @@ A Rails form builder to simplify your forms and keep your views clean.
     
     bundle install
 
+### 3. Generate the javascript file
+
+    rails g formatted_form:javascripts
+
+This will create `public/javascripts/formatted_form.js` and you should load it using:
+  
+    javascript_include_tag 'formatted_form'
+
+### 4. (Optionaly) generate the stylesshet (SASS) file
+
+    rails g formatted_form:stylesheets
+
+This will create `app/views/stylesheets/formatted_form.sass` and you can move it to wherever you keep your SASS files and load it using:
+
+    stylesheet_link_tag 'formatted_form'
+
+
 
 ## Usage (with haml)
 
@@ -25,5 +42,5 @@ A Rails form builder to simplify your forms and keep your views clean.
       = f.text_field :email, :label => 'Email address'
       = f.password_field :password
       = f.check_box :remember_me, :label => 'Remember me when I come back'
-      = f.submit 'Log In'
+      = f.submit 'Log In', :change_to_text => 'Logging you in ...', :image => true
   

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/formatted_form.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formatted_form}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-04-20}
   s.description = %q{}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -27,16 +27,19 @@ Gem::Specification.new do |s|
     "formatted_form.gemspec",
     "lib/formatted_form.rb",
     "lib/formatted_form/builder.rb",
-    "lib/formatted_form/engine.rb"
+    "lib/formatted_form/engine.rb",
+    "lib/generators/formatted_form/javascripts/javascripts_generator.rb",
+    "lib/generators/formatted_form/stylesheets/stylesheets_generator.rb",
+    "templates/javascripts/formatted_form.js",
+    "templates/stylesheets/formatted_form.sass"
   ]
   s.homepage = %q{http://github.com/twg/formatted_form}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{A Rails form builder to simplify you forms}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/formatted_form/builder.rb

@@ -56,31 +56,24 @@ module FormattedForm
       
     end
 
+    # f.submit 'Log In', :change_to_text => 'Logging you in ...'
     def submit(value, options={}, &block)
       cancel_link = @template.capture(&block) if block_given?
       cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
-      if options[:show_ajax_loader]
-        options[:onclick] = "$(this).parent().next().css('display', 'block');$(this).parent().hide();"
-      end
-      if options[:image_button] == true
-        submit_id = Time.now.usec
-        out = @template.content_tag(:div,
-          %{
-            #{super(value, options.merge(:style=>'visibility:hidden;position: absolute', :id => submit_id)).html_safe}
-            <a class="red_button" href="" onclick="$('##{submit_id}').closest('form').submit();return false"><span>#{value}</span></a>
-            #{cancel_link.html_safe}
-          }.html_safe, :class => 'form_element submit_element').html_safe
-  
-      else
-        out = @template.content_tag(:div, super(value, options) + cancel_link.html_safe, :class => 'form_element submit_element').html_safe
-      end
+      change_to_text = options.delete(:change_to_text)
 
-      if options[:show_ajax_loader]
-        out << %{
-          <div class="form_element submit" style="display:none">
-            <div class="submit_ajax_loader">#{options[:show_ajax_loader]}</div>
-          </div>
-        }.html_safe
+      out = @template.content_tag(:div, :class => "form_element submit#{' change_to_text' if change_to_text}") do
+        if options.delete(:image)
+          content = super(value, options.merge(:style=>'visibility:hidden;position: absolute'))
+          content << @template.link_to(@template.content_tag(:span, value), "#", :class => 'submit_image')
+          content << cancel_link.html_safe
+        else
+          super(value, options) + cancel_link.html_safe
+        end
+      end
+      
+      if change_to_text
+        out << @template.content_tag(:div, change_to_text, :class => 'form_element submit_text')
       end
       out.html_safe
     end

data/lib/formatted_form/engine.rb

@@ -3,7 +3,7 @@ require "rails"
 
 module FormattedForm
   class Engine < Rails::Engine
-    initializer 'formatted_form.helper' do |app|
+    initializer 'formatted_form_helper' do |app|
       ActionView::Base.send(:include, FormattedForm::FormattedFormHelper)
     end
   end

data/lib/generators/formatted_form/javascripts/javascripts_generator.rb

@@ -0,0 +1,11 @@
+module FormattedForm
+  class JavascriptsGenerator < Rails::Generators::Base
+
+    source_root File.expand_path('../../../../..', __FILE__) 
+  
+    def generate_javascripts
+      copy_file 'templates/javascripts/formatted_form.js', 'public/javascripts/formatted_form.js'
+    end
+  
+  end
+end

data/lib/generators/formatted_form/stylesheets/stylesheets_generator.rb

@@ -0,0 +1,11 @@
+module FormattedForm
+  class StylesheetsGenerator < Rails::Generators::Base
+
+    source_root File.expand_path('../../../../..', __FILE__) 
+  
+    def generate_stylesheets
+      copy_file 'templates/stylesheets/formatted_form.sass', 'app/views/stylesheets/formatted_form.sass'
+    end
+  
+  end
+end

data/templates/javascripts/formatted_form.js

@@ -0,0 +1,17 @@
+// Reset the state of the submit button
+$(document).ready(function() {
+  $('.form_element.submit.change_to_text').show();
+  $('.submit_text').hide();
+});
+
+// Shows the submit button replacement text on click
+$('.form_element.submit.change_to_text input[type=submit]').live('click', function(){
+  $(this).parent().next().show();
+  $(this).parent().hide();
+})
+
+// Activates the submit button click when clicking the image button
+$('.form_element.submit a.submit_image').live('click', function(){
+  $(this).prev().click();
+  return false;
+})

data/templates/stylesheets/formatted_form.sass

@@ -0,0 +1,117 @@
+form.formatted
+  font: 13px/20px Trebuchet MS,serif
+  margin: auto
+  background: #eee
+  border: solid #ddd 2px
+  color: #000
+  width: 400px
+  padding: 10px 20px
+  -webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+  -moz-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+  box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+
+  // --- Form element container ---
+  .form_element
+    overflow: hidden
+    _height: 1%
+    margin-bottom: 1px
+    padding: 5px 0px
+    .label
+      font: 10px/30px Trebuchet MS,serif
+      color: #6E666E
+      text-transform: uppercase
+      letter-spacing: 1px
+      float: left
+      width: 120px
+      text-align: right
+    .value
+      margin-left: 130px
+      .errors
+        font: 9px/12px Trebuchet MS, serif
+        color: #BE1E2D
+      .description
+        clear: both
+        font: italic 10px/12px Trebuchet MS, serif
+
+  // --- Text and password fields ---
+  .form_element.text_field, .form_element.password_field
+    input
+      width: 250px
+      border: 1px solid #a6a8ab
+      padding: 5px
+      width: 90%
+    
+    // --- Text area ---
+  .form_element.text_area 
+    textarea
+      width: 250px
+      height: 150px
+
+  // --- Check box and Radio button ---
+  .form_element.check_box, .form_element.radio_button
+    .value 
+      label
+        font: 10px/20px Trebuchet MS,serif
+        color: #6E666E
+        text-transform: uppercase
+        margin-right: 10px
+        letter-spacing: 0.1em
+      input
+        margin-right: 5px
+      .fieldWithErrors
+        float: left
+
+  .form_element.radio_button
+    .value
+      .option
+        float: left
+  
+  // --- Submit button ---
+  .form_element.submit
+    padding-left: 130px
+    a.submit_image
+      padding: 5px 10px
+      font: bold 12px/20px helvetica,arial,freesans,clean,sans-serif
+      text-decoration: none
+      color: #333
+      text-shadow: 1px 1px 0 #fff
+      white-space: nowrap
+      border: none
+      overflow: visible
+      background: #ddd
+      filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#ffffff',endColorstr='#e1e1e1')
+      background: -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#e1e1e1))
+      background: -moz-linear-gradient(-90deg,#fff,#e1e1e1)
+      border-bottom: 1px solid #ebebeb
+      -webkit-border-radius: 4px
+      -moz-border-radius: 4px
+      border-radius: 4px
+      -webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+      -moz-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+      box-shadow: 0 1px 4px rgba(0,0,0,0.3)
+      cursor: pointer
+      -webkit-font-smoothing: subpixel-antialiased!important
+    a.submit_image:hover
+      color: #fff
+      text-decoration: none
+      text-shadow: -1px -1px 0 rgba(0,0,0,0.3)
+      border-color: #518cc6
+      border-bottom-color: #2a65a0
+      background: #599bdc
+      filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#599bdc',endColorstr='#3072b3')
+      background: -webkit-gradient(linear,left top,left bottom,from(#599bdc),to(#3072b3))
+      background: -moz-linear-gradient(top,#599bdc,#3072b3)
+    
+    
+  .form_element.submit_text
+    padding-left: 130px
+    font: normal 12px/20px Trebuchet MS,serif
+      
+  // --- Form error ---
+  .form_error
+    background-color: #BE1E2D
+    color: #fff
+    text-align: center
+    padding: 10px
+    margin-bottom: 1px
+    font-size: 14px

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: formatted_form
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jack Neto
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +35,10 @@ files:
 - lib/formatted_form.rb
 - lib/formatted_form/builder.rb
 - lib/formatted_form/engine.rb
+- lib/generators/formatted_form/javascripts/javascripts_generator.rb
+- lib/generators/formatted_form/stylesheets/stylesheets_generator.rb
+- templates/javascripts/formatted_form.js
+- templates/stylesheets/formatted_form.sass
 has_rdoc: true
 homepage: http://github.com/twg/formatted_form
 licenses: 
@@ -53,21 +53,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rails form builder to simplify you forms