para 0.6.9 → 0.7.0

data/app/helpers/para/search_results_helper.rb

@@ -0,0 +1,16 @@
+module Para
+  module SearchResultsHelper
+    def selected_item_for(result)
+      content_tag(:tr, class: 'selected-item', data: { :'selected-item-id' => result.id }) do
+        content_tag(:td, reorder_anchor, class: 'reorder-anchor-cell') +
+        content_tag(:td, resource_name(result)) +
+
+        content_tag(:td, class: 'remove-button-cell') do
+          button_tag type: :button, class: 'btn btn-xs btn-danger', data: { :'remove-item' => true } do
+            fa_icon 'arrow-left'
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/para/tree_helper.rb

@@ -9,9 +9,7 @@ module Para
     end
 
     def actions(resource)
-      content_tag(:div, class: 'pull-right btn-group') do
-        edit_button(resource) + delete_button(resource)
-      end
+      edit_button(resource) + delete_button(resource)
     end
 
     def edit_button(resource)
@@ -19,7 +17,10 @@ module Para
         component.relation_path(
           resource, action: :edit, return_to: view.request.fullpath
         ),
-        class: 'btn btn-primary'
+        class: 'btn btn-sm btn-icon-primary btn-shadow hint--left',
+        aria: {
+          label: ::I18n.t('para.shared.edit')  
+        }
       ) do
         content_tag(:i, '', class: 'fa fa-pencil')
       end
@@ -32,9 +33,12 @@ module Para
         data: {
           confirm: ::I18n.t('para.list.delete_confirmation')
         },
-        class: 'btn btn-danger'
+        class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
+        aria: {
+          label: ::I18n.t('para.shared.destroy')  
+        }
       ) do
-        content_tag(:i, '', class: 'fa fa-trash')
+        content_tag(:i, '', class: 'fa fa-times')
       end
     end
   end

data/app/models/para/page.rb

@@ -0,0 +1,5 @@
+module Para::Page
+  def self.table_name_prefix
+    'para_page_'
+  end
+end

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

@@ -10,6 +10,48 @@ module Para
       def css_class
         @css_class ||= self.class.name.demodulize.underscore.gsub(/_/, '-')
       end
+
+      class << self
+        # 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)
+        end
+
+        private
+
+        def _ensure_section_resources_relation
+          return if @section_resources_already_initialized
+
+          has_many :section_resources, -> { ordered },
+                                       foreign_key: 'section_id',
+                                       class_name: '::Para::Page::SectionResource',
+                                       dependent: :destroy
+          accepts_nested_attributes_for :section_resources, allow_destroy: true
+
+          @section_resources_already_initialized = true
+        end
+
+        def _create_section_resource_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_resources,
+            source: :resource,
+            source_type: target_class_name
+          )
+
+          has_many(*args, options, &block)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,12 @@
+module Para
+  module Page
+    class SectionResource < ActiveRecord::Base
+      self.table_name = 'para_page_section_resources'
+
+      acts_as_orderable
+
+      belongs_to :section
+      belongs_to :resource, polymorphic: true
+    end
+  end
+end

data/app/views/layouts/para/admin.html.haml

@@ -18,15 +18,12 @@
     = csrf_meta_tags
 
   %body
-    .page-container.page-navigation-top-fixed
+    = render partial: 'para/admin/shared/navigation'
+    = render partial: 'para/admin/shared/header'
 
-      .page-sidebar.collapse.navbar-collapse#menu-sidebar
-        = render partial: 'para/admin/shared/navigation'
+    .container-fluid.page-content
+      = display_admin_flash
 
-      .page-content
-        = render partial: 'para/admin/shared/header'
-        = display_admin_flash
-
-        = yield
+      = yield
 
     = javascript_include_tag 'para/admin', :'data-turbolinks-eval' => false

data/app/views/para/admin/dashboard.html.haml

@@ -1,11 +1,24 @@
 = page_top_bar(title: t('para.dashboard.title'), type: 'dashboard/show')
 
-.page-content-wrap
-  - ordered_components.each_slice(3) do |components|
-    .row
-      - components.each do |component|
-        .col-md-4
-          = link_to component.path, class: 'panel panel-default' do
-            .panel-body
-              = component.name
+- ordered_components.each_slice(3) do |components|
+  - components.each do |component|
+    .col-sm-6.col-md-6.col-lg-4.m-t-lg
+      = link_to component.path, class: 'statcard statcard-icon' do
+        %i.icon-rounded.bg-primary
+          = component.name[0,1]
+        .startcard-body  
+          %h2.statcard-title
+            = component.name
 
+          %span.text-muted
+            - if component.type == "Para::Component::Crud"      
+              = t('para.dashboard.statcard.ressources_count', count: component.resources.count)
+            - else
+              = t('para.dashboard.statcard.component_form_ressource')
+
+      -# Comment because is not dev at all for now
+      = link_to '#', class: 'thumbtack-link' do
+        %i.fa.fa-thumb-tack
+        
+-# Create spacing at the end off all statcards        
+.col-xs-12.m-t-lg

data/app/views/para/admin/form_resources/show.html.haml

@@ -1,4 +1,4 @@
 = page_top_bar(title: @component.name, type: 'form/show')
 
-.page-content-wrap
+.page-content-wrap.form-fixed-actions
   = render find_partial_for(resource, :form)

data/app/views/para/admin/imports/new.html.haml

@@ -9,6 +9,6 @@
       = form.input :attachment, label: false, placeholder: t('para.import.placeholder')
 
       = modal.footer do
-        %button.btn.btn-primary{ type: 'submit' }
-          = fa_icon 'upload'
+        %button.btn.btn-primary.btn-shadow{ type: 'submit' }
+          %i.fa.fa-upload.fa-fw
           = t('para.import.name')

data/app/views/para/admin/resources/_actions.html.haml

@@ -1,6 +1,6 @@
-%ul.panel-controls
-  %li
-    = add_button_for(component, relation,  model) if allow_adding_resource
+= add_button_for(component, relation,  model) if allow_adding_resource
+
+%ul.actions-control.pull-right
   %li  
     = render partial: find_partial_for(relation, :exports_menu), locals: { component: component, model: model }
   %li  

data/app/views/para/admin/resources/_add_button.html.haml

@@ -1 +1 @@
-= icon_link_to t('para.shared.add'), component.relation_path(model.model_name.singular_route_key, action: :new), icon: 'plus', class: 'btn btn-primary add-button'
+= icon_link_to t('para.shared.add'), component.relation_path(model.model_name.singular_route_key, action: :new), class: 'btn btn-primary btn-shadow add-button'

data/app/views/para/admin/resources/_exports_menu.html.haml

@@ -2,16 +2,16 @@
   - if component.exporters.length == 1
     - exporter = component.exporters.first
 
-    = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), class: 'btn btn-default', method: :post, remote: true, data: { :'job-tracker-button' => true, :'refresh-on-close' => false } do
-      = fa_icon 'download'
+    = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), class: 'btn btn-default btn-shadow', method: :post, remote: true, data: { :'job-tracker-button' => true, :'refresh-on-close' => false } do
+      %i.fa.fa-download.fa-fw
       = exporter.model_name.human
 
   - else
-    .btn-group
-      %button.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
-        = fa_icon 'download'
+    .btn-group.dropdown
+      %button.btn.btn-default.btn-shadow{ type: 'button', data: { toggle: 'dropdown' } }
+        %i.fa.fa-download.fa-fw
         = t('para.export.name')
-        %span.caret
+        %i.fa.fa-angle-down
       %ul.dropdown-menu
         - component.exporters.each do |exporter|
           %li

data/app/views/para/admin/resources/_filters.html.haml

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

data/app/views/para/admin/resources/_imports_menu.html.haml

@@ -2,16 +2,16 @@
   - if component.importers.length == 1
     - importer = component.importers.first
 
-    = link_to component.path(namespace: :import, action: :new, importer: importer.model_name.singular_route_key), class: 'btn btn-default', remote: true, data: { :'job-tracker-button' => true } do
-      = fa_icon 'upload'
+    = link_to component.path(namespace: :import, action: :new, importer: importer.model_name.singular_route_key), class: 'btn btn-default btn-shadow', remote: true, data: { :'job-tracker-button' => true } do
+      %i.fa.fa-upload.fa-fw
       = importer.model_name.human
 
   - else
-    .btn-group
-      %button.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
-        = fa_icon 'upload'
+    .btn-group.dropdown
+      %button.btn.btn-default.btn-shadow{ type: 'button', data: { toggle: 'dropdown' } }
+        %i.fa.fa-upload.fa-fw
         = t('para.import.name')
-        %span.caret
+        %i.fa.fa-angle-down
       %ul.dropdown-menu
         - component.importers.each do |importer|
           %li

data/app/views/para/admin/resources/_list.html.haml

@@ -1,28 +1,27 @@
 .page-content-wrap
