udongo 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9058d4a4ae9f7e8f0d6c0f5ed60ae902559997cd
-  data.tar.gz: 4267002ee525804b74f0c38a0770d16a45d85ef1
+  metadata.gz: e45537b4c9cf7da08281cc79305ebc6dea5a94b5
+  data.tar.gz: 8c70624b93fa57b91de7803df1886a2b922c36c0
 SHA512:
-  metadata.gz: 7366fc2a16e78da7725965fdab5542763945380da67c3d1e73f23fd4d1d6e6db4c19560a2c5c297aa9aabd7b85e4053116426eed2fdd354b2da8efb0838ce39f
-  data.tar.gz: e96c73705f470b513397a3f5e1cb650235ea9d457130d057d1f5b6b98aada21de3f0cff88a63f82732476f98f9f3c0d90253d20c5e7ebad93d298ebe77df3a59
+  metadata.gz: d39657ebe57454cbb324c764d0800416156bddeaf4902d5cd7653c2bf08c51847ac4a9588c576d235200880071c4f95ed8e87d73b684b2dd3c7899068479c5b6
+  data.tar.gz: 96ac9430540f0abe52e3c1643205686029678e760efd07655be0915eec2ac20161d83461eff94aaada2d4b516f6a265b1d949a161c44938ca2170506449cbf83

data/app/assets/javascripts/backend/application.js

@@ -12,9 +12,9 @@
 //
 //= require jquery3
 //= require jquery_ujs
-//= require jquery-ui/autocomplete
+//= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/autocomplete
 //= require jquery-ui.autocomplete.html.js
-//= require jquery-ui/sortable
 //= require backend/tether.min
 //= require backend/bootstrap
 //= require backend/jquery.throttle-debounce.min.js

data/app/assets/stylesheets/backend/bootstrap.scss

@@ -9317,4 +9317,3 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
     display: none !important;
   }
 }
-/*# sourceMappingURL=bootstrap.css.map */

data/app/controllers/backend/content/rows/forms_controller.rb

@@ -0,0 +1,11 @@
+class Backend::Content::Rows::FormsController < Backend::BaseController
+  include Concerns::Backend::ContentTypeController
+
+  model ContentForm
+  allowed_params :form_id
+
+  def forms_collection
+    Form.order(:description).map { |f| [f.description, f.id] }
+  end
+  helper_method :forms_collection
+end

data/app/controllers/backend/forms_controller.rb

@@ -35,7 +35,7 @@ class Backend::FormsController < Backend::BaseController
   end
 
   def destroy
-    @model.destroy
+    @model.destroy if @model.deletable?
     redirect_to backend_forms_path, notice: translate_notice(:deleted, :form)
   end
 

data/app/decorators/content_form_decorator.rb

@@ -0,0 +1,3 @@
+class ContentFormDecorator < ApplicationDecorator
+  delegate_all
+end

data/app/helpers/collection_helper.rb

@@ -0,0 +1,7 @@
+module CollectionHelper
+  def options_for_collection(field_name, collection)
+    collection.map do |item|
+      [t("g.collections.#{field_name}.#{item}"), item]
+    end
+  end
+end

data/app/models/content_form.rb

@@ -0,0 +1,9 @@
+class ContentForm < ApplicationRecord
+  include Concerns::ContentType
+
+  belongs_to :form
+
+  def content_type
+    :form
+  end
+end

data/app/models/form.rb

@@ -5,6 +5,11 @@ class Form < ApplicationRecord
   has_many :fields, class_name: 'FormField', dependent: :destroy
   has_many :submissions, class_name: 'FormSubmission', dependent: :destroy
   has_many :data, through: :submissions
+  has_many :content_forms, dependent: :destroy
 
   validates :description, presence: true
+
+  def deletable?
+    content_forms.empty?
+  end
 end

data/app/models/form_field.rb

@@ -5,6 +5,8 @@ class FormField < ApplicationRecord
   include Concerns::Translatable
   translatable_fields :label, :default_value
 
+  FIELD_TYPES = %w(string text integer collection)
+
   belongs_to :form
 
   validates :form, :identifier, :field_type, presence: true

data/app/views/backend/content/_form.html.erb

@@ -0,0 +1,5 @@
+<% if object.present? && object.form.present? %>
+  <%= t 'b.form' %> &gt; <%= object.form.description %>
+<% else %>
+  <%= t 'b.msg.flexible_content.no_form_present' %>
+<% end %>

data/app/views/backend/content/rows/forms/edit.html.erb

@@ -0,0 +1,17 @@
+<%= simple_form_for [:backend, @model] do |f| %>
+  <div class="card">
+    <div class="card-header">
+      <%= t 'b.msg.flexible_content.edit_form' %>
+    </div>
+
+    <div class="card-block">
+      <div class="row">
+        <div class="col-6">
+          <%= f.input :form_id, collection: forms_collection %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: content_path %>
+<% end %>

data/app/views/backend/forms/fields/_form.html.erb

@@ -10,8 +10,7 @@
 
         <div class="card-block">
           <%= f.input :identifier %>
-          <%# FIXME: This should be a dropdown once we know the exact types to use. %>
-          <%= f.input :field_type %>
+          <%= f.input :field_type, collection: options_for_collection(:form_field_type, FormField::FIELD_TYPES) %>
         </div>
       </div>
     </div>

data/app/views/backend/forms/index.html.erb

@@ -35,7 +35,7 @@
             <% if f.submissions.any? %>
               <%= link_to icon(:trash), '#', data: { toggle: 'tooltip' }, title: t('b.msg.forms.removal_warning', submissions: f.submissions.size) %>
             <% else %>
-              <%= link_to_delete [:backend, f] %>
+              <%= link_to_delete [:backend, f] if f.deletable? %>
             <% end %>
           </td>
         </tr>

data/changelog.md

@@ -1,3 +1,14 @@
+6.2.0 - 2017-06-02
+--
+* Removed the bootstrap source mapping reference in backend/bootstrap.scss.
+* Upgraded jquery-ui-rails to 6.0.1 to fix autocomplete issues with jquery3.
+* Add the ```CollectionHelper``` which allows you to use ```options_for_collection```
+  to easily create collections for simple form.
+* The form field types are now a dropdown instead of a text field.
+* A form widget has been added. This makes it possible to include a form on a
+  specific location in the flexible content.
+
+
 6.1.0 - 2017-05-16
 --
 * The obsolete top navigation markup has been cleaned up.

data/config/locales/en_backend.yml

@@ -110,6 +110,7 @@ en:
       changes_saved: The changes have been saved.
       confirm: Are you sure?
       content_types:
+        form: Form
         image: Image (deprecated!)
         picture: Picture
         text: Text
@@ -128,12 +129,14 @@ en:
         align_vertical_center: Align vertically
         align_vertical_top: Align vertical top
         edit_column: Edit column
+        edit_form: Edit form
         edit_image: Edit image
         edit_picture: Edit picture
         edit_text: Edit text
         edit_video: Edit video
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
         full_width: Full width
+        no_form_present: No form has been linked yet.
         no_picture_present: No picture has been uploaded/linked yet.
         no_video_present: No valid video URL was given.
         width_explanation: For the flexible content we use a grid layout. This works with rows and columns. Every row can contain at most 12 columns. That's why the column width is expressed as a fracture.

data/config/locales/nl_backend.yml

@@ -110,6 +110,7 @@ nl:
       changes_saved: De wijzigingen werden opgeslagen.
       confirm: Ben je zeker?
       content_types:
+        form: Formulier
         image: Afbeelding (niet meer gebruiken!)
         picture: Foto
         text: Tekst
@@ -128,12 +129,14 @@ nl:
         align_vertical_center: Vertikaal centreren
         align_vertical_top: Vertikaal bovenaan uitlijnen
         edit_column: Kolom bewerken
+        edit_form: Formulier bewerken
         edit_image: Afbeelding bewerken
         edit_picture: Foto bewerken
         edit_text: Tekst bewerken
         edit_video: Video bewerken
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
         full_width: Volledige breedte
+        no_form_present: Er werd nog geen formulier gelinkt.
         no_picture_present: Er werd nog geen foto geüpload of gelinkt.
         no_video_present: Er werd nog geen geldige URL voor een video opgegeven.
         width_explanation: Voor de flexibele inhoud wordt er gebruikt gemaakt van een grid layout. Deze werkt met rijen en kolommen. Iedere rij kan maximaal 12 kolommen bevatten. Daarom dat de breedte uitgedrukt is in een breuk op 12.

data/config/locales/nl_general.yml

@@ -1,3 +1,10 @@
 nl:
   g:
+    collections:
+      form_field_type:
+        collection: Collectie
+        integer: Getal
+        string: Tekstregel
+        text: Tekstvak
+
     type: Type

data/db/migrate/20170602114411_create_content_forms.rb

@@ -0,0 +1,9 @@
+class CreateContentForms < ActiveRecord::Migration[5.0]
+  def change
+    create_table :content_forms do |t|
+      t.references :form
+
+      t.timestamps
+    end
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -6,7 +6,7 @@ module Udongo
       BREAKPOINTS = %w(xs sm md lg xl)
       DEFAULT_BREAKPOINT = 'md'
 
-      attribute :types, Array, default: %w(text picture video image)
+      attribute :types, Array, default: %w(text picture video form image)
       attribute :picture_caption_editor, Axiom::Types::Boolean, default: false
 
       def picture_caption_editor?

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 end

data/spec/factories/content_forms.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :content_form do
+    form
+  end
+end

data/vendor/assets/stylesheets/backend/tagit/_base.scss

@@ -28,46 +28,50 @@ ul.tagit li.tagit-new {
     padding: .25em 4px .25em 0;
 }
 
-ul.tagit li.tagit-choice a.tagit-label {
+ul.tagit li.tagit-choice {
+  a.tagit-label {
     cursor: pointer;
     text-decoration: none;
-}
-ul.tagit li.tagit-choice .tagit-close {
+  }
+
+  input {
+    display: block;
+    float: left;
+    margin: 2px 5px 2px 0;
+  }
+
+  .tagit-close {
     cursor: pointer;
     position: absolute;
-    right: .1em;
-    top: 50%;
+    right: .3rem;
+    top: 1rem;
     margin-top: -8px;
     line-height: 17px;
-}
 
-/* used for some custom themes that don't need image icons */
-ul.tagit li.tagit-choice .tagit-close .text-icon {
-    display: inline;
-}
+    /* used for some custom themes that don't need image icons */
+    .text-icon {
+      display: inline;
+    }
 
-ul.tagit li.tagit-choice .tagit-close .ui-icon-close {
-    display: none;
+    .ui-icon-close {
+      display: none;
+    }
+  }
 }
 
-ul.tagit li.tagit-choice input {
-    display: block;
-    float: left;
-    margin: 2px 5px 2px 0;
-}
 ul.tagit input[type="text"] {
-    -moz-box-sizing:    border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing:         border-box;
+  -moz-box-sizing:    border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing:         border-box;
 
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
 
-    border: none;
-    margin: 0;
-    padding: 0;
-    width: inherit;
-    background-color: inherit;
-    outline: none;
+  border: none;
+  margin: 0;
+  padding: 0;
+  width: inherit;
+  background-color: inherit;
+  outline: none;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,20 +51,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -462,6 +462,7 @@ files:
 - app/controllers/backend/assets_controller.rb
 - app/controllers/backend/base_controller.rb
 - app/controllers/backend/content/rows/columns_controller.rb
+- app/controllers/backend/content/rows/forms_controller.rb
 - app/controllers/backend/content/rows/images_controller.rb
 - app/controllers/backend/content/rows/pictures_controller.rb
 - app/controllers/backend/content/rows/texts_controller.rb
@@ -494,6 +495,7 @@ files:
 - app/controllers/concerns/pagination_controller.rb
 - app/controllers/redirects_controller.rb
 - app/decorators/application_decorator.rb
+- app/decorators/content_form_decorator.rb
 - app/decorators/content_image_decorator.rb
 - app/decorators/content_picture_decorator.rb
 - app/decorators/content_row_decorator.rb
@@ -518,6 +520,7 @@ files:
 - app/helpers/backend/dropdown_helper.rb
 - app/helpers/backend/form_helper.rb
 - app/helpers/backend/pagination_helper.rb
+- app/helpers/collection_helper.rb
 - app/helpers/icon_helper.rb
 - app/helpers/link_helper.rb
 - app/helpers/navigation_helper.rb
@@ -563,6 +566,7 @@ files:
 - app/models/concerns/translatable.rb
 - app/models/concerns/visible.rb
 - app/models/content_column.rb
+- app/models/content_form.rb
 - app/models/content_image.rb
 - app/models/content_picture.rb
 - app/models/content_row.rb
@@ -622,6 +626,7 @@ files:
 - app/views/backend/assets/edit.html.erb
 - app/views/backend/assets/index.html.erb
 - app/views/backend/assets/new.html.erb
+- app/views/backend/content/_form.html.erb
 - app/views/backend/content/_image.html.erb
 - app/views/backend/content/_picture.html.erb
 - app/views/backend/content/_rows.html.erb
@@ -631,6 +636,7 @@ files:
 - app/views/backend/content/rows/columns/_dimension_fields.html.erb
 - app/views/backend/content/rows/columns/edit.html.erb
 - app/views/backend/content/rows/columns/new.html.erb
+- app/views/backend/content/rows/forms/edit.html.erb
 - app/views/backend/content/rows/images/edit.html.erb
 - app/views/backend/content/rows/pictures/_filter.html.erb
 - app/views/backend/content/rows/pictures/edit.html.erb
@@ -809,6 +815,7 @@ files:
 - db/migrate/20170507092541_add_alignment_options_to_content_rows.rb
 - db/migrate/20170507163532_create_content_videos.rb
 - db/migrate/20170516092845_add_sitemap_to_page.rb
+- db/migrate/20170602114411_create_content_forms.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -861,6 +868,7 @@ files:
 - spec/factories/assets.rb
 - spec/factories/comments.rb
 - spec/factories/content_columns.rb
+- spec/factories/content_forms.rb
 - spec/factories/content_images.rb
 - spec/factories/content_pictures.rb
 - spec/factories/content_rows.rb