radiant-forms-extension 3.2.7 → 3.2.8

data/README.md

@@ -62,9 +62,9 @@ Using forms 'DRY's up the process of creating and reusing forms across a site (w
     
 ### Content
     
-    <h2>Contact from <r:get name='contact[name]' /></h2>
+    <h2>Contact from <r:form:read name='contact[name]' /></h2>
     
-    <p>You can get back to them on <r:get name='contact[email]' /></p>
+    <p>You can get back to them on <r:form:read name='contact[email]' /></p>
     
     <p>Cheers, <br /> <strong>Cool Mailer</strong></p>
     
@@ -194,4 +194,4 @@ A showcase of how to use addons, allows you to send emails directly from the pag
       config.gem 'ruby-debug',        :version => '0.10.3'
       config.gem 'webrat',            :version => '0.7.1'
       config.gem 'rr',                :version => '0.10.11'
-    end
+    end

data/Rakefile

@@ -7,6 +7,7 @@ begin
     gem.email = "dirk.kelly@squaretalent.com"
     gem.homepage = "http://github.com/squaretalent/radiant-forms-extension"
     gem.authors = ["dirkkelly"]
+    gem.add_dependency 'radiant-drag_order-extension',     '>= 0.4.9'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-3.2.7
+3.2.8

data/app/controllers/admin/forms_controller.rb

@@ -2,9 +2,52 @@ class Admin::FormsController < Admin::ResourceController
 
   skip_before_filter :verify_authenticity_token, :only => :create
   
+  before_filter :config_global
+  before_filter :config_new,    :only => [ :new, :create ]
+  before_filter :config_edit,   :only => [ :edit, :update ]
+  before_filter :assets_edit,   :only => [ :new, :create, :edit, :update ]
+  
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
     :when => [ :designer, :admin ],
     :denied_url => { :controller => 'admin/pages', :action => 'index' },
     :denied_message => 'You must have designer privileges to perform this action.'
-  
+    
+  private
+
+    def config_global
+      @inputs   ||= []
+      @meta     ||= []
+      @buttons  ||= []
+      @parts    ||= []
+      @popups   ||= []
+    end
+    
+    def config_new
+      @inputs   << 'title'
+      
+      @meta     << 'action'
+      @meta     << 'redirect_to'
+      
+      @parts    << 'body'
+      @parts    << 'config'
+      @parts    << 'content'
+      @parts    << 'secondary'
+    end
+    
+    def config_edit
+      @inputs   << 'title'
+      
+      @meta     << 'action'
+      @meta     << 'redirect_to'
+      
+      @parts    << 'body'
+      @parts    << 'config'
+      @parts    << 'content'
+      @parts    << 'secondary'
+    end
+    
+    def assets_edit
+      include_stylesheet 'admin/extensions/forms/edit'
+    end
+    
 end

data/app/controllers/forms_controller.rb

@@ -68,6 +68,13 @@ protected
     end
     # Those results are merged into the response object
     @response.result = @response.result.merge!({ :results => @results})
+    
+    begin
+      @response.save!
+      redirect_to (@form.redirect_to.present? ? @form.redirect_to : (params[:redirect_to] || :back))
+    rescue
+      "Form '#{@form.title}' could not be submitted."
+    end
   end
   
 end

data/app/models/form_mail.rb

@@ -31,64 +31,53 @@ class FormMail
   end
   
   def from
-    from = nil
-    unless @config[:field].nil? or !@config[:field][:from].blank?
-      from = Forms::Tags::Responses.retrieve(@data, @config[:field][:from])
-    else
-      from = @config[:from]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:from])
+    rescue
+      @config[:from]
     end
-    from
   end
   
   def recipients
-    to = nil
-    unless @config[:field].nil? or !@config[:field][:to].blank?
-      to = Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
-    else
-      to = @config[:to]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
+    rescue
+      @config[:to]
     end
-    to
   end
   
   def reply_to
-    reply_to = nil
-    unless @config[:field].nil? or !@config[:field][:reply_to].blank?
-      reply_to = Forms::Tags::Responses.retrieve(@data, @config[:field][:reply_to])
-    else
-      reply_to = @config[:reply_to]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:reply_to])
+    rescue
+      @config[:reply_to]
     end
-    reply_to
   end
   
   def sender
-    sender = nil
-    unless @config[:field].nil? or !@config[:field][:sender].blank?
-      sender = Forms::Tags::Responses.retrieve(@data, @config[:field][:sender])
-    else
-      sender = @config[:sender]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:sender])
+    rescue
+      @config[:sender]
     end
-    sender
   end
   
   def subject
-    subject = nil
-    unless @config[:field].nil? or !@config[:field][:subject].blank?
-      subject = Forms::Tags::Responses.retrieve(@data, @config[:field][:subject])
-    else
-      subject = @config[:subject]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:subject])
+    rescue
+      @config[:subject]
     end
-    subject
   end
   
   def body
     # This parses the content of the form
     @parser = Radius::Parser.new(PageContext.new(@page), :tag_prefix => 'r')
     if @config[:body]
-      @body = @parser.parse(@form.send(@config[:body]))
+      @parser.parse(@form.send(@config[:body]))
     else
-      @body = @parser.parse(@form.content)
+      @parser.parse(@form.content)
     end
-    @body
   end
   
   def cc

data/app/views/admin/forms/edit.html.haml

@@ -1,15 +1,6 @@
-- body_classes << "reversed"
+- @page_title = @form.title
 
 - render_region :main do |main|
-  - main.edit_header do
-    %h1= "Edit Form"
 
-  - main.edit_form do  
-    = render :partial => 'fields'
-    = hidden_field_tag 'page_part_index_field'
-
-- content_for :page_css do
-  :sass
-    .tab
-      .close
-        :display none
+  - main.form do
+    = render 'admin/forms/edit/form'

data/app/views/admin/forms/edit/_foot.html.haml

@@ -0,0 +1,9 @@
+- render_region :foot do |foot|
+  - foot.buttons do
+    %p.buttons
+      = save_model_button(@form)
+      = save_model_and_continue_editing_button(@form)
+      = t('or')
+      = link_to t('cancel'), [:admin, @form]
+  - foot.timestamp do
+    = updated_stamp @form

data/app/views/admin/forms/edit/_form.html.haml

@@ -0,0 +1,13 @@
+- form_for [:admin, @form], :html => {'data-onsubmit_status'=>"Saving Changes…"} do |f|
+  - render_region :form do |form|
+    - form.inputs do
+      = render :partial => '/admin/forms/edit/inputs', :locals => { :f => f }
+      
+    - form.meta do
+      = render :partial => '/admin/forms/edit/meta',   :locals => { :f => f }
+      
+    - form.parts do
+      = render :partial => '/admin/forms/edit/parts',  :locals => { :f => f }
+      
+    - form.foot do
+      = render :partial => '/admin/forms/edit/foot',    :locals => { :f => f }

data/app/views/admin/forms/edit/_head.html.haml

@@ -0,0 +1,4 @@
+%h1
+  = @page_title
+  - @buttons.each do |button|
+    = render :partial => "admin/forms/edit/buttons/#{button}"

data/app/views/admin/forms/edit/_inputs.html.haml

@@ -0,0 +1,2 @@
+- @inputs.each do |input|
+  = render :partial => "/admin/forms/edit/inputs/#{input}", :locals => { :f => f }

data/app/views/admin/forms/edit/_meta.html.haml

@@ -0,0 +1,7 @@
+.drawer
+  .drawer_contents#attributes
+    %table.fieldset
+      - @meta.each do |meta|
+        = render :partial => '/admin/forms/edit/meta/' + meta, :locals => { :f => f }
+  .drawer_handle
+    %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label

data/app/views/admin/forms/edit/_parts.html.haml

@@ -0,0 +1,9 @@
+#tab_control
+  #tabs.tabs
+    #tab_toolbar
+  #pages.pages
+    = hidden_field_tag 'page_part_index_field' #important
+    - @parts.each do |part|
+      .page{:id => "page_#{part}", 'data-caption'=>h(part)}
+        .part{:id => "part_#{part}"}
+          = render :partial => "/admin/forms/edit/parts/#{part}", :locals => { :f => f }

data/app/views/admin/forms/edit/_popups.html.haml

@@ -0,0 +1,3 @@
+= @popups.each do |popup|
+  .popup{ :id => "#{popup}_popup"}
+    = render :partial => "admin/forms/edit/popups/#{popup}"

data/app/views/admin/forms/edit/inputs/_title.html.haml

@@ -0,0 +1,3 @@
+%p.title
+  = f.label :title
+  = f.text_field :title, :class => 'textbox', :maxlenth => 255