-  = panel do |panel|
-    = panel.header do
+  .page-list
+    .page-list-heading  
       = render partial: find_partial_for(relation, :actions), locals: { relation: relation, component: component, model: model, allow_adding_resource: allow_adding_resource }
 
-    = panel.body do
-      = render partial: find_partial_for(relation, :filters), locals: { attributes: attributes }
+    .page-list-heading  
+      .flextable
+        = render partial: find_partial_for(relation, :filters), locals: { attributes: attributes }
 
     - if resources.length > 0
-      = panel.body class: 'page-entries-info' do
+      .page-entries-info
         = page_entries(resources)
-
-      = panel.body class: '' do
+      .page-list-body
         = table_for(resources: resources, model: model, component: component, attributes: attributes)
 
     - else
-      = panel.body do
-        = alert class: 'no-results no-margin-bottom', dismissable: false do
-          - if filtered?(attributes)
-            = t('para.list.no_results')
-          - else
-            = t('para.list.empty')
+      = alert class: 'no-results', dismissable: false do
+        - if filtered?(attributes)
+          = t('para.list.no_results')
+        - else
+          = t('para.list.empty')
 
-          = add_button_for(component, relation, model) if allow_adding_resource
+        = add_button_for(component, relation, model) if allow_adding_resource
 
     - if resources.total_count > resources.length
-      = panel.footer do
+      .page-list-footer
         = paginate resources, theme: Para.config.pagination_theme

data/app/views/para/admin/resources/_per_page_select.html.haml

@@ -1,10 +1,11 @@
 \.
+%br.visible-xs
 = t('helpers.page_entries_info.number_per_page')
 \:
 %span.dropdown
-  %button.btn.btn-default.btn-xs{ data: { toggle: 'dropdown' } }
+  %button.btn.btn-default.btn-shadow.btn-xs.dropdown-toggle{ data: { toggle: 'dropdown' } }
     = current_per_page
-    %span.caret
+    %span.fa.fa-angle-down
   %ul.dropdown-menu
     - count_with_url.each do |count, url|
-      %li= link_to count, url
+      %li= link_to count, url

data/app/views/para/admin/resources/_subclassable_add_button.html.haml

@@ -1,7 +1,7 @@
-.btn-group.add-button
-  %button.btn.btn-primary.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false }}
+.btn-group.add-button.dropdown
+  %button.btn.btn-primary.btn-shadow.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false }}
     = t('para.shared.add')
-    %span.caret
+    %i.fa.fa-angle-down
 
   %ul.dropdown-menu
     - component.subclass_names.each do |subclass|

data/app/views/para/admin/resources/_tree.html.haml

@@ -1,15 +1,13 @@
-.page-content-wrap
-  = panel do |panel|
-    = panel.header do
+.page-content-wrap  
+  .page-list
+    .page-list-heading
       = render partial: find_partial_for(relation, :actions), locals: { relation: relation, component: component, model: model, allow_adding_resource: allow_adding_resource }
 
     - if resources.length > 0
-      = panel.body do
-        %ul.tree.root-tree{ data: { url: component.relation_path(model.model_name.route_key, action: :tree), :"max-depth" => max_depth_for(model) } }
-          = render partial: find_partial_for(model, 'tree_item'), collection: resources.roots, as: :root, locals: { model: model}
+      %ul.tree.root-tree{ data: { url: component.relation_path(model.model_name.route_key, action: :tree), :"max-depth" => max_depth_for(model) } }
+        = render partial: find_partial_for(model, 'tree_item'), collection: resources.roots, as: :root, locals: { model: model}
 
     - else
-      = panel.body do
-        = alert class: 'no-margin-bottom', dismissable: false do
-          = filtered?(attributes) ? t('para.list.no_results') : t('para.list.empty')
+      = alert class: '', dismissable: false do
+        = filtered?(attributes) ? t('para.list.no_results') : t('para.list.empty')
 

data/app/views/para/admin/resources/_tree_item.html.haml

@@ -1,19 +1,18 @@
 %li.node{ data: { id: root.id } }
   .node-row
     %span.handle
-      %i.fa.fa-bars.fa-fw
+      %i.sort-dots
     %span.node-name
       = root.name
 
-    .pull-right.btn-group
-      = link_to @component.relation_path(root, action: :edit, return_to: request.fullpath), class: "btn btn-primary" do
+    .pull-right
+      = link_to @component.relation_path(root, action: :edit, return_to: request.fullpath), class: "btn btn-icon-primary btn-shadow btn-sm hint--left", :'aria-label' => ::I18n.t('para.shared.edit') do
         %i.fa.fa-pencil
 
-      = link_to @component.relation_path(root), method: :delete, data: { confirm: ::I18n.t('para.list.delete_confirmation') }, class: 'btn btn-danger' do
-        %i.fa.fa-trash
+      = link_to @component.relation_path(root), method: :delete, data: { confirm: ::I18n.t('para.list.delete_confirmation') }, class: 'btn btn-icon-danger btn-shadow btn-sm hint--left', :'aria-label' => ::I18n.t('para.shared.destroy') do
+        %i.fa.fa-times
 
     .clearfix
   %ul.tree
     %li.placeholder{ class: "#{ 'hidden' unless needs_placeholder?(root) }"}
     = render partial: find_partial_for(model, 'tree_item'), collection: root.children.ordered, as: :root, locals: { model: model }
-

data/app/views/para/admin/resources/edit.html.haml

@@ -1,4 +1,4 @@
 = page_top_bar(title: resource_title_for(resource), type: 'crud/edit')
 
-.page-content-wrap
+.page-content-wrap.form-fixed-actions
   = render find_partial_for(resource, :form)

data/app/views/para/admin/resources/new.html.haml

@@ -1,4 +1,4 @@
 = page_top_bar(title: resource_title_for(resource), type: 'crud/new')
 
-.page-content-wrap
+.page-content-wrap.form-fixed-actions
   = render find_partial_for(resource, :form)

data/app/views/para/admin/search/_result.html.haml

@@ -0,0 +1,7 @@
+%tr.available-item{ data: { :'available-item-id' => result.id, :available => true, :'selected-item-template' => selected_item_for(result) } }
+  %td= resource_name(result)
+
+  %td.add-button-cell
+    = button_tag type: :button, class: 'btn btn-xs btn-success', data: { :'add-item' => true } do
+      = fa_icon 'arrow-right'
+    %span.badge= t('para.form.multi_select.available.already_selected')

data/app/views/para/admin/search/index.html.haml

@@ -0,0 +1 @@
+= render partial: 'para/admin/search/result', collection: @results

data/app/views/para/admin/settings_component/show.html.haml

@@ -1,6 +1,6 @@
 = page_top_bar(title: @component.name, type: 'settings/show')
 
-.page-content-wrap
+.page-content-wrap.form-fixed-actions
   = para_form_for @settings, url: admin_settings_path(@component) do |form|
     = form.fieldset do
       - @component.settings.each do |setting, type|

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

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

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

@@ -1,29 +1,18 @@
-.navigation-horizontal{ data: { header: true } }
-  = render_breadcrumbs
-  %ul.list-unstyled.list-inline.ul-navbar
-    %li.brand-logo
-      = link_to admin_path do
-        .hidden-sm.hidden-xs
-          = t('para.admin.title')
-        .visible-sm.visible-xs
-          %i.fa.fa-home
+.navbar.navbar-default.navbar-fixed-top{ data: { header: true } }
+  %button.navbar-toggle{ type: 'button', data: { toggle: 'offcanvas', target: '.navmenu' } }
+    %span.sr-only
+      = t('para.admin.toggle_navigation')
+    %span.icon-bar
+    %span.icon-bar
+    %span.icon-bar
 
-    %li.pull-right
-      %button.navbar-toggle.collapsed{ type: 'button', data: { toggle: 'collapse', target: '#menu-sidebar' } }
-        %span.sr-only
-          = t('para.admin.toggle_navigation')
-        %span.icon-bar
-        %span.icon-bar
-        %span.icon-bar
-
-    %li.pull-right
-      = link_to destroy_admin_user_session_path, method: :delete do
-        %i.fa.fa-power-off
-        %span.text-hidden
-          = t('para.admin.sign_out')
-
-    %li.pull-right
-      = link_to root_path, target: "_blank" do
+  %ul.nav.navbar-nav.pull-right
+    %li
+      = link_to root_path, target: "_blank", class: 'hint--bottom-left btn-home btn-shadow', aria: { label: t('para.admin.back_to_app') } do
         %i.fa.fa-home
-        %span.text-hidden
-          = t('para.admin.back_to_app')
+        
+    %li
+      = link_to destroy_admin_user_session_path, method: :delete, class: 'hint--bottom-left btn-power-off btn-shadow', aria: { label: t('para.admin.sign_out') } do
+        %i.fa.fa-sign-out
+
+  = render_breadcrumbs