para 0.6.9 → 0.7.0

data/app/views/para/admin/shared/_navigation.html.haml

@@ -1,23 +1,24 @@
-%ul.sidebar-navigation.collapse.navbar-collapse#menu-sidebar
-  %li.brand-logo
-    = link_to admin_path do
-      = t('para.admin.title')
+.navmenu.navmenu-default.navmenu-fixed-left.offcanvas-sm
+  = link_to admin_path, class: 'navmenu-brand' do
+    = t('para.admin.brand').html_safe
 
-  - if admin_component_sections.any?
-    - admin_component_sections.each do |component_section|
-      - next unless component_section.components.any? { |component| can?(:manage, component) }
+  %ul.nav.navmenu-nav
+    - if admin_component_sections.any?
+      - admin_component_sections.each_with_index do |component_section, index|
+        - next unless component_section.components.any? { |component| can?(:manage, component) }
 
-      %li.component-section-item
-        = link_to "#", class: 'component-section-title' do
-          = component_section.name
+        %li.component-section-item
+          = link_to "#collapse-section-#{index}", class: 'component-section-title', data: { toggle: 'collapse' } do
+            = component_section.name
+            %i.fa.fa-angle-up.pull-right
 
-        %ul.component-section-list-items
-          - component_section.components.each do |component|
-            - if can? :manage, component
-              %li.component-item{ class: (@component == component) && 'active' }
-                = link_to component.name, component.path
+          %ul.component-section-list-items.collapse.in{ id: "collapse-section-#{index}" }
+            - component_section.components.each do |component|
+              - if can? :manage, component
+                %li.component-item{ class: (@component == component) && 'active' }
+                  = link_to component.name, component.path
 
-  - else
-    %li.component-section-item
-      .component-section-title
-        = t('para.component.none_created')
+    - else
+      %li.component-section-item
+        .component-section-title
+          = t('para.component.none_created')

data/app/views/para/form/_tabs.html.haml

@@ -1,11 +1,10 @@
 .form-tabs{ data: { :'form-tabs' => true } }
-  %nav.navbar.navbar-inverse
-    %ul.nav.navbar-nav{ role: 'tablist' }
-      - tabs.each_with_index do |tab, index|
-        %li{ class: ('active' if index == 0), role: 'presentation' }
-          = link_to "##{ tab.dom_id }", role: 'tab', aria: { controls: 'settings' }, data: { toggle: 'tab' } do
-            %i.fa{ class: "fa-#{ tab.icon }" }
-            = tab.title
+  %ul.nav.nav-tabs{ role: 'tablist' }
+    - tabs.each_with_index do |tab, index|
+      %li{ class: ('active' if index == 0), role: 'presentation' }
+        = link_to "##{ tab.dom_id }", role: 'tab', aria: { controls: 'settings' }, data: { toggle: 'tab' } do
+          %i.fa{ class: "fa-#{ tab.icon }" }
+          = tab.title
 
   .tab-content
     - tabs.each_with_index do |tab, index|

data/app/views/para/inputs/_multi_select.html.haml

@@ -0,0 +1,40 @@
+.multi-select-field{ class: ('orderable' if orderable), data: { :'multi-select-input' => true, :'search-url' => admin_search_path(model_name: model.name), orderable: orderable } }
+  = form.hidden_field attribute_name, value: resources.map(&:id).join(', '), data: { :'multi-select-input-field' => true }
+
+  .row
+    .col-md-6
+      .input-group.filter-form
+        = text_field_tag :search, nil, class: 'string required form-control', autocomplete: 'off', data: { :'search-field' => true }
+        %span.input-group-btn
+          = button_tag type: 'button', class: 'btn' do
+            = fa_icon 'search'
+
+  .row
+    .col-md-6
+      .panel.panel-default.available-items
+        .panel-heading
+          %span.panel-title
+            = t('para.form.multi_select.available.title')
+          .panel-btns
+            = button_tag type: 'button', class: 'btn btn-success btn-xs', data: { :'add-all' => true } do
+              = t('para.form.multi_select.available.add_all')
+
+        .panel-body
+          %table.table{ data: { :'available-items' => true, :'no-available-items' => render(partial: 'para/inputs/multi_select/no_items', locals: { available: true }) } }
+            %tbody
+              = render partial: 'para/admin/search/result', collection: option_resources
+
+    .col-md-6
+      .panel.panel-default.selected-items
+        .panel-heading
+          %span.panel-title
+            = t('para.form.multi_select.selected.title')
+          .panel-btns
+            = button_tag type: 'button', class: 'btn btn-danger btn-xs', data: { :'remove-all' => true } do
+              = t('para.form.multi_select.selected.remove_all')
+        .panel-body
+          %table.table{ data: { :'selected-items' => true, :'no-selected-items' => render(partial: 'para/inputs/multi_select/no_items', locals: { available: false }) } }
+            %tbody
+              - if resources.length > 0
+                - resources.each do |resource|
+                  = selected_item_for(resource)