data/app/views/admin/forms/edit/meta/_action.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :action, t('action')
+  %td.field
+    = f.text_field :action

data/app/views/admin/forms/edit/meta/_redirect_to.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :redirect_to, t('redirect to')
+  %td.field
+    = f.text_field :redirect_to

data/app/views/admin/forms/edit/parts/_body.html.haml

@@ -0,0 +1,2 @@
+= render :partial => '/admin/forms/edit/parts/filters', :locals => { :f => f }
+~ f.text_area :body, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/forms/edit/parts/_config.html.haml

@@ -0,0 +1 @@
+~ f.text_area :config, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/forms/edit/parts/_content.html.haml

@@ -0,0 +1,2 @@
+= render :partial => '/admin/forms/edit/parts/filters', :locals => { :f => f }
+~ f.text_area :content, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/forms/edit/parts/_filters.html.haml

@@ -0,0 +1,9 @@
+-#%p
+  =# f.label :filter_id, t('filter')
+  =# f.select :filter_id, filter_options_for_select(f.object.filter_id), :id => 'snippet_filter'
+%span.reference_links
+  = t('reference')
+  %span#filter_reference_link_body
+    = link_to t('filter'), '/admin/reference/filters?filter_name=Textile', :class => 'popup'
+  %span#tag_reference_link_body
+    = link_to t('available_tags'), '/admin/reference/tags', :class => 'popup'

data/app/views/admin/forms/edit/parts/_secondary.html.haml

@@ -0,0 +1,2 @@
+= render :partial => '/admin/forms/edit/parts/filters', :locals => { :f => f }
+~ f.text_area :secondary, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/forms/index.html.haml

@@ -1,20 +1,9 @@
 - @page_title = 'Forms - ' + default_page_title
 
 .outset
-  = render 'header'
-  #forms_table
-    %table.index
-      %thead
-        %tr
-          %th.form Form
-          %th.modify Modify
-      %tbody#forms_table_body
-        - if @forms.size != 0
-          = render :partial => 'form', :collection => @forms
-        -else
-          %tr
-            %td.empty{:colspan => 2} No Forms
-
+  %ol#forms.index
+    = render :partial => '/admin/forms/index/form', :collection => @forms
+    
 #actions
   %ul
     %li= link_to "New Form", new_admin_form_path

data/app/views/admin/forms/index/_form.html.haml

@@ -0,0 +1,13 @@
+%li.form.object{:id => "form_#{form.id}", :'data-id' => form.id}
+  .attributes
+    - render_region :body do |body|
+      - body.icon do
+        %span.icon.attribute
+          - link_to [:edit_admin, form] do
+            = image 'extensions/form/form', :alt => "#{form.title} Form"
+      - body.title do
+        %span.name.attribute
+          = link_to form.title, [:edit_admin, form]
+      - body.modify do
+        .attribute.actions
+          = link_to image('minus') + ' ' + t('remove'), [:admin, form], :method => :delete, :confirm => "Is it OK to delete #{form.title}?", :class => "action"

data/app/views/admin/forms/new.html.haml

@@ -1,15 +1,11 @@
-- body_classes << "reversed"
+- @page_title = t('new form')
 
 - render_region :main do |main|
-  - main.edit_header do
-    %h1= "New Form"
+  - main.head do
+    = render 'admin/forms/edit/head'
 
-  - main.edit_form do  
-    = render :partial => 'fields'
-    = hidden_field_tag 'page_part_index_field'
+  - main.popups do
+    = render 'admin/forms/edit/popups'
 
-- content_for :page_css do
-  :sass
-    .tab
-      .close
-        :display none
+  - main.form do
+    = render 'admin/forms/edit/form'

data/config/locales/en.yml

@@ -1,3 +1,6 @@
 ---
 en:
-  forms: Forms
+  forms: Forms
+  action: Action
+  redirect to: Redirect To
+  new form: New Form

data/forms_extension.rb

@@ -1,7 +1,7 @@
 class FormsExtension < Radiant::Extension
   version     YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
   description 'Radiant Form extension. Site wide, useful form management'
-  url         'http://github.com/squaretalent/radiant-forms-extension'
+  url         'http://github.com/dirkkelly/radiant-forms-extension'
   
   extension_config do |config|
   end

data/lib/forms/interface/forms.rb

@@ -10,11 +10,15 @@ module Forms
             def load_default_form_regions
               returning OpenStruct.new do |form|
                 form.edit = Radiant::AdminUI::RegionSet.new do |edit|
