phantom_forms 0.1.8 → 0.2.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71a329aebb0122805bb05d1692cfebe526d73b06
-  data.tar.gz: b4c45424135a294668dabe75c5d59e1ffa7b39f7
+  metadata.gz: fee862caffd78e920cb2b09495e9278d55bf2647
+  data.tar.gz: e2c8b34bfe8e47765806b2728147704d3277c955
 SHA512:
-  metadata.gz: 5bca0db0f898420705da46c066440049b4a776f42fb38a5e242ae0a1f30d26f8827d8005d98d2816073f4ae2d4ac1d7ea5d0e63541f1d73c6ce4052014756374
-  data.tar.gz: 1a41b583ea510fcbea08943bfc8a40d13558d5fa5616fbcf76b5a9480ab8a3d07ab5364f3b933772c14afb41bd09214d6938f38bf22b43973d902293cf3bba6e
+  metadata.gz: a345c10e0c43a4b62abac55e9d3aced9b64d623107ee01961d1e1ca67b26244d830a4e2a97c389e15bf658dcfd950520567f62aac1a5adb4c0c868851e9feb62
+  data.tar.gz: 546aeabcb6ddd3b37f8431e5d293133d51fe513adf8c36535f435b2713ebc27fb67195436bef56b096751830f28082ef69cb59b38852ce214b30590ed9e3fb1f

data/lib/phantom_forms/helper.rb

@@ -6,33 +6,14 @@ module PhantomForms
       options[:builder] = PhantomForms::FormBuilders::ValidateFormBuilder
       options[:remote] = true
       options[:html] = {:class => 'remote-form form'}
-      content_tag :div, class: "col-md-12" do
-        content_tag :div, class: "well" do
-          form_for(object, options, &block)
-        end
-      end
-    end
 
-    def remote_form_panel_for(object, panel_title = nil, options = {}, &block)
-      options[:validate] = true
-      options[:builder] = PhantomForms::FormBuilders::ValidateFormBuilder
-      options[:remote] = true
-      options[:html] = {:class => 'remote-form form'}
-      content_tag :div, class: "col-md-12" do
-        content_tag :div, class: "panel panel-primary" do
-          [
-            if panel_title
-              content_tag :div, class: "panel-heading" do
-                content_tag :h3, class: "panel-title" do
-                  panel_title
-                end
-              end
-            end,
-            content_tag(:div, class: "panel-body") do
-              form_for(object, options, &block)
-            end
-          ].join.html_safe
-        end
+      object_name = get_class(extract_object(object))
+      object_class = options[:resource] ||  object_name
+      label = options[:label] || t("#{object_name.underscore}.singular")
+
+      content_tag :div, class: "panel panel-primary" do
+        concat(panel_title(label, slide_form_close_button(object_class)))
+        concat(content_tag(:div, class: "panel-body") { form_for(object, options, &block) })
       end
     end
 
@@ -40,64 +21,66 @@ module PhantomForms
       options[:validate] = true
       options[:builder] = PhantomForms::FormBuilders::ValidateFormBuilder
       options[:html] = {:class => 'normal-form form'}
-      content_tag :div, class: "row" do
-        content_tag :div, class: "col-md-12" do
-          form_for(object, options, &block)
-        end
+
+      object_name = get_class(extract_object(object))
+      object_class = options[:resource] ||  object_name
+      label = options[:label] || t("#{object_name.underscore}.singular")
+
+      content_tag :div, class: "panel panel-primary" do
+        concat(panel_title(label, slide_form_close_button(object_class))) unless label == 'nil'
+        concat(content_tag(:div, class: "panel-body") { form_for(object, options, &block) })
       end
     end
 
+
     def modal_form_for(object, options = {}, &block)
       options[:validate] = true
       options[:builder] = PhantomForms::FormBuilders::ValidateFormBuilder
       options[:html] = {:'data-type' => 'script', :class => 'remote-form'}
       options[:remote] = true
-      form_for(object, options, &block)
+
+      object_name = get_class(extract_object(object))
+      object_class = options[:resource] ||  object_name
+      label = options[:label] || t("#{object_name.underscore}.singular")
+
+      content_tag :div, class: "col-md-12 alert-dismissable" do
+        content_tag :div, class: "panel panel-primary" do
+          concat(panel_title(label, modal_close_button))
+          concat(content_tag(:div, class: "panel-body") { form_for(object, options, &block) })
+        end
+      end
     end
 
     def normal_modal_form_for(object, options = {}, &block)
       options[:validate] = true
       options[:builder] = PhantomForms::FormBuilders::ValidateFormBuilder
       options[:html] = {:'data-type' => 'script', :class => 'normal-form'}
