scrivito_crm_form_widget 0.9.0.beta4 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06209bc113cc89786f963d48d5aedd2dc6f4f3b
-  data.tar.gz: b4b41373a34aacda09c4f850ddf072e7709a7a11
+  metadata.gz: 61d8010804a45532c3f11197e5d06246b4e11af0
+  data.tar.gz: 92dd9c97509bf20c400931907b4734fa42d66239
 SHA512:
-  metadata.gz: 70875a541ccfba903ac0e6bfbcb02a0643f68a751af31c8b522fb966f7183ce8e467417c71026ff3940700d20f9daf6d2e07afaaaf74ca505627c81c6b061322
-  data.tar.gz: aec6630283edb2b7093f18cb473b0843edd95ddc7e2cc004b371748489646f3330400c5a60d16d6cce29e5bebc2f345902d4618823b698e7ac826e1b5becb869
+  metadata.gz: 172167c6bd997f23fdd63dbca8a548bb1192c4be39ffc76f3d54d63db249a22aaf1ea3abfa960f488a6691029af51449f1b9b5330837e0a98fb9d81afe89a162
+  data.tar.gz: 2588fa8bd49632eefc827f443e4147dd6c7fb9a57d638ed4c1696844de6fd56b80929a71dee28660092649170e99f6f7575411f9a5f442c460c159a8016a5fb3

data/app/assets/styles/scrivito_crm_form_widget.scss

@@ -31,4 +31,3 @@ form.form-horizontal.two-column-layout {
     margin-top: 15px;
   }
 }
-

data/app/models/crm_form_level_widget.rb

@@ -0,0 +1,17 @@
+class CrmFormLevelWidget < Widget
+  attribute :fields, :stringlist
+  attribute :headline, :string
+
+  def self.valid_container_classes
+    [CrmFormWidget]
+  end
+
+  def attributes
+    Hash[fields.map {|f| [f, container.attributes[f]] }]
+  end
+
+  def selectable
+    elems = container.attributes.map(&:first)
+    return elems
+  end
+end

data/app/models/crm_form_widget.rb

@@ -11,6 +11,12 @@ class CrmFormWidget < Widget
   attribute :label_position, :enum, values: ['left','top'], default: 'left'
   attribute :columns, :enum, values: ['one','two'], default: 'one'
 
+  attribute :multilevel, :enum, values: ['Yes','No'], default: 'No'
+  attribute :levels, :widgetlist
+  attribute :multilevel_dynamic, :string, default: 'More attributes'
+  attribute :multilevel_file, :string, default: 'File upload'
+  attribute :multilevel_send, :string, default: 'Send'
+
   attribute :file_upload, :enum, values: ['Yes','No'], default: 'No'
   attribute :styles, :stringlist
 
@@ -23,7 +29,7 @@ class CrmFormWidget < Widget
   end
 
   def valid_widget_classes_for(field_name)
-    [DynamicAttributeWidget]
+    [field_name == 'levels' ? CrmFormLevelWidget : DynamicAttributeWidget]
   end
 
   def self.activities
@@ -42,6 +48,10 @@ class CrmFormWidget < Widget
     self.activity_id != ""
   end
 
+  def multilevel?
+    multilevel == 'Yes'
+  end
+
   def submit_button
     submit_button_text.present? ? submit_button_text : "send"
   end
@@ -67,7 +77,7 @@ class CrmFormWidget < Widget
   end
 
   def field_as_select?(options)
-    columns == 'two' || options['valid_values'].count > 5
+    columns == 'two' || options['valid_values'].count > 4
   end
 
   def file_upload?

data/app/views/crm_form_level_widget/details.html.erb

@@ -0,0 +1,6 @@
+<%= scrivito_details_for t('scrivito_crm_form_widget.details.attributes', default: 'Attribuets for this level') do %>
+  <%= scrivito_details_for do %>
+    <%= scrivito_tag :div, widget, :headline %>
+  <% end %>
+  <%= scrivito_tag :div, widget, :fields, data: { multi_select_list: widget.selectable } %>
+<% end %>

data/app/views/crm_form_widget/_attributes.html.erb

@@ -0,0 +1,4 @@
+<% attributes.each do |name, options| %>
+  <% CrmFormPresenter.send(:attr_accessor, name.to_sym) %>
+  <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil, widget: widget %>
+<% end %>

data/app/views/crm_form_widget/_dynamic_attributes.html.erb

