para 0.4.0 → 0.5.0

data/app/assets/stylesheets/para/lib/_variables.scss

@@ -157,7 +157,7 @@ $input-border:                   $gray-light !default;
 $input-border-radius:            $border-radius-base !default;
 $input-border-focus:             #C1C1C1 !default;
 
-$input-color-placeholder:        $gray-light !default;
+$input-color-placeholder:        $gray-dark !default;
 
 $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
 $input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
@@ -260,7 +260,7 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
 // -------------------------
 
 // Basics of a navbar
-$navbar-height:                    50px !default;
+$navbar-height:                    40px !default;
 $navbar-margin-bottom:             $line-height-computed !default;
 $navbar-border-radius:             $border-radius-base !default;
 $navbar-padding-horizontal:        floor($grid-gutter-width / 2) !default;
@@ -293,16 +293,16 @@ $navbar-default-toggle-border-color:       #ddd !default;
 // Inverted navbar
 //
 // Reset inverted navbar basics
-$navbar-inverse-color:                      $gray-light !default;
-$navbar-inverse-bg:                         #222 !default;
-$navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-color:                      #000 !default;
+$navbar-inverse-bg:                         #F9F9F9 !default;
+$navbar-inverse-border:                     #EEEEEE !default;
 
 // Inverted navbar links
-$navbar-inverse-link-color:                 $gray-light !default;
-$navbar-inverse-link-hover-color:           #fff !default;
+$navbar-inverse-link-color:                 #626262 !default;
+$navbar-inverse-link-hover-color:           #428bca !default;
 $navbar-inverse-link-hover-bg:              transparent !default;
 $navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
-$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-link-active-bg:             #fff !default;
 $navbar-inverse-link-disabled-color:        #444 !default;
 $navbar-inverse-link-disabled-bg:           transparent !default;
 
@@ -572,10 +572,10 @@ $badge-border-radius:         10px !default;
 
 // Breadcrumbs
 // -------------------------
-$breadcrumb-bg:               #e8e8e8 !default;
-$breadcrumb-color:            #99a0aa !default;
-$breadcrumb-active-color:     #656d78 !default;
-$breadcrumb-separator:        "/" !default;
+$breadcrumb-bg:               #f7f7f7 !default;
+$breadcrumb-color:            #555 !default;
+$breadcrumb-active-color:     $brand-primary !default;
+$breadcrumb-separator:        "" !default;
 
 
 // Carousel

data/app/assets/stylesheets/para/overrides/responsive.sass

@@ -1,5 +1,4 @@
 @import "para/admin/theme/variables"
-@import "compass/css3/shared"
 
 $experimental-support-for-opera: true
 
@@ -39,7 +38,7 @@ $experimental-support-for-opera: true
 @media (min-width: 1025px)
   .form-fixed-actions
     .form-actions
-      +experimental-value(width, calc(100% - 270px))
+      width: calc(100% - 270px)
 
 /* Medium high devices (desktops, 1200px and up) */
 @media (min-width: 1200px)

data/app/assets/stylesheets/para/overrides/theme.sass

@@ -1,13 +1,6 @@
 @import "para/admin/theme/variables"
-@import "compass/css3/text-shadow"
-@import "compass/css3/inline-block"
-@import "compass/css3/transition"
-@import "compass/css3/box-shadow"
-@import "compass/css3/border-radius"
-@import "compass/css3/transform"
 
 .animated
-  -webkit-animation-duration: 100ms
   animation-duration: 100ms
 
 // More button style
@@ -18,11 +11,11 @@
 
 @mixin button-hover-focus-active($color-border, $color-bg) 
   position: relative
-  +box-shadow(0px 2px darken($color-border, 10%) )
-  +single-transition(none)
+  box-shadow: 0px 2px darken($color-border, 10%) 
+  transition: none
   &:hover
     top: 1px
-    +box-shadow(0px 1px darken($color-border, 10%) )
+    box-shadow: 0px 1px darken($color-border, 10%) 
     background-color: $color-bg
     border-color: $color-border
   &:focus,