data/app/views/para/inputs/_nested_many.html.haml

@@ -1,10 +1,10 @@
-.nested-many-field{ class: ('orderable' if orderable) }
+.nested-many-field{ class: [('orderable' if orderable), ('nested-many-field-inset' if inset)] }
   .fields-list{ id: dom_identifier }
     = form.simple_fields_for attribute_name, resources, nested_attribute_name: attribute_name, orderable: orderable do |nested_form|
-      = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals }
+      = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals, inset: inset }
   -# Add button
   - if add_button
     - if subclass
-      = render partial: 'para/inputs/nested_many/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, subclasses: subclasses }
+      = render partial: 'para/inputs/nested_many/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, subclasses: subclasses, inset: inset }
     - else
-      = render partial: 'para/inputs/nested_many/add', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable }
+      = render partial: 'para/inputs/nested_many/add', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, inset: inset }

data/app/views/para/inputs/multi_select/_no_items.html.haml

@@ -0,0 +1,6 @@
+- if available
+  %tr
+    %td.no-items= t('para.form.multi_select.available.no_items')
+- else
+  %tr
+    %td.no-items= t('para.form.multi_select.selected.no_items')

data/app/views/para/inputs/nested_many/_add.html.haml

@@ -1,3 +1,2 @@
-= link_to_add_association form, attribute_name, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'btn btn-primary', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model, nested_locals: nested_locals } } do
-    %i.fa.fa-plus
+= link_to_add_association form, attribute_name, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'btn btn-primary btn-shadow add-button nested-many-inset-add-button', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model, nested_locals: nested_locals, inset: inset } } do
     = t('para.form.nested.add')

data/app/views/para/inputs/nested_many/_add_with_subclasses.html.haml

@@ -1,10 +1,9 @@
-.add-button.dropdown
-  %button.btn.btn-primary{ type: 'button', data: { toggle: 'dropdown' } }
-    %i.fa.fa-plus
+.add-button.nested-many-inset-add-button.dropdown
+  %button.btn.btn-shadow.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' } }
     = t('para.form.nested.add')
-    %span.caret
+    %i.fa.fa-angle-down
   %ul.dropdown-menu
     - subclasses.each do |submodel|
       %li
-        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals } } do
+        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset } } do
           = submodel.model_name.human

data/app/views/para/inputs/nested_many/_container.html.haml

@@ -1,22 +1,21 @@
 - nested_locals ||= {}
 
-.panel.panel-default.form-fields
+.panel.panel-default.form-fields{ class: ('nested-many-inset-panel' if inset), data: { :'persisted' => form.object.persisted? } }
   .panel-heading
     = form.reorder_anchor
 
     %h3.panel-title
       = link_to "##{ form.nested_resource_dom_id }", class: 'collapsed', data: { toggle: 'collapse', :'open-on-insert' => true } do
         = form.nested_resource_name
-        %span.caret
+        %i.fa.fa-angle-up
 
     = form.remove_association_button
 
-    .clearfix
+  .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if inset) }
+    .panel-body
+      = render partial: find_partial_for(model, :fields), locals: { form: form }.merge(nested_locals)
 
-  .panel-body.form-inputs.collapse{ id: form.nested_resource_dom_id }
-    = render partial: find_partial_for(model, :fields), locals: { form: form }.merge(nested_locals)
-
-    -# Add inheritance column field if needed
-    = form.hidden_field form.object.class.inheritance_column if form.object.class.column_names.include?(form.object.class.inheritance_column)
+      -# Add inheritance column field if needed
+      = form.hidden_field form.object.class.inheritance_column if form.object.class.column_names.include?(form.object.class.inheritance_column)
 
   .clearfix

data/app/views/shared/_breadcrumbs.html.haml

@@ -0,0 +1,4 @@
+%ul.breadcrumb
+  - breadcrumbs.each do |breadcrumb|
+    %li{ class: ('active' if breadcrumb.active?(request)) }
+      = link_to_unless breadcrumb.active?(request), breadcrumb.title, breadcrumb.path

data/config/locales/fr.yml

@@ -31,7 +31,8 @@ fr:
         error: "Erreur lors de la génération du fichier d'export ..."
 
     admin:
-      title: "Administration"
+      title: Administration
+      brand: "<b>Admin</b>istration"
       toggle_navigation: "Open navigation"
       back_to_app: "Afficher le site"
       sign_out: "Se déconnecter"
@@ -45,6 +46,9 @@ fr:
 
     dashboard:
       title: "Tableau de bord"
+      statcard:
+        ressources_count: "Nombre d'entrée(s) : %{count}"
+        component_form_ressource: "Voir la page"
 
     form:
       shared:
@@ -57,12 +61,31 @@ fr:
         add: "Ajouter"
         remove: "Supprimer"
         new: "Nouveau"
+      multi_select:
+        available:
+          title: "Disponibles"
+          no_items: |
+            Recherchez des éléments avec la barre de recherche ci-dessus
+          add_all: "Tout rajouter"
+          already_selected: "Ajouté"
+        selected:
+          title: "Ajoutés"
+          no_items: |
+            Utilisez le formulaire de recherche sur la gauche afin d'ajouter
+            des éléments.
+          remove_all: "Tout retirer"
+
 
     list:
       search_title: "Recherche"
-      delete_confirmation: "Êtes vous sûr de bien vouloir supprimer cette entrée ?"
-      no_results: "Aucun résultat pour cette recherche, merci d'essayer avec d'autres critères ou de créer une nouvelle entrée avec le bouton suivant :"
-      empty: "Aucune entrée créée pour le moment. Créez une nouvelle entrée avec le bouton suivant :"
+      delete_confirmation: |
+        Êtes vous sûr de bien vouloir supprimer cette entrée ?
+      no_results: |
+        Aucun résultat pour cette recherche, merci d'essayer avec d'autres
+        critères ou de créer une nouvelle entrée avec le bouton suivant :
+      empty: |
+        Aucune entrée créée pour le moment. Créez une nouvelle entrée avec le
+        bouton suivant :
 
     export:
       name: "Exporter"
@@ -86,6 +109,8 @@ fr:
       save_and_edit: "Enregistrer et éditer"
       save_and_add_another_button: "Enregistrer et créer un(e) autre"
       destroy: "Supprimer"
+      edit: "éditer"
+      copy: "Dupliquer"
       close: "Fermer"
 
     types:

data/db/migrate/20170324125547_create_para_page_section_resources.rb

@@ -0,0 +1,15 @@
+class CreateParaPageSectionResources < ActiveRecord::Migration
+  def change
+    create_table :para_page_section_resources do |t|
+      t.references :section
+      t.references :resource, polymorphic: true, index: false
+      t.integer :position, default: 0
+      t.jsonb :data
+
+      t.timestamps
+    end
+
+    add_index :para_page_section_resources, [:resource_type, :resource_id], name: :index_para_section_resources_on_resource_type_and_id
+    add_foreign_key :para_page_section_resources, :para_page_sections, column: 'section_id'
+  end
+end

data/lib/generators/para/filters/templates/_filters.html.haml

@@ -1,9 +1,7 @@
 = search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
-  .input-group
-    %span.input-group-addon
-      %i.fa.fa-search
-
+  .input-group.filter-form
     = form.input_field :<%= fulltext_search_param_for(attributes) %>, as: :string, placeholder: t('para.shared.search'), class: 'form-control'
 
     %span.input-group-btn
-      = form.submit t('para.shared.search'), class: 'btn btn-default'
+      %button.btn{  type: 'submit'}
+        %i.fa.fa-search

data/lib/generators/para/install/templates/initializer.rb

@@ -1,17 +1,22 @@
 Para.config do |config|
   # Configure authentication method to be called when accessing the admin panel
+  #
   # config.authenticate_admin_method = :authenticate_admin!
 
   # Configure the method to retrieve current admin user from
+  #
   # config.current_admin_method = :current_admin_user
 
   # Configure the default Kaminari pagination theme to use
+  #
   # config.pagination_theme = 'twitter-bootstrap-3'
 
   # Configure the default admin HTML page <title>
+  #
   # config.admin_title = ::I18n.t('para.admin.title')
 
   # Configure the default max depth for trees
+  #
   # config.default_tree_max_depth = 3
 
   # Configure the methods which Para will try to call on resources to fetch
@@ -21,6 +26,13 @@ Para.config do |config|
   #
   # config.resource_name_methods += [:full_name]
 
+  # Set if the Para::Breadcrumb::Controller module should be included into the
+  # app, allowing easy breadcrumbs management in the app.
+  #
+  # Default is true
+  #
+  # config.enable_app_breadcrumbs = false
+
   # Para plugins to load
   #
   # config.plugins = []

data/lib/generators/para/page/section/section_generator.rb

@@ -5,15 +5,26 @@ module Para
 
       source_root File.expand_path("../templates", __FILE__)
 
-      argument :attributes, type: :array
+      argument :attributes, type: :array, required: false, default: []
 
-      def generate_form
+      def generate_model
         template(
           "section.rb.erb",
           "app/models/page_section/#{ singular_namespaced_path }.rb"
         )
       end
 
+      def generate_fields
+        generate 'para:nested_fields', "page_section/#{ singular_namespaced_path }"
+      end
+
+      def generate_template
+        template(
+          "section.html.haml.erb",
+          "app/views/page_section/#{ plural_namespaced_path }/_#{ singular_namespaced_path }.html.haml"
+        )
+      end
+
       private
 
       def attributes_separated_with_commas

data/lib/generators/para/page/section/templates/section.html.haml.erb

@@ -0,0 +1,3 @@
+<%- attributes.each do |attribute| -%>
+= <%= singular_namespaced_path %>.<%= attribute.name %>
+<%- end -%>

data/lib/generators/para/resource/resource_generator.rb

@@ -21,7 +21,7 @@ module Para
     def add_resource_to_component_controller
       gsub_file "app/controllers/admin/#{ component_name.singularize }_component_controller.rb", /# You can access @component here/ do
         <<-RUBY
-          @q = @component.#{ plural_file_name }.search(params[:q])
+          @q = @component.#{ plural_file_name }.ransack(params[:q])
           @resources = @q.result.page(params[:page])
         RUBY
       end

data/lib/para.rb

@@ -18,6 +18,7 @@ require 'ransack'
 require 'friendly_id'
 require 'deep_cloneable'
 require 'closure_tree'
+require 'friendly_id'
 
 require 'jquery-rails'
 require 'turbolinks'
@@ -34,34 +35,16 @@ require 'rails/relation_length_validator'
 
 require 'para/postgres_extensions_checker'
 
-require 'para/ext'
-require 'para/errors'
-require 'para/plugins'
-require 'para/config'
-require 'para/model_field_parsers'
-require 'para/attribute_field'
-require 'para/attribute_field_mappings'
-require 'para/inputs'
-require 'para/cloneable'
-require 'para/orderable'
-require 'para/form_builder'
-require 'para/markup'
-require 'para/engine'
-require 'para/components_configuration'
-require 'para/job'
-require 'para/exporter'
-require 'para/importer'
-require 'para/sti'
-require 'para/page'
-require 'para/search'
-
 module Para
   extend ActiveSupport::Autoload
 
   eager_autoload do
     autoload :Config
     autoload :Component
+    autoload :ControllerResource
     autoload :Generators
+    autoload :Helpers
+    autoload :SimpleFormConfig
     autoload :Routing
     autoload :Routes
     autoload :Breadcrumbs
@@ -89,3 +72,24 @@ module Para
     'para_'
   end
 end
+
+require 'para/ext'
+require 'para/errors'
+require 'para/plugins'
+require 'para/config'
+require 'para/model_field_parsers'
+require 'para/attribute_field'
+require 'para/attribute_field_mappings'
+require 'para/inputs'
+require 'para/cloneable'
+require 'para/orderable'
+require 'para/form_builder'
+require 'para/markup'
+require 'para/engine'
+require 'para/components_configuration'
+require 'para/job'
+require 'para/exporter'
+require 'para/importer'
+require 'para/sti'
+require 'para/page'
+require 'para/search'

data/lib/para/attribute_field.rb

@@ -13,7 +13,9 @@ require 'para/attribute_field/enum'
 require 'para/attribute_field/relation'
 require 'para/attribute_field/belongs_to'
 require 'para/attribute_field/has_many'
+require 'para/attribute_field/nested_field'
 require 'para/attribute_field/nested_one'
 require 'para/attribute_field/nested_many'
 require 'para/attribute_field/redactor'
 require 'para/attribute_field/translation'
+require 'para/attribute_field/friendly_id'

data/lib/para/attribute_field/base.rb

@@ -86,7 +86,7 @@ module Para
       # it can be easy to edit them according to some field type specific
       # behavior
       #
-      def parse_input(params); end
+      def parse_input(params, resource); end
 
       def field_options
         self.class._field_options.each_with_object({}) do |params, hash|