@@ -1,5 +1,4 @@
-<% attributes.each do |attribute| %>
-  <% name, type = attribute.split(':') %>
-  <%= name %>
-  <%= type %>
+<% widget.dynamic_attributes.each do |attribute| %>
+  <% CrmFormPresenter.send(:attr_accessor, attribute.field_name.to_sym) %>
+  <%= render "crm_form_widget/crm_#{attribute.type}", form: form, name: attribute.field_name, options: attribute.options || {}, label: attribute.label, widget: widget %>
 <% end %>

data/app/views/crm_form_widget/_file_upload.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group form-field-custom-file">
+  <% CrmFormPresenter.send(:attr_accessor, :custom_file) %>
+  <%= form.label :custom_file, t('scrivito_crm_form_widget.view.file', default: 'File upload'), class: "control-label col-sm-3" %>
+  <div class="col-sm-9">
+    <%= form.file_field :custom_file, class: "form-control" %>
+  </div>
+</div>

data/app/views/crm_form_widget/_form.html.erb

@@ -5,26 +5,6 @@
 
   <%= form.hidden_field(:widget_id, value: widget.id) %>
 
-  <% widget.attributes.each do |name, options| %>
-    <% CrmFormPresenter.send(:attr_accessor, name.to_sym) %>
-    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil, widget: widget %>
-  <% end %>
-
-  <% widget.dynamic_attributes.each do |attribute| %>
-    <% CrmFormPresenter.send(:attr_accessor, attribute.field_name.to_sym) %>
-    <%= render "crm_form_widget/crm_#{attribute.type}", form: form, name: attribute.field_name, options: attribute.options || {}, label: attribute.label, widget: widget %>
-  <% end %>
-
-  <% if widget.file_upload? %>
-    <div class="form-group form-field-custom-file">
-      <% CrmFormPresenter.send(:attr_accessor, :custom_file) %>
-      <%= form.label :custom_file, t('scrivito_crm_form_widget.view.file', default: 'File upload'), class: "control-label col-sm-3" %>
-      <div class="col-sm-9">
-        <%= form.file_field :custom_file, class: "form-control" %>
-      </div>
-    </div>
-  <% end %>
-
   <div class="form-group last">
     <label class="control-label col-sm-3" for="crm_form_presenter_email">Email</label>
     <div class="col-sm-9">
@@ -32,7 +12,45 @@
     </div>
   </div>
 
-  <div class="form-submit-button-container clearfix">
-    <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
-  </div>
+  <% if widget.multilevel? %>
+    <div class="crm-form-widget-multilevel">
+      <% widget.levels.each do |level| %>
+        <fieldset>
+          <%= scrivito_tag :legend, level, :headline %>
+          <%= render 'crm_form_widget/attributes', widget: widget, form: form, attributes: level.attributes %>
+        </fieldset>
+
+        <% if widget.dynamic_attributes.any? %>
+          <fieldset>
+            <%= scrivito_tag :legend, widget, :multilevel_dynamic %>
+            <%= render 'crm_form_widget/dynamic_attributes', widget: widget, form: form %>
+          </fieldset>
+        <% end %>
+
+        <% if widget.file_upload? %>
+          <fieldset>
+            <%= scrivito_tag :legend, widget, :multilevel_file %>
+            <%= render 'crm_form_widget/file_upload', widget: widget, form: form %>
+          </fieldset>
+        <% end %>
+      <% end %>
+
+      <fieldset>
+        <%= scrivito_tag :legend, widget, :multilevel_send %>
+        <div class="form-submit-button-container clearfix">
+          <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
+        </div>
+      </fieldset>
+    </div>
+  <% else %>
+    <%= render 'crm_form_widget/attributes', widget: widget, form: form, attributes: widget.attributes %>
+    <%= render 'crm_form_widget/dynamic_attributes', widget: widget, form: form %>
+    <% if widget.file_upload? %>
+      <%= render 'crm_form_widget/file_upload', widget: widget, form: form %>
+    <% end %>
+
+    <div class="form-submit-button-container clearfix">
+      <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
+    </div>
+  <% end %>
 <% end %>

data/app/views/crm_form_widget/details.html.erb

@@ -1,10 +1,14 @@
 <%= scrivito_large_dialog do %>
   <ul class="tab-list">
     <li class="active" data-panel-target="#edit-general">General</li>
+    <li data-panel-target="#edit-options">Options</li>
     <li data-panel-target="#edit-tags">Tags</li>
     <li data-panel-target="#edit-activity">Activity</li>
     <li data-panel-target="#edit-event">Event</li>