@@ -31,7 +24,7 @@
   .open &.dropdown-toggle
     background-color: darken($color-bg, 7%)
     top: 2px
-    +box-shadow(0px 0 darken($color-border, 10%))  
+    box-shadow: 0px 0 darken($color-border, 10%)
     border-color: $color-border
     &:hover
       background-color: darken($color-bg, 7%)
@@ -39,10 +32,10 @@
 @mixin button-variant-inverse($color-border, $color-bg) 
   color: $color-border
   background-color: transparent
-  +box-shadow(none)
-  +single-transition(all, .2s, linear)
+  box-shadow: none
+  transition: all, .2s, linear
   &:hover
-    +box-shadow(none)
+    box-shadow: none
     top: 0
     color: #fff
     background-color: $color-bg
@@ -52,7 +45,7 @@
   &:active,
   &.active,
   .open &.dropdown-toggle
-    +box-shadow(none)
+    box-shadow: none
     top: 0
     color: #fff
     background-color: darken($color-bg, 7%)
@@ -64,7 +57,7 @@ input,
 textarea,
 select,
 button
-  +single-transition(all, .1s, linear)
+  transition: all, .1s, linear
   &,
   &:active,
   &.active
@@ -148,7 +141,7 @@ button
   .btn:focus,
   .btn:active,
     top: 0
-    +box-shadow(none)
+    box-shadow: none
 
 .form-group-separated
   &:after

data/app/controllers/para/admin/base_controller.rb

@@ -4,31 +4,40 @@ module Para
       include Para::Admin::BaseHelper
 
       if Para.config.authenticate_admin_method
-        before_filter Para.config.authenticate_admin_method
+        before_action Para.config.authenticate_admin_method
       end
 
-      before_filter :load_component_sections
+      before_action :authorize_admin_access
+      before_action :load_component_sections
 
       layout 'para/admin'
 
+      helper_method :current_admin
+
       def current_admin
-        if Para.config.current_admin_method
+        @current_admin ||= if Para.config.current_admin_method
           send(Para.config.current_admin_method)
         end
       end
 
       def current_ability
-        Ability.new(current_admin)
+        @current_ability ||= if (class_name = Para::Config.ability_class_name)
+          class_name.constantize.new(current_admin)
+        end
       end
 
       private
 
+      def authorize_admin_access
+        authorize! :access, :admin
+      end
+
       def load_component_sections
         @component_sections = Para::ComponentSection.ordered.includes(:components)
       end
 
       def self.load_and_authorize_component(options = {})
-        before_filter do
+        before_action do
           load_and_authorize_component(options)
         end
       end
@@ -40,6 +49,8 @@ module Para
         loader.load_and_authorize_resource
 
         ActiveDecorator::Decorator.instance.decorate(@component) if @component
+
+        add_breadcrumb(@component.name, @component.path) if @component
       end
     end
   end

data/app/controllers/para/admin/crud_resources_controller.rb

@@ -6,9 +6,23 @@ module Para
       include Para::Admin::ResourceControllerConcerns
 
       before_filter :load_and_authorize_crud_resource
+      before_filter :add_breadcrumbs, only: [:show, :index, :edit, :new]
+
       after_filter :attach_resource_to_component, only: [:create]
       after_filter :remove_resource_from_component, only: [:destroy]
 
+      def index
+        @q = @component.resources.search(params[:q])
+        @resources = @q.result.uniq.page(params[:page])
+
+        # Sort collection for orderable and trees
+        @resources = if @resources.respond_to?(:ordered)
+          @resources.ordered
+        else
+          @resources.order(created_at: :desc)
+        end
+      end
+
       def clone
         new_resource = resource.deep_clone include: resource.class.cloneable_associations
         new_resource.save!
@@ -37,18 +51,41 @@ module Para
         if @component.exportable?
           exporter = Para::Exporter.for(
             resource_model.name, params[:format]
-          ).new(@component.resources.search(params[:q]).result)
+          ).new(@component.resources.search(params[:q]).result.uniq)
 
           send_data exporter.render, type: exporter.mime_type,
                                      disposition: exporter.disposition,
                                      filename: exporter.file_name
         else