-                  edit.main.concat %w{edit_header edit_form}
-                  edit.form.concat %w{edit_title edit_content}
-                  edit.form_bottom.concat %w{edit_buttons edit_timestamp}
+                  edit.main.concat %w{form}
+                  edit.form.concat %w{inputs meta parts foot}
+                  edit.foot.concat %w{buttons timestamp}
                 end
                 form.new = form.edit
+                form.index = Radiant::AdminUI::RegionSet.new do |index|
+                  index.body.concat %w{icon title modify}
+                  index.foot.concat %w{buttons pagination}
+                end
               end
             end
         end

data/lib/forms/tags/core.rb

@@ -68,6 +68,28 @@ module Forms
           %(<input type="#{type}" value="#{value}" #{Forms::Tags::Helpers.attributes(tag)} />)
         end
       end
+
+      %w(textarea).each do |type|
+        desc %{
+          Render a @<#{type}>...</#{type}>@ tag to be used in a form
+          <pre><code><r:form:#{type} name="object[key]" /></code></pre>
+          
+          **Required**
+          * *name* the name of the data to be sent
+          
+          **Optional**
+          * *class* css class names
+          * *placeholder* default text, which is cleared when clicked
+          * *maxlength* the maximum amount of characters
+        }
+        tag "form:#{type}" do |tag|
+          Forms::Tags::Helpers.require!(tag,"form:#{type}",'name')
+          
+          tag.attr['type'] = type
+          
+          %(<#{type} #{Forms::Tags::Helpers.attributes(tag)}>#{tag.expand}</#{type}>)
+        end
+      end
       
       desc %{
         Renders a @<select>...</select>@ tag to be used in a form

data/public/stylesheets/sass/admin/extensions/forms/edit.sass

@@ -0,0 +1,17 @@
+.reference_links
+  padding: 1em 0
+  margin-top: -1em
+  
+.tabs
+  img.close
+    display: none
+    
+table.fieldset
+  th.label
+    white-space: nowrap
+  td.field
+    input, select
+      width: 99%
+      
+.buttons
+  clear: left

data/radiant-forms-extension.gemspec

@@ -1,83 +1,93 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.2.7"
+  s.version = "3.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-12-02}
+  s.date = %q{2010-12-20}
   s.description = %q{Send data from a page to a form handler, extendable with addons}
   s.email = %q{dirk.kelly@squaretalent.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "app/controllers/admin/forms_controller.rb",
-     "app/controllers/forms_controller.rb",
-     "app/models/form.rb",
-     "app/models/form_mail.rb",
-     "app/models/form_mailer.rb",
-     "app/models/form_page.rb",
-     "app/models/response.rb",
-     "app/views/admin/forms/_fields.html.haml",
-     "app/views/admin/forms/_filters.html.haml",
-     "app/views/admin/forms/_form.html.haml",
-     "app/views/admin/forms/_header.html.haml",
-     "app/views/admin/forms/edit.html.haml",
-     "app/views/admin/forms/index.html.haml",
-     "app/views/admin/forms/new.html.haml",
-     "app/views/admin/forms/remove.html.haml",
-     "config/locales/en.yml",
-     "config/routes.rb",
-     "cucumber.yml",
-     "db/migrate/001_create_forms.rb",
-     "db/migrate/002_create_user_observer.rb",
-     "db/migrate/003_rename_output_to_content.rb",
-     "db/migrate/004_create_responses.rb",
-     "db/migrate/20100929150423_change_to_updated_by_id.rb",
-     "db/migrate/20101012230144_add_another_content_field.rb",
-     "forms_extension.rb",
-     "lib/forms/config.rb",
-     "lib/forms/controllers/application_controller.rb",
-     "lib/forms/controllers/site_controller.rb",
-     "lib/forms/interface/forms.rb",
-     "lib/forms/models/extension.rb",
-     "lib/forms/models/page.rb",
-     "lib/forms/tags/core.rb",
-     "lib/forms/tags/helpers.rb",
-     "lib/forms/tags/responses.rb",
-     "lib/radiant-forms-extension.rb",
-     "lib/tasks/forms_extension_tasks.rake",
-     "public/images/admin/extensions/form/form.png",
-     "radiant-forms-extension.gemspec",
-     "spec/controllers/forms_controller_spec.rb",
-     "spec/datasets/forms.rb",
-     "spec/lib/forms/tags/core_spec.rb",
-     "spec/models/form_spec.rb",
-     "spec/models/response_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "app/controllers/admin/forms_controller.rb",
+    "app/controllers/forms_controller.rb",
+    "app/models/form.rb",
+    "app/models/form_mail.rb",
+    "app/models/form_mailer.rb",
+    "app/models/form_page.rb",
+    "app/models/response.rb",
+    "app/views/admin/forms/edit.html.haml",
+    "app/views/admin/forms/edit/_foot.html.haml",
+    "app/views/admin/forms/edit/_form.html.haml",
+    "app/views/admin/forms/edit/_head.html.haml",
+    "app/views/admin/forms/edit/_inputs.html.haml",
+    "app/views/admin/forms/edit/_meta.html.haml",
+    "app/views/admin/forms/edit/_parts.html.haml",
+    "app/views/admin/forms/edit/_popups.html.haml",
+    "app/views/admin/forms/edit/inputs/_title.html.haml",
+    "app/views/admin/forms/edit/meta/_action.html.haml",
+    "app/views/admin/forms/edit/meta/_redirect_to.html.haml",
+    "app/views/admin/forms/edit/parts/_body.html.haml",
+    "app/views/admin/forms/edit/parts/_config.html.haml",
+    "app/views/admin/forms/edit/parts/_content.html.haml",
+    "app/views/admin/forms/edit/parts/_filters.html.haml",
+    "app/views/admin/forms/edit/parts/_secondary.html.haml",
+    "app/views/admin/forms/index.html.haml",
+    "app/views/admin/forms/index/_form.html.haml",
+    "app/views/admin/forms/new.html.haml",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "cucumber.yml",
+    "db/migrate/001_create_forms.rb",
+    "db/migrate/002_create_user_observer.rb",
+    "db/migrate/003_rename_output_to_content.rb",
+    "db/migrate/004_create_responses.rb",
+    "db/migrate/20100929150423_change_to_updated_by_id.rb",
+    "db/migrate/20101012230144_add_another_content_field.rb",
+    "forms_extension.rb",
+    "lib/forms/config.rb",
+    "lib/forms/controllers/application_controller.rb",
+    "lib/forms/controllers/site_controller.rb",
+    "lib/forms/interface/forms.rb",
+    "lib/forms/models/extension.rb",
+    "lib/forms/models/page.rb",
+    "lib/forms/tags/core.rb",
+    "lib/forms/tags/helpers.rb",
+    "lib/forms/tags/responses.rb",
+    "lib/radiant-forms-extension.rb",
+    "lib/tasks/forms_extension_tasks.rake",
+    "public/images/admin/extensions/form/form.png",
+    "public/stylesheets/sass/admin/extensions/forms/edit.sass",
+    "radiant-forms-extension.gemspec",
+    "spec/controllers/forms_controller_spec.rb",
+    "spec/datasets/forms.rb",
+    "spec/lib/forms/tags/core_spec.rb",
+    "spec/models/form_spec.rb",
+    "spec/models/response_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/squaretalent/radiant-forms-extension}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Forms Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/forms_controller_spec.rb",
-     "spec/datasets/forms.rb",
-     "spec/lib/forms/tags/core_spec.rb",
-     "spec/models/form_spec.rb",
-     "spec/models/response_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/datasets/forms.rb",
+    "spec/lib/forms/tags/core_spec.rb",
+    "spec/models/form_spec.rb",
+    "spec/models/response_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -85,9 +95,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<radiant-drag_order-extension>, [">= 0.4.9"])
     else
+      s.add_dependency(%q<radiant-drag_order-extension>, [">= 0.4.9"])
     end
   else
+    s.add_dependency(%q<radiant-drag_order-extension>, [">= 0.4.9"])
   end
 end
 

data/spec/controllers/forms_controller_spec.rb

@@ -37,13 +37,9 @@ describe FormsController do
       
     end
     
-
-    
-    
-    
   end
   
-  context '#create' do
+  context '#update' do
     
     before :each do
       @page = pages(:home)
@@ -153,19 +149,31 @@ describe FormsController do
           
         end
         
+        context 'redirect params set' do
+          
+          before :each do
+            put :update, @params.merge!(:redirect_to => '/somewhere')
+          end
+          
+          it 'should render page url' do
+            response.should redirect_to('/somewhere')
+          end
+          
+        end
         context 'form does not have a redirect url' do
           
           before :each do
-            @page.slug = '/page/url'
+            @request.env['HTTP_REFERER'] = '/request/url'
             put :update, @params
           end
           
           it 'should render page url' do
-            response.should redirect_to(@page.url)
+            response.should redirect_to('/request/url')
           end
           
         end
         
+        
       end
       
       context 'cant save response' do

data/spec/lib/forms/tags/core_spec.rb

@@ -11,6 +11,7 @@ describe Forms::Tags::Core do
         'form',
         'form:label',
         'form:text',
+        'form:textarea',
         'form:password',
         'form:reset',
         'form:checkbox',
@@ -25,7 +26,6 @@ describe Forms::Tags::Core do
         'form:read',
         'form:read:each',
         
-        'param',
         'response',
         'response:if_response',
         'response:unless_response',
@@ -36,6 +36,7 @@ describe Forms::Tags::Core do
         'response:if_get', 
         'response:unless_get',  
         
+        'param',
         'index',
         'reset'    
       ].sort
@@ -95,6 +96,25 @@ describe Forms::Tags::Core do
       end
       
     end
+
+    %w(textarea).each do |type|
+
+      describe "<r:form:#{type}>" do      
+        
+        it 'should render the correct HTML' do
+          tag = %{<r:form:#{type} name="test[field]" />}
+          expected = %{<#{type} name="test[field]" class="#{type}" id="test_field"></#{type}>}
+          @page.should render(tag).as(expected)
+        end
+        
+        it 'should require the name attribute' do
+          tag = %{<r:form:#{type} />}
+          @page.should_not render(tag)
+        end
+        
+      end
+      
+    end
     
     describe '<r:form:select>' do
       
@@ -134,7 +154,7 @@ describe Forms::Tags::Core do
       it 'should require the name attribute' do
         tag = %{<r:form:radios />}
         @page.should_not render(tag)
-      end
+      end      
       
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 3
   - 2
-  - 7
-  version: 3.2.7
+  - 8
+  version: 3.2.8
 platform: ruby
 authors: 
 - dirkkelly
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +08:00
+date: 2010-12-20 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 4
+        - 9
+        version: 0.4.9
+  name: radiant-drag_order-extension
+  requirement: *id001
 description: Send data from a page to a form handler, extendable with addons
 email: dirk.kelly@squaretalent.com
 executables: []
@@ -28,7 +43,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - README.md
 - Rakefile
 - VERSION
@@ -39,14 +53,25 @@ files:
 - app/models/form_mailer.rb
 - app/models/form_page.rb
 - app/models/response.rb
-- app/views/admin/forms/_fields.html.haml
-- app/views/admin/forms/_filters.html.haml
-- app/views/admin/forms/_form.html.haml
-- app/views/admin/forms/_header.html.haml
 - app/views/admin/forms/edit.html.haml
+- app/views/admin/forms/edit/_foot.html.haml
+- app/views/admin/forms/edit/_form.html.haml
+- app/views/admin/forms/edit/_head.html.haml
+- app/views/admin/forms/edit/_inputs.html.haml
+- app/views/admin/forms/edit/_meta.html.haml
+- app/views/admin/forms/edit/_parts.html.haml
+- app/views/admin/forms/edit/_popups.html.haml
+- app/views/admin/forms/edit/inputs/_title.html.haml
+- app/views/admin/forms/edit/meta/_action.html.haml
+- app/views/admin/forms/edit/meta/_redirect_to.html.haml
+- app/views/admin/forms/edit/parts/_body.html.haml
+- app/views/admin/forms/edit/parts/_config.html.haml
+- app/views/admin/forms/edit/parts/_content.html.haml
+- app/views/admin/forms/edit/parts/_filters.html.haml
+- app/views/admin/forms/edit/parts/_secondary.html.haml
 - app/views/admin/forms/index.html.haml
+- app/views/admin/forms/index/_form.html.haml
 - app/views/admin/forms/new.html.haml
-- app/views/admin/forms/remove.html.haml
 - config/locales/en.yml
 - config/routes.rb
 - cucumber.yml
@@ -69,6 +94,7 @@ files:
 - lib/radiant-forms-extension.rb
 - lib/tasks/forms_extension_tasks.rake
 - public/images/admin/extensions/form/form.png
+- public/stylesheets/sass/admin/extensions/forms/edit.sass
 - radiant-forms-extension.gemspec
 - spec/controllers/forms_controller_spec.rb
 - spec/datasets/forms.rb
@@ -82,8 +108,8 @@ homepage: http://github.com/squaretalent/radiant-forms-extension
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-*/.DS_Store
-pkg

data/app/views/admin/forms/_fields.html.haml

@@ -1,56 +0,0 @@
-- form_for [:admin, @form], :html => {:onsubmit_status => onsubmit_status(@form)}, :html => { :enctype => 'multipart/form-data' } do |form_form|
-  .form_top
-    - render_region :form_top do |form_top|
-      -# empty
-      
-  .form_area
-    - render_region :form do |form|
-      - form.edit_title do
-        %p.title
-          = form_form.label :title, 'Title'
-          = form_form.text_field :title, :class => 'textbox activate', :maxlength => 255
-        
-        .drawer
-          .drawer_contents#attributes
-            %table.fieldset
-              %tr
-                %th.label= form_form.label :action, 'Action'
-                %td.field= form_form.text_field :action, :class => 'textbox', :maxlength => 100, :size => 100
-              %tr
-                %th.label= form_form.label :redirect_to, 'Redirect To'
-                %td.field= form_form.text_field :redirect_to, :class => 'textbox', :maxlength => 100, :size => 100
-          .drawer_handle
-            %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label
-                
-      - form.edit_content do
-        #tab_control
-          #tabs.tabs
-          #parts.pages
-            #form_body.page{'data-caption'=>'body'}
-              = render '/admin/forms/filters'
-              = form_form.text_area :body, :class => 'textarea large', :style => 'width: 100%'
-            #form_config.page{'data-caption'=>'config'}
-              = form_form.text_area :config, :class => 'textarea large', :style => 'width: 100%'
-            #form_content.page{'data-caption'=>'content'}
-              = render '/admin/forms/filters'
-              = form_form.text_area :content, :class => 'textarea large', :style => 'width: 100%'
-            #form_content.page{'data-caption'=>'secondary'}
-              = render '/admin/forms/filters'
-              = form_form.text_area :secondary, :class => 'textarea large', :style => 'width: 100%'
-      
-  .form_bottom          
-    - render_region :form_bottom do |form_bottom|
-      - form_bottom.edit_buttons do
-        %p.buttons{:style=>"clear: left"}
-          = save_model_button(@form)
-          = save_model_and_continue_editing_button(@form)
-          or
-          = link_to t('cancel'), admin_forms_url
-      - form_bottom.edit_timestamp do
-        %p.updated_line
-          = updated_stamp @form
-
-- content_for :page_css do
-  :sass
-    th.label
-      :width 75px !important

data/app/views/admin/forms/_filters.html.haml

@@ -1,7 +0,0 @@
-%p
-  %span.reference_links
-    = t('reference')
-    %span#filter_reference_link_body
-      = link_to t('filter'), '/admin/reference/filters?filter_name=Textile', :class => 'popup'
-    %span#tag_reference_link_body
-      = link_to t('available_tags'), '/admin/reference/tags', :class => 'popup'

data/app/views/admin/forms/_form.html.haml

@@ -1,6 +0,0 @@
-%tr.node.level_1
-  %td.snippet
-    = image('extensions/form/form', :alt => '')
-    %span= link_to form.title, edit_admin_form_path(form)
-  %td.remove
-    = link_to t('remove'), remove_admin_form_path(form)

data/app/views/admin/forms/_header.html.haml

@@ -1,3 +0,0 @@
--# include_stylesheet 'admin/former'
-
--# include_javascript 'admin/former'

data/app/views/admin/forms/remove.html.haml

@@ -1,20 +0,0 @@
-%h1 Remove Form
-
-%p 
-  Are you sure you want to  
-  %strong.warning permanently remove
-  the following form?
-
-%table.index#form{ :cellpadding => "0", :cellspacing => "0", :border => "0" }
-  %tbody
-    %tr.node.level-1{ :onmouseover => "Element.addClassName(this, 'highlight');", :onmouseout => "Element.removeClassName(this, 'highlight');" }
-      %td.asset
-        = image('form.png', :alt => '')
-        = @form.title
-
-
-- form_for [:admin, @form], :html => { :method => 'delete', :onsubmit_status => "Removing Form…" } do
-  %p.buttons
-    %input.button{ :type => "submit", :value => "Delete Form" }
-    or
-    = link_to 'Cancel', admin_forms_path