-    <li data-panel-target="#edit-dynamic">Add fields</li>
+    <li data-panel-target="#edit-dynamic">Dynamic fields</li>
+    <% if widget.multilevel? %>
+      <li data-panel-target="#edit-multilevel">Levels</li>
+    <% end %>
   </ul>
 
   <div class="tab-panels">
@@ -12,6 +16,7 @@
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.subject', default: 'Subject') do %>
         <%= scrivito_tag :div, widget, :subject %>
       <% end %>
+
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.redirect_to', default: 'Redirect after submit') do %>
         <%= scrivito_tag :div, widget, :redirect_to %>
       <% end %>
@@ -20,6 +25,16 @@
         <%= scrivito_tag :div, widget, :submit_button_text %>
       <% end %>
 
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.file_upload', default: 'File upload') do %>
+        <%= scrivito_tag :div, widget, :file_upload %>
+      <% end %>
+
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.styles', default: 'Styles') do %>
+        <%= scrivito_tag :div, widget, :styles, data: { multi_select_list: widget.scrivito_selectable_style_classes } %>
+      <% end %>
+    </div>
+
+    <div class="tab-panel" id="edit-options">
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.label_position', default: 'Label Position') do %>
         <%= scrivito_tag :div, widget, :label_position %>
       <% end %>
@@ -28,12 +43,22 @@
         <%= scrivito_tag :div, widget, :columns %>
       <% end %>
 
-      <%= scrivito_details_for t('scrivito_crm_form_widget.details.file_upload', default: 'File upload') do %>
-        <%= scrivito_tag :div, widget, :file_upload %>
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.multilevel', default: 'Is a multilevel form') do %>
+        <%= scrivito_tag :div, widget, :multilevel, data: { scrivito_editors_reload: true } %>
       <% end %>
 
-      <%= scrivito_details_for t('scrivito_crm_form_widget.details.file_upload', default: 'File upload') do %>
-        <%= scrivito_tag :div, widget, :styles, data: { multi_select_list: widget.scrivito_selectable_style_classes } %>
+      <% if widget.multilevel? %>
+        <%= scrivito_details_for t('scrivito_crm_form_widget.details.multilevel_dynamic', default: 'Dynamic headline') do %>
+          <%= scrivito_tag :div, widget, :multilevel_dynamic %>
+        <% end %>
+
+        <%= scrivito_details_for t('scrivito_crm_form_widget.details.multilevel_file', default: 'File updload headline') do %>
+          <%= scrivito_tag :div, widget, :multilevel_file %>
+        <% end %>
+
+        <%= scrivito_details_for t('scrivito_crm_form_widget.details.multilevel_send', default: 'Send Headline') do %>
+          <%= scrivito_tag :div, widget, :multilevel_send %>
+        <% end %>
       <% end %>
     </div>
 
@@ -63,5 +88,11 @@
     <div class="tab-panel" id="edit-dynamic">
       <%= scrivito_tag :div, widget, :dynamic_attributes %>
     </div>
+
+    <% if widget.multilevel? %>
+      <div class="tab-panel" id="edit-multilevel">
+        <%= scrivito_tag :div, widget, :levels %>
+      </div>
+    <% end %>
   </div>
-<% end %>
+<% end %>

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "0.9.0.beta4"
+  VERSION = "1.0.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta4
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito
@@ -79,14 +79,18 @@ files:
 - app/assets/scripts/scrivito_crm_form_widget.js
 - app/assets/styles/scrivito_crm_form_widget.scss
 - app/controllers/scrivito_crm_form_widget/application_controller.rb
+- app/models/crm_form_level_widget.rb
 - app/models/crm_form_widget.rb
 - app/models/dynamic_attribute_widget.rb
 - app/presenter/crm_form_presenter.rb
+- app/views/crm_form_level_widget/details.html.erb
+- app/views/crm_form_widget/_attributes.html.erb
 - app/views/crm_form_widget/_crm_enum.html.erb
 - app/views/crm_form_widget/_crm_multienum.html.erb
 - app/views/crm_form_widget/_crm_string.html.erb
 - app/views/crm_form_widget/_crm_text.html.erb
 - app/views/crm_form_widget/_dynamic_attributes.html.erb
+- app/views/crm_form_widget/_file_upload.html.erb
 - app/views/crm_form_widget/_form.html.erb
 - app/views/crm_form_widget/details.html.erb
 - app/views/crm_form_widget/show.html.erb