-          redirect_to component_path(@component)
+          redirect_to @component.path
         end
       end
 
+      def import
+        if @component.importable?
+          file = params[:file]
+          if file
+            importer = params[:importer].constantize.new(file.tempfile)
+            importer.run
+            flash_message(:success)
+          else
+            flash_message(:error)
+          end
+        end
+        redirect_to @component.path
+      end
+
       private
 
+      def resource_model
+        @resource_model ||=
+          if @component.subclassable_with?(params[:type])
+            params[:type].constantize
+          else
+            super
+          end
+      end
+
       def load_and_authorize_crud_resource
         loader = self.class.cancan_resource_class.new(
           self, resource_name, parent: false, class: resource_model.name
@@ -57,6 +94,10 @@ module Para
         loader.load_and_authorize_resource
       end
 
+      def add_breadcrumbs
+        add_breadcrumb(resource_title_for(resource)) if resource
+      end
+
       def attach_resource_to_component
         return unless resource.persisted? && @component.namespaced?
         @component.add_resource(resource)

data/app/controllers/para/admin/main_controller.rb

@@ -5,4 +5,4 @@ module Para
       end
     end
   end
-end
+end

data/app/controllers/para/admin/resources_controller.rb

@@ -77,7 +77,7 @@ module Para
 
       def after_form_submit_path
         if params[:_save_and_edit]
-          { action: 'edit', id: resource.to_param }
+          { action: 'edit', id: resource.id }
         elsif params[:_save_and_add_another]
           { action: 'new' }
         else

data/app/controllers/para/admin/settings_component_controller.rb

@@ -1,8 +1,6 @@
 module Para
   module Admin
-    class SettingsComponentController < Para::Admin::BaseController
-      load_and_authorize_component
-
+    class SettingsComponentController < Para::Admin::ComponentController
       def show
         @settings = SettingsRails::Form.new
       end

data/app/controllers/para/application_controller.rb

@@ -1,7 +1,7 @@
 module Para
   class ApplicationController < ActionController::Base
-    def current_ability
-      @current_ability ||= Ability.new(current_admin_user)
-    end
+    include Para::Breadcrumbs::Controller
+
+    add_breadcrumb :home, :admin
   end
 end

data/app/decorators/para/component/crud_decorator.rb

@@ -3,6 +3,10 @@ module Para
     module CrudDecorator
       include Para::Component::BaseDecorator
 
+      def path(options = {})
+        find_path([:admin, self, :resources], options)
+      end
+
       def relation_path(controller_or_resource, options = {})
         if (id = extract_id_from(controller_or_resource))
           options[:id] = id
@@ -22,9 +26,9 @@ module Para
 
       def route_key_for(id, options)
         if id || options[:action].presence && options[:action].to_sym == :new
-          :crud_resource
+          :resource
         else
-          :crud_resources
+          :resources
         end
       end
     end

data/app/decorators/para/component/singleton_resource_decorator.rb

@@ -3,8 +3,12 @@ module Para
     module SingletonResourceDecorator
       include Para::Component::BaseDecorator
 
+      def path(options = {})
+        find_path([:admin, self], options)
+      end
+
       def relation_path(controller_or_resource, options = {})
-        polymorphic_path([:admin, self, :singleton_resource].compact, options)
+        path
       end
     end
   end

data/app/helpers/para/admin/base_helper.rb

@@ -3,7 +3,7 @@ module Para
     module BaseHelper
       include Para::ApplicationHelper
 
-      def find_partial_for(relation, partial)
+      def find_partial_for(relation, partial, partial_dir: 'admin/resources')
         if relation.kind_of? ActiveRecord::Base
           relation = relation.class
         end
@@ -13,7 +13,7 @@ module Para
         if lookup_context.find_all("admin/#{relation}/_#{ partial }").any?
           "admin/#{ relation }/#{ partial }"
         else
-          "para/admin/resources/#{ partial }"
+          "para/#{ partial_dir }/#{ partial }"
         end
       end
 
@@ -24,8 +24,13 @@ module Para
       end
 
       def resource_title_for(resource)
-        resource.try(:title) || resource.try(:name) ||
-        t('para.form.shared.edit.title', model: resource.class.model_name.human)
+        if resource.new_record?
+          t('para.form.shared.new.title', model: resource.class.model_name.human)
+        else
+          resource.try(:title).presence ||
+            resource.try(:name).presence ||
+            t('para.form.shared.edit.title', model: resource.class.model_name.human)
+        end
       end
 
       def registered_components_options

data/app/helpers/para/admin/components_helper.rb

@@ -1,4 +1,11 @@
 module Para
   module Admin::ComponentsHelper
+    def ordered_components
+      @component_sections.each_with_object([]) do |section, components|
+        section.components.each do |component|
+          components << component
+        end
+      end.sort_by(&:updated_at)
+    end
   end
 end

data/app/helpers/para/form_helper.rb

@@ -4,7 +4,7 @@ module Para
       default_options = {
         as: :resource,
         wrapper: :horizontal_form,
-        html: { class: '' }
+        html: { class: '', data: { :'para-form' => true } }
       }
 
       options = default_options.deep_merge(options)
@@ -22,7 +22,15 @@ module Para
         default_options[:html][:class] << ' form-fixed-actions'
       end
 
-      simple_form_for(resource, options, &block)
+      simple_form_for(resource, options) do |form|
+        capture { block.call(form) }.tap do |content|
+          # Append hidden field with type if resource is subclassable
+          # to avoid bad class instantiation in create action
+          if @component.subclassable? && resource.new_record?
+            content << form.hidden_field(:type, value: resource.type)
+          end
+        end
+      end
     end
   end
 end

data/app/helpers/para/tag_helper.rb

@@ -46,5 +46,17 @@ module Para
         locals: options
       )
     end
+
+    def add_button_for(component, relation, model)
+      partial_name = if component.subclassable?
+        :subclassable_add_button
+      else
+        :add_button
+      end
+
+      render partial: find_partial_for(relation, partial_name), locals: {
+        component: component, model: model
+      }
+    end
   end
 end

data/app/models/para/ability.rb

@@ -0,0 +1,12 @@
+module Para
+  class Ability
+    include CanCan::Ability
+
+    def initialize(user)
+      if user.is_a?(AdminUser)
+        can :access, :admin
+        can :manage, :all
+      end
+    end
+  end
+end

data/app/models/para/component/base.rb

@@ -10,12 +10,11 @@ module Para
         Para::Component.registered_components[name] = component
       end
 
-      extend FriendlyId
-      friendly_id :name, use: [:slugged, :finders, :history]
+      belongs_to :component_section, class_name: 'Para::ComponentSection'
 
       validates :identifier, :type, presence: true
 
-      belongs_to :component_section, class_name: 'Para::ComponentSection'
+      before_validation :ensure_slug
 
       scope :ordered, -> { order(position: :asc) }
 
@@ -30,6 +29,10 @@ module Para
         false
       end
 
+      def subclassable?
+        false
+      end
+
       def self.model_name
         @model_name ||= ModelName.new(self)
       end
@@ -47,14 +50,19 @@ module Para
         @configurable_attributes ||= {}
       end
 
-      def should_generate_new_friendly_id?
-        slug.blank? || name_changed?
-      end
-
       def default_form_actions
         [:submit, :submit_and_edit, :submit_and_add_another, :cancel]
       end
 
+      def to_param
+        slug
+      end
+
+      private
+
+      def ensure_slug
+        self.slug = identifier.parameterize if slug.blank? || identifier_changed?
+      end
     end
 
     class ModelName < ActiveModel::Name

data/app/models/para/component/crud.rb

@@ -4,12 +4,14 @@ module Para
       register :crud, self
 
       include Para::Component::Exportable
+      include Para::Component::Importable
+      include Para::Component::Subclassable
 
       configurable_on :model_type
       configurable_on :namespaced
 
       has_many :component_resources, class_name: 'Para::ComponentResource',
-               foreign_key: :component_id, autosave: true
+               foreign_key: :component_id, autosave: true, dependent: :destroy
 
       def namespaced?
         case namespaced

data/app/models/para/component/singleton_resource.rb

@@ -6,7 +6,7 @@ module Para
       configurable_on :model_type, as: :selectize, collection: :available_models
 
       has_one :component_resource, class_name: 'Para::ComponentResource',
-              foreign_key: :component_id, autosave: true
+              foreign_key: :component_id, autosave: true, dependent: :destroy
 
       def resource
         build_component_resource(resource: model.new) unless component_resource

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

@@ -0,0 +1,4 @@
+.page-title
+  %h1= @component.name
+
+= listing_for(@resources)

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

@@ -1,10 +1,12 @@
 .page-title
-  %h1
-    Dashboard
+  %h1= t('para.dashboard.title')
+
 .page-content-wrap
-  .row
-    .col-md-12
-      .panel.panel-default
-        .panel-body
-          %p Override the dashboard view by Creating a view at :
-          %pre app/views/admin/dashboard.html.(haml|erb)
+  - 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
+

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

@@ -0,0 +1,7 @@
+%ul.panel-controls
+  %li
+    = add_button_for(component, relation,  model) if allow_adding_resource
+  %li  
+    = render partial: find_partial_for(relation, :exports_menu), locals: { component: component, model: model }
+  %li  
+    = render partial: find_partial_for(relation, :imports_menu), locals: { component: component, model: model }

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

@@ -0,0 +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'

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

@@ -3,7 +3,7 @@
     %span.input-group-addon
       %i.fa.fa-search
 
-    = form.input_field fulltext_search_param_for(attributes), as: :string, autofocus: true, label: 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'

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

@@ -0,0 +1,22 @@
+- if component.importable?
+  - component.imports.each do |importer|
+    = form_tag component.relation_path(model.model_name.route_key, action: :import, importer: importer), method: 'post', multipart: 'true' do
+      .fileinput.fileinput-new.input-group{ data: { provides: 'fileinput' } }
+        .form-control.uneditable-input{ data: { trigger: 'fileinput' } }
+          %span.fileinput-placeholder
+            = t('para.import.placeholder')
+          = fa_icon 'file', class: 'fileinput-exists'
+          %span.fileinput-filename
+        .input-group-btn  
+          .btn.btn-default.btn-file
+            %span.fileinput-new
+              = t('para.import.select')
+            %span.fileinput-exists  
+              = t('para.import.change')
+            = file_field_tag 'file', class: 'file file-upload'
+          .btn.btn-danger.fileinput-exists{ type: 'button', data: { dismiss: 'fileinput' } }
+            = fa_icon 'times'
+
+          %button.btn.btn-default{ type: 'submit' }
+            = fa_icon 'upload'
+            = t('para.import.name')

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

@@ -1,9 +1,7 @@
 .page-content-wrap
   = panel do |panel|
     = panel.header do
-      = icon_link_to t('para.shared.add'), component.relation_path(model.model_name.singular_route_key, action: :new), icon: 'plus', class: 'btn btn-primary' if allow_adding_resource
-
-      = render partial: find_partial_for(relation, :exports_menu), locals: { component: component, model: model }
+      = 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 }
@@ -14,8 +12,13 @@
 
     - 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: 'no-results no-margin-bottom', 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
 
     - if resources.total_count > resources.length
       = panel.footer do

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

@@ -0,0 +1,10 @@
+.btn-group.add-button
+  %button.btn.btn-primary.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false }}
+    = t('para.shared.add')
+    %span.caret
+
+  %ul.dropdown-menu
+    - component.subclass_names.each do |subclass|
+      %li
+        = link_to component.relation_path(model.model_name.singular_route_key, action: :new, type: subclass) do
+          = subclass.constantize.model_name.human

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

@@ -6,7 +6,7 @@
     - 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: 'para/admin/resources/tree_item', collection: resources.roots, as: :root
+          = render partial: find_partial_for(model, 'tree_item'), collection: resources.roots, as: :root, locals: { model: model}
 
     - else
       = panel.body do