-      form_for(object, options, &block)
-    end
 
-    def buttons_for(object, options = {})
-      object_name = get_class(object)
-      object_class = options[:nested_id] ||  object_name
-
-      locale_name =  object_name.underscore
-      locale = options[:label] || t("#{locale_name}.save")
+      object_name = get_class(extract_object(object))
+      object_class = options[:resource] ||  object_name
+      label = options[:label] || t("#{object_name.underscore}.singular")
 
-      content_tag :div, :class => 'row' do
-        [
-          content_tag(:div, :class => 'col-md-9') do
-            concat submit_button( locale , :id => "submit-#{object_class}-button")
-          end,
-          content_tag(:div, :class => 'col-md-3') do
-            concat link_to_cancel( :id => "cancel-#{object_class}-link")
-          end
-        ].join.html_safe
+      content_tag :div, class: "panel panel-primary" do
+        concat(panel_title(label, modal_close_button))
+        concat(content_tag(:div, class: "panel-body") { form_for(object, options, &block) })
       end
     end
 
-    def modal_buttons_for(object, options = {})
+    def buttons_for(object, options = {})
       object_name = get_class(object)
-      object_class = options[:nested_id] ||  object_name
+      object_class = options[:resource] ||  object_name
 
       locale_name =  object_name.underscore
       locale = options[:label] || t("#{locale_name}.save")
-
-      content_tag :div, :class => 'row' do
-        content_tag :div, :class => 'col-md-12' do
-          concat submit_button( locale , :id => "submit-#{object_class}-button")
-          concat link_to_modal_cancel( :id => "cancel-#{object_class}-link")
-        end
+      content_tag :div, class: "panel-footer" do
+        submit_button(locale, :id => "submit-#{object_class}-button")
       end
     end
 
 
-    private
+    def modal_form_error(id)
+      content_tag :div, nil, :id => id
+    end
 
     def get_class(object)
       object_class_name = object.class.to_s.underscore.dasherize.split('/').last
@@ -108,5 +91,21 @@ module PhantomForms
       end
     end
 
+    private
+
+    def extract_object(object)
+      if object.kind_of?(Array)
+        object.last
+      else
+        object
+      end
+    end
+
+    def slide_form_close_button(object_class)
+      content_tag :button, id: "close-#{object_class}-button", :class => 'close-form' do
+        "&times".html_safe
+      end
+    end
+
   end
 end

data/vendor/assets/javascripts/forms.js.coffee

@@ -15,10 +15,42 @@ formBuilder =
 
 window.Rails4ClientSideValidations.formBuilders["PhantomForms::FormBuilders::ValidateFormBuilder"] = formBuilder
 
-$ ->
+manage_form_hiding = (resource) ->
+  console.log resource
+  resource_new_link = "#new-" + resource + "-link"
+  resource_form = "#new-" + resource
+  console.log 'resource_new_link: ' + resource_new_link
+  console.log 'resource_form: ' + resource_form
+  $(resource_new_link).show()
+  $(resource_form).slide()
+
+
+ready = ->
 
   window.Rails4ClientSideValidations.callbacks.element.fail = (element, message, callback) ->
     callback()
     if element.data("valid") isnt false
       element.parent().parent().addClass "error"
       element.parent().find(".message").addClass "error help-inline"
+
+
+  $(document).off('click', '.cancel-link').on "click",".cancel-link", (e) ->
+    e.preventDefault()
+    if $(e.target).parents('.modal-body').length is 0
+      resource = $(this).attr("id").replace("cancel-", "").replace("-link", "")
+      manage_form_hiding(resource)
+
+  $(document).off('click', '.close').on "click",".close", (e) ->
+    e.preventDefault()
+    if $(e.target).parents('.modal').length is 0
+      resource = $(this).attr("id").replace("close-", "").replace("-button", "")
+      manage_form_hiding(resource)
+
+  $(document).off('click', '.close-form').on "click",".close-form", (e) ->
+    console.log 'close-form click'
+    e.preventDefault()
+    resource = $(this).attr("id").replace("close-", "").replace("-button", "")
+    manage_form_hiding(resource)
+
+$(document).ready(ready)
+$(window).bind('page:change', ready)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_forms
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0.alpha1
 platform: ruby
 authors:
 - Vassil Kalkov
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails4_client_side_validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,16 +44,16 @@ dependencies:
   name: phantom_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0.alpha1
 description: rails helpers for bootstrap 3
 email: info@genshin.org
 executables: []
@@ -83,9 +83,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: