para 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89735619264be8599e3ccccfccdb64d07aa219c
-  data.tar.gz: 7aea1f82a1e545b142dc4abcca505de107a3d94d
+  metadata.gz: ea023e2c7951df293b131af9c362b630a80acedb
+  data.tar.gz: e4a5edf55b4d9a1f98a7deac738a28169c227dfa
 SHA512:
-  metadata.gz: cc137eb9e0185c8a7fac27b9ddb830981bcfa0e7b1951153beed16f4cc289efd3c5b6f467ee793cf9920aa02e9ed407f677b494fffa04fb60cff7ea85d69cfe6
-  data.tar.gz: 7d2b0d6a005b9a2770bf28a459fe34c8ca4cddd8276cb58f3df99923131a96f24e99903850d8867de76778b3a771ced22ed49b6bc95f4c4062768d360880a55b
+  metadata.gz: ac5856d930a5a18d535b5a5636809598ab4676a2f349523265edf1a87bdfdfb7efc5f94ad720315468d56c55b46895f5184ace70f4a95b719747437f1758a37d
+  data.tar.gz: e001063051553067ba717acb4900368bfd054b97a46e7ea8bbdbdbc0e70369e22d8dbfe41cd53437bbfd545434b968688c61d494847ea234ae8f45f8c383f016

data/app/assets/javascripts/para/admin/tabs.coffee

@@ -36,7 +36,7 @@ class Para.Tabs extends Vertebra.View
     @refreshTabErrors($tab)
 
   findTab: (id) ->
-    id = id.replace(/^\#/, '')
+    id = "##{ id }" unless id.indexOf('#') >= 0
     @$('a[href="' + id + '"]')
 
 $(document).on 'page:change turbolinks:load', ->

data/app/assets/stylesheets/para/admin/src/_form.sass

@@ -62,9 +62,13 @@ legend
 .tab-pane
   +clearfix
   .form-group:last-of-type,
-  .form-group:only-child
+  .form-group:only-child,
+  .nested-one-field:last-of-type  
     margin-bottom: 0
 
+.nested-one-field
+  margin-bottom: $form-group-margin-bottom
+
 .form-control
   font-size: 14px
 
@@ -112,6 +116,8 @@ legend
   //** Redactor
   .redactor-editor
     +outline-input-form
+    strong, b
+      font-weight: 700
 
   .redactor-toolbar
     border: none
@@ -194,6 +200,7 @@ legend
     position: fixed
     bottom: 0px
     right: 50px
+    left: auto
     padding: 8px
     z-index: $zindex-navbar-fixed - 10
     background-color: $gray-lighter

data/app/assets/stylesheets/para/admin/src/_list.sass

@@ -57,5 +57,27 @@
     &.full
       font-size: 0.9em
 
+  .input-group
+    +filter-style
+    .form-control
+      &:focus
+        +box-shadow(none)
+    .form-control,
+    .input-group-btn
+      background-color: transparent
+      border: none
+      +border-left-radius(20px)
+    .input-group-btn
+      overflow: hidden
+      +border-left-radius(0)
+      +border-right-radius(20px)
+    .btn
+      background-color: transparent
+      color: $gray
+      border-color: transparent
+      &:hover
+        color: $gray-dark    
+
+
 .page-entries-info
   font-weight: 300

data/app/assets/stylesheets/para/admin/src/_navigation.sass

@@ -18,9 +18,8 @@
   +material-box-shadow-soft(3)
 
   .navmenu-brand
-    // +background(linear-gradient(to top right, $brand-primary, $brand-info))
     background-color: $blue-darker
-    color: white
+    color: #fff
     display: block
     font-size: 1.4em
     font-weight: 300
@@ -35,7 +34,6 @@
       color: white
 
   .navmenu-nav
-    // background-color: $navbar-default-bg
     background-color: $gray-lighter
     height: calc(100% - 60px)
     width: $left-menu-width-open
@@ -51,8 +49,6 @@
       color: $gray
       &:hover,
       &:focus
-        // background-color: $navbar-default-bg
-        // color: white
         background-color: $gray
         color: $gray-lighter
 
@@ -64,8 +60,6 @@
       padding: 0
 
     .component-section-title
-      // background-color: $navbar-default-bg
-      // color: white
       background-color: $gray-lighter
       color: $text-color
       font-weight: bold
@@ -86,29 +80,26 @@
 
     .component-item
       a, button
-        // background-color: $text-color
-        // color: $gray-light
-        color: $text-color
+        background-color: transparent
         display: block
         font-weight: 400
         line-height: 19px
+        color: $text-color
+        font-weight: 400
         padding: 11px 13px 11px 15px
         text-decoration: none
 
         +default-transition
         &:hover,
         &:focus
-          // background-color: $navbar-default-bg
-          background-color: $gray-lighter
           padding-left: 25px
+          background-color: $gray-lighter
 
       &.active
         a, button
-          // background-color: lighten($navbar-default-bg, 10%)
-          background-color: $gray-light
-          border-color: $brand-primary
           border-left: 2px solid $brand-primary
-          // color: white
+          background-color: $gray-light
+          color: $text-color
           padding-left: 25px
 
 //== Top navbar
@@ -148,3 +139,35 @@
 .navbar-toggle
   float: left
   display: block
+
+//** Dark theme override
+//***********************
+.dark-theme.navmenu-default
+  .navmenu-brand
+    +background(linear-gradient(to top right, $brand-primary, $brand-info))
+  .navmenu-nav
+    background-color: $navbar-default-bg
+    > li > a
+      &:hover,
+      &:focus
+        background-color: $navbar-default-bg
+        color: white
+  .component-section-title
+    background-color: $navbar-default-bg
+    color: white
+    &:hover,
+    &:focus
+      background-color: transparent
+      color: white
+  .component-item
+    a, button
+      background-color: $text-color
+      color: $gray-lighter
+      &:hover,
+      &:focus
+        background-color: $navbar-default-bg
+    &.active
+      a, button  
+        background-color: lighten($navbar-default-bg, 10%)
+        border-color: $brand-primary
+        color: white

data/app/assets/stylesheets/para/admin/src/_nested-many.sass

@@ -49,18 +49,19 @@
             float: left
             padding: 10px
             text-align: center
-            width: 33.333333%
+            width: 100%
 
             > a
               +border-radius(2px)
               +default-transition
-              background: image_url('para/admin/template-section.svg') no-repeat center $gray-lighter
+              background: image_url('para/admin/template-section.svg') no-repeat $gray-lighter
+              background-position: center 10px
               border: 1px dashed $gray
               color: $gray
               display: block
               font-weight: bold
-              height: 100%
-              padding: 75px 5px
+              height: 115px
+              padding: 70px 5px 5px 5px
               text-transform: uppercase
               width: 100%
               white-space: normal

data/app/assets/stylesheets/para/admin/src/_nested_one.sass

@@ -4,10 +4,18 @@
 
 //== Main style
 //
-//##
+//## Label have to be like a legend if is the nested_one
 
 .form-group.nested_one
   label.control-label.nested_one
-    font-weight: 700
-    font-size: 18px
+    font-weight: 600
+    font-size: 21px
     color: $blue-darker
+    text-transform: inherit
+    margin-top: 15px
+    margin-bottom: 15px
+
+.tab-pane
+  > .form-group.nested_one
+    label.control-label.nested_one
+      margin-top: 0

data/app/assets/stylesheets/para/admin/src/_responsive.sass

@@ -7,6 +7,20 @@
 
 /* Small devices (tablets, 768px and up) */
 @media (min-width: $screen-sm-min)
+  //== Fixed actions
+  //
+  //## See form.sass
+  .form-fixed-actions
+    .form-actions
+      .btn
+        margin-bottom: 0
+        margin-right: 5px
+
+  //== Nested many
+  //
+  //## See neste_many.sass
+  .nested-many-field.nested-many-field-inset .nested-many-inset-add-button.open > .dropdown-menu > li
+    width: 50%
 
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: $screen-md-min)
@@ -32,19 +46,21 @@
   .loading-spinner
     margin-left: ($left-menu-width-open / 2) - ($spinner-size / 2)
 
-  //== Fixed actions
+  //== Nested many
   //
-  //## See form.sass
-  .form-fixed-actions
-    .form-actions
-      // left: $left-menu-width-open + 50px
-      .btn
-        margin-bottom: 0
-        margin-right: 5px
+  //## See neste_many.sass
+  .nested-many-field.nested-many-field-inset .nested-many-inset-add-button.open > .dropdown-menu > li
+    width: 33.333333%
 
 /* Large devices (large desktops, 1200px and up) */
 @media (min-width: $screen-lg-min)
-
+  //== Nested many
+  //
+  //## See neste_many.sass
+  .nested-many-field.nested-many-field-inset .nested-many-inset-add-button.open > .dropdown-menu > li > a
+    background-position: center center
+    padding: 75px 5px
+    height: 100%
 
 //== Max width
 //
@@ -83,6 +99,7 @@
     .form-actions
       padding-right: 15px
       padding-left: 15px
+      left: 50px
       .btn
         width: 100%
 

data/app/helpers/para/form_helper.rb

@@ -5,6 +5,7 @@ module Para
         as: :resource,
         wrapper: :vertical_form,
         wrapper_mappings: Para::SimpleFormConfig.wrapper_mappings,
+        track_attribute_mappings: true,
         html: { class: '', data: { :'para-form' => true } }
       }
 

data/app/models/para/page/section.rb

@@ -12,14 +12,34 @@ module Para
       end
 
       class << self
+
+        # This method is a shortcut to create a has_one through relation
+        def section_resource(*args, &block)
+          _ensure_section_resource_relation
+          _create_section_resource_has_one_relation_for(*args, &block)
+        end
+
         # This method is a shortcut to create a has_many through relation
         def section_resources(*args, &block)
           _ensure_section_resources_relation
-          _create_section_resource_relation_for(*args, &block)
+          _create_section_resource_has_many_relation_for(*args, &block)
         end
 
         private
 
+        def _ensure_section_resource_relation
+          return if @section_resource_already_initialized
+
+          has_one :section_resource, -> { ordered },
+                  foreign_key: 'section_id',
+                  class_name: '::Para::Page::SectionResource',
+                  dependent: :destroy
+
+          accepts_nested_attributes_for :section_resource, allow_destroy: true
+
+          @section_resource_already_initialized = true
+        end
+
         def _ensure_section_resources_relation
           return if @section_resources_already_initialized
 
@@ -32,7 +52,27 @@ module Para
           @section_resources_already_initialized = true
         end
 
-        def _create_section_resource_relation_for(*args, &block)
+        def _create_section_resource_has_one_relation_for(*args, &block)
+          options = args.extract_options!
+
+          # Allow using :class_name option instead of :source_type to feel more
+          # like a direct has_many relation macro, and try to deduce the target
+          # class name from the relation name.
+          target_class_name = options.fetch(:class_name) do
+            args.first.to_s.singularize.camelize
+          end
+
+          # Fill the through relation options but let the user override them
+          options.reverse_merge!(
+            through: :section_resource,
+            source: :resource,
+            source_type: target_class_name
+          )
+
+          has_one(*args, options, &block)
+        end
+
+        def _create_section_resource_has_many_relation_for(*args, &block)
           options = args.extract_options!
 
           # Allow using :class_name option instead of :source_type to feel more

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

@@ -1,4 +1,4 @@
-.navmenu.navmenu-default.navmenu-fixed-left.offcanvas-sm
+.navmenu.navmenu-default.navmenu-fixed-left.offcanvas-sm{ class: ('dark-theme' if Para.config.dark_theme) }
   = link_to admin_path, class: 'navmenu-brand' do
     = t('para.admin.brand').html_safe
 

data/config/locales/en.yml

@@ -11,9 +11,28 @@ en:
         destroy:
           success: "%{model} deleted"
           error: "Could not delete %{model}"
+        clone:
+          success: "%{model} cloned"
+          error: "Could not clone %{model}"  
+    
+    jobs:
+      para/importer/base:
+        progressing: "The file is being imported, please wait a few moments ..."
+        success: "The import of the file was successfully completed"
+        success_with_errors: |
+          The import of the file was done, but some lines 
+          were not taken into account due to errors :
+        other_errors: "<br>And <b>%{count}</b> others errors ..."
+        error: "The selected file contains errors and could not be imported"
+
+      para/exporter/base:
+        progressing: "The file is being exported, please wait a few moments ..."
+        success: "The export file was generated, its download will start ..."
+        error: "Error generating the export file ..."
 
     admin:
-      title: "Admin"
+      title: Administration
+      brand: "<b>Admin</b>istration"
       toggle_navigation: "Open navigation"
       back_to_app: "Back to app"
       sign_out: "Sign out"
@@ -21,6 +40,9 @@ en:
     confirmation:
       shared:
         destroy: 'Are you sure that you want to delete %{model} ?'
+    
+    component:
+      none_created: "No components yet ..."
 
     component:
       create: "Create a component"
@@ -33,6 +55,9 @@ en:
 
     dashboard:
       title: "Dashboard"
+      statcard:
+        ressources_count: "Number of entries : %{count}"
+        component_form_ressource: "See page"
 
     component_section:
       add: "Add a component section"
@@ -49,6 +74,16 @@ en:
         add: "Add"
         remove: "Remove"
         new: "New"
+      multi_select:
+        available:
+          title: "Available"
+          no_items: "Search for items with the search bar above"
+          add_all: "Add all"
+          already_selected: "Add"
+        selected:
+          title: "Add"
+          no_items: "Use the search form on the left to add items."
+          remove_all: "Remove all"
 
     list:
       search_title: "Search"
@@ -58,13 +93,17 @@ en:
 
     export:
       name: "Export %{name}"
-      as: "Exporter (.%{extension})"
+      as: "Exporting (.%{extension})"
 
     import:
       name: Import
       select: "Select file"
       change: "Change file"
+      help_text: |
+        Select an Excel file (.xls, .xlsx) ou CSV (.csv) to import and
+        click the "Importing" button.
       placeholder: File format ( .csv .xlsx )
+      row_error_prefix: "Line %{number} :"
 
     shared:
       save: "Save"
@@ -73,6 +112,10 @@ en:
       search: "Search"
       save_and_edit: "Save and edit"
       save_and_add_another_button: "Save and create a other"
+      destroy: "Destroy"
+      edit: "Edit"
+      copy: "Duplicate"
+      close: "Close"
 
     types:
       boolean:
@@ -103,4 +146,24 @@ en:
         type: "Type"
         model_type: "Resource"
         namespaced: "Only list component's resources"
+  
+  activemodel:
+    models:
+      settings_rails/form:
+        one: "Configuration"
+        other: "Configuration"
+      para/exporter/base:
+        one: "Export of data"
+        other: "Exports of data"
+
+  helpers:
+    page_entries_info:
+      number_per_page: Number of entries per page
+      one_page:
+        display_entries:
+          zero: "No entries found"
+          one: "Display of entries <b>1&nbsp;-&nbsp;1</b> to <b>1</b> in total"
+          other: "Display of entries <b>1&nbsp;-&nbsp;%{count}</b> to <b>%{count}</b> in total"
+      more_pages:
+        display_entries: "Display of entries <b>%{first}&nbsp;-&nbsp;%{last}</b> to <b>%{total}</b> in total"
 

data/lib/generators/para/exporter/exporter_generator.rb

@@ -14,15 +14,19 @@ module Para
 
         template(
           "#{ base_exporter_template_name_for(format) }_exporter.rb",
-          "app/exporters/#{ plural_file_name }_exporter.rb"
+          "app/exporters/#{ exporter_name }.rb"
         )
       end
     end
 
     private
 
-    def model_exporter_name
-      Para::Exporter.model_exporter_name(class_name)
+    def exporter_class_name
+      exporter_name.camelize
+    end
+
+    def exporter_name
+      [plural_file_name, 'exporter'].join('_')
     end
 
     def base_exporter_template_name_for(format)

data/lib/generators/para/exporter/templates/base_exporter.rb

@@ -1,4 +1,4 @@
-class <%= model_exporter_name %> < Para::Exporter::Base
+class <%= exporter_class_name %> < Para::Exporter::Base
   def name
     '<%= file_name %>'
   end

data/lib/generators/para/exporter/templates/csv_exporter.rb

@@ -1,4 +1,4 @@
-class <%= model_exporter_name %> < Para::Exporter::Csv
+class <%= exporter_class_name %> < Para::Exporter::Csv
   def name
     '<%= file_name %>'
   end

data/lib/generators/para/exporter/templates/xls_exporter.rb

@@ -1,4 +1,4 @@
-class <%= model_exporter_name %> < Para::Exporter::Xls
+class <%= exporter_class_name %> < Para::Exporter::Xls
   def name
     '<%= file_name %>'
   end

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

@@ -26,6 +26,10 @@ Para.config do |config|
   #
   # config.resource_name_methods += [:full_name]
 
+  # Configure the theme navigation bar color not gray but blue darker
+  # 
+  # config.dark_theme = true
+
   # Set if the Para::Breadcrumb::Controller module should be included into the
   # app, allowing easy breadcrumbs management in the app.
   #

data/lib/para/attribute_field/datetime.rb

@@ -10,7 +10,7 @@ module Para
       end
 
       def wrapper_name
-        :horizontal_form
+        :vertical_form
       end
     end
   end

data/lib/para/components_configuration.rb

@@ -19,7 +19,11 @@ module Para
     end
 
     def method_missing(method, *args, &block)
-      component_for(method) || super
+      if (component = component_for(method))
+        component.tap(&ActiveDecorator::Decorator.instance.method(:decorate))
+      else
+        super
+      end
     end
 
     def section_for(identifier)

data/lib/para/config.rb

@@ -39,6 +39,9 @@ module Para
     mattr_accessor :page_actions
     @@page_actions = {}
 
+    mattr_accessor :dark_theme
+    @@dark_theme = false
+
     # Allows changing default cache store used by Para to store jobs through
     # the ActiveJob::Status gem
     #

data/lib/para/form_builder/attributes_mappings_tracker.rb

@@ -19,8 +19,11 @@ module Para
         super(attribute_name, options)
       end
 
-      def fields_for(*args, options, &block)
-        super(*args, options) do |fields|
+      def fields_for(*args, &block)
+        fields_options = args.extract_options!
+        fields_options.reverse_merge!(track_attribute_mappings: options[:track_attribute_mappings])
+
+        super(*args, fields_options) do |fields|
           fields_html = @template.capture { block.call(fields) }
 
           fields_html + fields.attributes_mappings_field_for(fields)
@@ -28,14 +31,18 @@ module Para
       end
 
       def attributes_mappings_field_for(fields)
+        return unless options[:track_attribute_mappings]
+
         hidden_field :_attributes_mappings, value: @attributes_mappings.to_json,
                      data: { :'attributes-mappings' => fields.options[:child_index] }
       end
 
       private
 
-      def store_attribute_mapping_for(attribute_name, options, &block)
-        input = find_input(attribute_name, options, &block)
+      def store_attribute_mapping_for(attribute_name, input_options, &block)
+        return unless options[:track_attribute_mappings]
+
+        input = find_input(attribute_name, input_options, &block)
         type = input.class.name.demodulize.underscore.gsub(/_input\z/, '')
 
         @attributes_mappings[attribute_name] = type

data/lib/para/form_builder/tabs.rb

@@ -51,6 +51,7 @@ module Para
 
         def dom_id
           @dom_id = [
+            'form-tab',
             builder.nested_resource_dom_id.presence,
             identifier.to_s.parameterize
           ].compact.join('-')

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails