scrivito_crm_form_widget 0.9.0.beta1 → 0.9.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4569ddbae114e16cb7d17dc8e8d2857b0ebc62da
-  data.tar.gz: 262ecd566b718f014b97b5ffc4ee6cc2f71aac55
+  metadata.gz: 445ae51d6ff6bd4b7d01038a4de1e0656b2b14e4
+  data.tar.gz: 87420d5167f8893a63b3411a3f0f7bec15962676
 SHA512:
-  metadata.gz: a6081661f981e78cd231405670b376559913d60bc2521fa71ff8dd285c594139aa019df5bcea30b78097264a12fbc4d6b50064a699e198182dbc64d1989f1292
-  data.tar.gz: b71cb0354e2f52ea1bd027d5e39aa7b5ead25219c96d866271820bff830ed0311e12612cc8c3ccce535fe7a89ad6678589dfd6a56b5bcc839ff7b67b4ea040f1
+  metadata.gz: b3737a7f7bd5ded881213af98218ff3cc01b7744f6e7c18131d99179ef0661c9b97afef1c6183bf59cb4649a4c787cd9c0c613633095ad8aec0b4f62f769f96c
+  data.tar.gz: 643ed3f4b9fc428ea3f13e36ebbc0f986ec641024c0e587b835bbe3f285373e78178e0f1e0f64d6d9c27c067e62ece645152378c3667aef730899d9e08eed212

data/app/assets/styles/scrivito_crm_form_widget.scss

@@ -22,9 +22,13 @@ form.form-horizontal.two-column-layout {
     margin: 0;
   }
 
-  .btn {
+  .form-submit-button-container {
     clear: both;
+  }
+
+  .btn {
     margin-right: 15px;
+    margin-top: 15px;
   }
 }
 

data/app/models/crm_form_widget.rb

@@ -12,6 +12,15 @@ class CrmFormWidget < Widget
   attribute :columns, :enum, values: ['one','two'], default: 'one'
 
   attribute :file_upload, :enum, values: ['Yes','No'], default: 'No'
+  attribute :styles, :stringlist
+
+  def scrivito_selectable_style_classes
+    if Obj.respond_to? 'scrivito_selectable_style_classes'
+      Obj.scrivito_selectable_style_classes('CrmFormWidget')
+    else
+      []
+    end
+  end
 
   def valid_widget_classes_for(field_name)
     [DynamicAttributeWidget]

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

@@ -2,16 +2,16 @@
   <%= form.label name.to_sym, label, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
   <div class="col-sm-9">
     <% if widget.field_as_select?(options) %>
-      <%= form.select(name.to_sym, options_for_select(options['valid_values'].map { |u| [u, u.downcase] })) %>
+      <%= form.select(name.to_sym, options_for_select(options['valid_values'].map { |u| [t("helpers.label.crm_form_presenter.#{name}_option.#{u.parameterize}"), u] }), {}, class: 'form-control') %>
     <% else %>
       <% options['valid_values'].each do |value| %>
         <div class="radio">
-          <%= form.label "#{name}_#{value.downcase}" do %>
+          <%= form.label "#{name}_#{value.parameterize}" do %>
             <%= form.radio_button name.to_sym, value %>
-            <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}") %>
+            <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.parameterize}") %>
           <% end %>
         </div>
       <% end %>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -3,9 +3,9 @@
   <div class="col-sm-9">
     <% options['valid_values'].each do |value| %>
       <div class="checkbox">
-        <%= form.label "#{name}_#{value.downcase}" do %>
-          <%= form.check_box name.to_sym, {:multiple => true, id: "crm_form_presenter_#{name}_#{value.downcase}"}, value, nil %>
-          <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}", default: value) %>
+        <%= form.label "#{name}_#{value.parameterize}" do %>
+          <%= form.check_box name.to_sym, {:multiple => true, id: "crm_form_presenter_#{name}_#{value.parameterize}"}, value, nil %>
+          <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.parameterize}", default: value) %>
         <% end %>
       </div>
     <% end %>

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

@@ -1,4 +1,4 @@
-<%= form_for CrmFormPresenter.new(widget, request, controller), url: scrivito_path(widget.obj), html: { class: "form-horizontal clearfix label-position-#{widget.label_position} #{widget.columns}-column-layout"} do |form| %>
+<%= form_for CrmFormPresenter.new(widget, request, controller), url: scrivito_path(widget.obj), html: { class: "form-horizontal clearfix label-position-#{widget.label_position} #{widget.columns}-column-layout #{widget.activity.id.parameterize} #{widget.styles.join(' ')}"} do |form| %>
   <% if widget.subject %>
     <%= form.hidden_field(:title, value: widget.subject) %>
   <% end %>
@@ -18,7 +18,7 @@
   <% 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'), class: "control-label col-sm-3" %>
+      <%= 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>
@@ -32,5 +32,7 @@
     </div>
   </div>
 
-  <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
+  <div class="form-submit-button-container clearfix">
+    <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
+  </div>
 <% end %>

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

@@ -31,6 +31,10 @@
       <%= 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.file_upload', default: 'File upload') do %>
+        <%= scrivito_tag :div, widget, :styles, data: { multi_select_list: widget.scrivito_selectable_style_classes } %>
+      <% end %>
     </div>
 
     <div class="tab-panel" id="edit-tags">

data/lib/scrivito_crm_form_widget/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta1
+  version: 0.9.0.beta3
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito