action_admin 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfa12b281f6b7400703f1de253f6748bb55dd2d5
-  data.tar.gz: c334bd62b1f4c7ff4b2176542d17f77b606a6f4c
+  metadata.gz: a9012703a5f2b71c90cf819ea615adc7a01b4962
+  data.tar.gz: 04d2c416ffd490f115d0a2355c4ca992dd4c7868
 SHA512:
-  metadata.gz: 1cf489226899b73d86acde8e54469a7b5a980555a7b138f44162a665bec5b4a988958ad8885157b7fe91054f6f1c44fad3915718fd78607f4134638e26179700
-  data.tar.gz: 2febc76021ba622ac7b9818694f30825999257fd9a3c649a224bad0c1105a42d2bbfafe7266d9ced7acbd13e37e6f239be0f306a7f696686261574bee2855b4c
+  metadata.gz: 4a2515331cca4dc5faddff423557a13ccffc09270efb4b88422c27747091d1676727cca40c89a11161a9e930885f3759ef54b64864ddc87b4a828d497c54144b
+  data.tar.gz: f8e510880908c0c62abd7a73e5416dc8b268d5ecda0dbc051498406f96817ef011c5fff8b4ce5f15ca3f66c55be0c53ad3098c5bc4956db9da05841410b121be

data/app/controllers/action_admin/devise/registrations_controller.rb

@@ -5,6 +5,7 @@ module ActionAdmin
     action_title :new, 'Register'
     action_title :edit, 'Edit Profile'
 
-    layout -> { action_name == 'edit' ? 'admin' : 'admin/devise' }
+    layout 'admin', only: :edit
+    layout 'admin/devise', except: :edit
   end
 end

data/app/controllers/action_admin/shortcodes_controller.rb

@@ -0,0 +1,23 @@
+module ActionAdmin
+  class ShortcodesController < ActionController::Base
+    layout nil, except: :preview
+    layout ActionAdmin.config.shortcode_layout, only: :preview
+
+    def list
+      shortcodes = ActionAdmin.config.shortcodes
+      shortcodes.each do |key, value|
+        shortcodes[key][:icon] = "mdi mdi-#{value[:icon]}" if value[:icon].present?
+      end
+
+      render json: shortcodes
+    end
+
+    def form
+      @shortcode = params[:id]
+    end
+
+    def preview
+      @shortcode = params[:shortcode]
+    end
+  end
+end

data/app/helpers/action_admin/admin_helper.rb

@@ -61,5 +61,31 @@ module ActionAdmin
     def admin_search_url
       url_for merge_params({}, [:per_page, :filter, :sort], params.permit(:per_page, filter: {}, sort: {}).to_h)
     end
+
+    def admin_shortcode_present(shortcode, presenter=nil)
+      class_name = shortcode.classify
+      presenter  = presenter || "Admin::Shortcode::#{class_name}Presenter"
+      presenter  = "#{presenter}".safe_constantize || 'ActionAdmin::ShortcodePresenter'.constantize
+
+      presenter.new(shortcode, self)
+    end
+
+    def admin_render_shortcode(string)
+      method(ActionAdmin.config.shortcode_helper).call(string)
+    end
+
+    def admin_shortcode_assets
+      assets = ActionAdmin.config.shortcode_assets.map do |asset|
+        type = asset.split('.').last
+        type == 'css' ? stylesheet_link_tag(asset) : javascript_include_tag(asset)
+      end
+
+      packs = ActionAdmin.config.shortcode_packs.map do |asset|
+        type = asset.split('.').last
+        type == 'css' ? stylesheet_pack_tag(asset) : javascript_pack_tag(asset)
+      end
+
+      assets.join.html_safe + packs.join.html_safe
+    end
   end
 end

data/app/helpers/action_admin/markup_helper.rb

@@ -130,5 +130,9 @@ module ActionAdmin
 
       app_link.nil? ? all_links : (app_link + all_links)
     end
+
+    def admin_sidebar_status
+      'is-collapsed' unless cookies[:"_sidebar-collapsed"].nil?
+    end
   end
 end

data/app/inputs/action_admin/attachment_input.rb

@@ -10,19 +10,32 @@ module ActionAdmin
     def input_placeholder
       span    = content_tag :span, 'No thumbnail', class: 'margin-bottom-1'
       icon    = content_tag :i, nil, class: 'mdi mdi-camera-off'
-      button  = content_tag :a, 'Add Thumbnail', data: { open: input_html_id }, class: 'button success small hollow margin-0'
-      content = content_tag :div, empty_input + icon + span + button, class: 'no-content hide', data: { empty_state: '' }
+      button  = content_tag :a, 'Add Thumbnail', data: { open: input_html_id }, class: 'button success small hollow'
+      content = content_tag :div, empty_input + icon + span + button, class: 'no-content panel-section expanded border first last hide', data: { empty_state: '' }
       image   = attachment(attachment_url) if attachment_url.present?
 
       content + content_tag(:div, image, data: { list_remove: '' }, class: 'attachments')
     end
 
+    def final_attribute_name
+      if object.is_a? ::ActiveRecord::Base
+        :"#{attribute_name}_id"
+      else
+        :"#{attribute_name}"
+      end
+    end
+
     def empty_input
-      @builder.hidden_field(:"#{attribute_name}_id", value: '', id: nil)
+      @builder.hidden_field(final_attribute_name, value: '', id: nil)
     end
 
     def hidden_input
-      @builder.hidden_field(:"#{attribute_name}_id", data: { value: :id })
+      input_options = input_html_options
+
+      input_options[:data]        ||= {}
+      input_options[:data][:value]  = :id
+
+      @builder.hidden_field(final_attribute_name, input_options)
     end
 
     def input_html_id
@@ -30,15 +43,15 @@ module ActionAdmin
     end
 
     def attachment_url
-      object.send(attribute_name).try(:file_url, :preview)
+      object.try(attribute_name).try(:file_url, :preview)
     end
 
     def attachment(image_url=nil)
-      image  = content_tag :img, nil, src: image_url, class: 'width-100 margin-bottom-1', data: { src: 'file.preview.url', url: "#{template.root_url.chomp('/')}[src]" }
-      remove = content_tag :a, 'Remove', class: 'button alert small hollow margin-0', data: { remove: '' }
-      change = content_tag :a, 'Change', class: 'button success small hollow margin-0', data: { open: input_html_id }
-      remove = content_tag :div, remove, class: 'cell auto text-left'
-      change = content_tag :div, change, class: 'cell shrink'
+      image   = content_tag :img, nil, src: image_url, class: 'width-100 margin-bottom-1', data: { src: 'file.preview.url', url: "#{template.root_url.chomp('/')}[src]" }
+      remove  = content_tag :a, 'Remove', class: 'button alert small hollow margin-0', data: { remove: '' }
+      change  = content_tag :a, 'Change', class: 'button success small hollow margin-0', data: { open: input_html_id }
+      remove  = content_tag :div, remove, class: 'cell auto text-left'
+      change  = content_tag :div, change, class: 'cell shrink'
       buttons = content_tag :div, remove + change, class: 'panel-section expanded border last grid-x'
 
       content_tag :div, hidden_input + image + buttons, class: 'attachment text-center', data: { list_item: '' }

data/app/inputs/action_admin/attachments_input.rb

@@ -0,0 +1,71 @@
+module ActionAdmin
+  class AttachmentsInput < SimpleForm::Inputs::Base
+    def input(wrapper_options)
+      modal = options.fetch :modal, 'media-modal'
+      html  = content_tag :div, input_placeholder, id: input_html_id, data: { media_attach: modal, media_multiple: true }
+
+      html + input_template
+    end
+
+    def input_placeholder
+      span    = content_tag :span, 'No media attached', class: 'margin-bottom-1'
+      icon    = content_tag :i, nil, class: 'mdi mdi-camera-off'
+      button  = content_tag :a, 'Add media', data: { open: input_html_id }, class: 'button success small hollow margin-0'
+      content = content_tag :div, empty_input + icon + span, class: 'no-content hide', data: { empty_state: '' }
+      images  = attachments(attachment_urls) if attachment_urls.present?
+      grid    = content_tag(:div, images, data: { list_remove: '' }, class: 'attachments-grid removable')
+
+      content + grid + content_tag(:div, button, class: 'panel-section expanded border last')
+    end
+
+    def final_attribute_name
+      if object.is_a? ::ActiveRecord::Base
+        :"#{attribute_name}_ids"
+      else
+        :"#{attribute_name}"
+      end
+    end
+
+    def empty_input
+      @builder.hidden_field(final_attribute_name, value: '', id: nil, multiple: true)
+    end
+
+    def hidden_input
+      input_options = input_html_options
+
+      input_options[:data]        ||= {}
+      input_options[:data][:value]  = :id
+
+      @builder.hidden_field(final_attribute_name, input_options.merge(multiple: true))
+    end
+
+    def input_html_id
+      hidden_input[/id=\"(.*)\"/, 1].dasherize
+    end
+
+    def attachment_urls
+      Array(object.try(attribute_name)).map { |a| a.try(:file_url, :small) }
+    end
+
+    def attachments(urls=[])
+      urls.map { |u| attachment(u) }.join.html_safe
+    end
+
+    def attachment(image_url=nil)
+      image    = content_tag :img, nil, src: image_url, class: 'width-100 margin-bottom-1', data: { src: 'file.small.url', url: "#{template.root_url.chomp('/')}[src]" }
+      filename = content_tag :span, nil, class: 'filename', data: { text: 'name' }
+      remove   = content_tag :span, nil, class: 'remove-button mdi mdi-close', data: { remove: '' }
+      thumb    = content_tag :div, image + filename + remove, class: 'thumbnail'
+
+      content_tag :div, hidden_input + thumb, class: 'attachment', data: { list_item: '' }
+    end
+
+    def input_template
+      content_tag :script, attachment, id: "#{input_html_id}-item-template", type: 'text/template'
+    end
+
+    def label(wrapper_options)
+      ''
+    end
+  end
+end

data/app/inputs/action_admin/tinymce_input.rb

@@ -5,10 +5,11 @@ module ActionAdmin
       input_html_options[:data].merge!({
         tiny_mce_editor: '',
         content_css: template.asset_path('admin/tinymce-editor.css'),
-        media_handler: 'media-modal',
-        media_src: "file.large.url",
-        media_alt: "name",
-        media_url: "[src]",
+        # media_handler: 'media-modal',
+        # media_src: "file.large.url",
+        # media_alt: "name",
+        # media_url: "[src]",
+        shortcode_handler: 'shortcode-modal',
         convert_urls: false
       })
 

data/app/presenters/action_admin/shortcode_presenter.rb

@@ -0,0 +1,30 @@
+module ActionAdmin
+  class ShortcodePresenter
+    include ActionAdmin::Presentable
+
+    def initialize(shortcode, context)
+      @shortcode = shortcode
+      @context   = context
+    end
+
+    def fields
+      self.record_fields
+    end
+
+    def render_field(form, field, options={})
+      options = Hash(options)
+
+      options[:input_html]        ||= {}
+      options[:input_html][:data] ||= {}
+
+      options[:input_html][:data][:attribute] = field
+      options[:input_html][:include_hidden]   = false
+
+      form.input field, options
+    end
+
+    def render_fields(form)
+      fields.map { |f, o| render_field(form, f, o) }.join.html_safe
+    end
+  end
+end

data/app/views/action_admin/shortcodes/form.html.slim

@@ -0,0 +1,2 @@
+= admin_form_for(:"#{@shortcode}", url: root_url, method: :get) do |f|
+  = admin_shortcode_present(@shortcode).render_fields(f)

data/app/views/action_admin/shortcodes/preview.html.slim

@@ -0,0 +1,2 @@
+#shortcode-preview
+  = admin_render_shortcode("#{@shortcode}")

data/app/views/admin/common/_media_modal.html.slim

@@ -9,7 +9,7 @@ ruby:
     thumbnail_width:    "300"
   }
 
-#media-modal.reveal.full.reveal-panel.media-reveal data-media-reveal="" data-media-url=admin_media_url(per_page: 10000, format: :json)
+#media-modal.reveal.full.reveal-panel.media-reveal data-media-reveal="" data-multiple-opened="true" data-media-url=admin_media_url(per_page: 10000, format: :json)
   .panel
     .panel-header.border
       = 'Add Media'

data/app/views/admin/common/_shortcode_modal.html.slim

@@ -0,0 +1,33 @@
+ruby:
+  list_url    = admin.shortcode_list_url
+  form_url    = URI.unescape admin.shortcode_form_url(id: '[name]')
+  preview_url = URI.unescape admin.shortcode_preview_url(id: '[name]')
+
+#shortcode-modal.reveal.full.reveal-panel.shortcode-reveal data-shortcode-reveal="" data-multiple-opened="true" data-form-url=form_url data-preview-url=preview_url data-shortcodes-url=list_url
+  .panel
+    .panel-header.border
+      = 'Add Shortcode'
+      button.close-button aria-label="Close modal" data-close="" type="button"
+        span aria-hidden="true" ×
+
+    .panel-content.border.padding-0
+      .shortcode-columns
+        .shortcode-menu data-menu=""
+
+        .shortcode-preview
+          .shortcode-inner
+            div.shortcode-content data-preview=""
+              .no-content data-empty=""
+                = admin_icon 'eye-off'
+                span = 'No preview available'
+
+        .shortcode-form
+          h4.shortcode-title = 'Customize'
+          div.shortcode-content data-form=""
+
+    .panel-footer
+      .grid-x
+        .cell.auto
+          button.button.hollow.alert.margin-0 aria-label="Close modal" data-close="" type="button" = 'Close'
+        .cell.shrink
+          button.button.margin-0 aria-label="Insert Shortcode" data-insert="" type="button" = 'Insert'

data/app/views/layouts/admin.html.slim

@@ -6,11 +6,12 @@ html
     = csrf_meta_tags
     = favicon_link_tag 'admin/favicon.png'
     = stylesheet_link_tag 'admin/application', media: 'all'
+    script = '/** ActionAdmin **/'
 
   body
-    .off-canvas-wrapper
+    .off-canvas-wrapper data-resize-watcher=""
       .off-canvas-menu-wrapper.off-canvas-content data-off-canvas-content=""
-        #sidebar.off-canvas-menu.position-left data-off-canvas-menu=""
+        #sidebar.off-canvas-menu.position-left data-off-canvas-menu="" class=admin_sidebar_status
           = render 'admin/common/sidebar'
 
         .off-canvas-menu-content data-off-canvas-content=""
@@ -20,10 +21,12 @@ html
             = render 'admin/common/header'
             = yield
             = render 'admin/common/footer'
-            = render 'admin/common/media_modal'
-            = render 'admin/common/dropzone_template'
 
       #offcanvas.off-canvas.position-right data-off-canvas=""
         = render 'admin/common/messagebar'
 
+    = render 'admin/common/media_modal'
+    = render 'admin/common/shortcode_modal'
+    = render 'admin/common/dropzone_template'
+
     = javascript_include_tag 'admin/application'

data/app/views/layouts/admin/devise.html.slim

@@ -6,6 +6,7 @@ html
     = csrf_meta_tags
     = favicon_link_tag 'admin/favicon.png'
     = stylesheet_link_tag 'admin/application', media: 'all'
+    script = '/** ActionAdmin **/'
 
   body
     .login-box

data/app/views/layouts/shortcode.html.slim

@@ -0,0 +1,7 @@
+doctype html
+
+html
+  head
+    = admin_shortcode_assets
+  body
+    .row = yield

data/config/routes.rb

@@ -1,3 +1,9 @@
 ActionAdmin::Engine.routes.draw do
   root 'action_admin/welcome#index'
+
+  scope :shortcodes do
+    get 'list',        to: 'action_admin/shortcodes#list',    as: :shortcode_list
+    get 'form/:id',    to: 'action_admin/shortcodes#form',    as: :shortcode_form
+    get 'preview/:id', to: 'action_admin/shortcodes#preview', as: :shortcode_preview
+  end
 end

data/lib/action_admin/config.rb

@@ -1,9 +1,14 @@
 module ActionAdmin
   class Config < Hashie::Dash
-    property :app_name,     default: 'Action Admin'
-    property :app_urls,     default: :web_url
-    property :admin_locale, default: :en
-    property :menus,        default: Hashie::Mash.new
+    property :app_name,         default: 'Action Admin'
+    property :app_urls,         default: :web_url
+    property :admin_locale,     default: :en
+    property :menus,            default: Hashie::Mash.new
+    property :shortcodes,       default: Hashie::Mash.new
+    property :shortcode_helper, default: :render_shortcode
+    property :shortcode_layout, default: 'shortcode'
+    property :shortcode_assets, default: ['application.css', 'application.js']
+    property :shortcode_packs,  default: []
 
     def menu(name, &block)
       if self.menus.send(:"#{name}").nil?

data/lib/action_admin/engine.rb

@@ -17,7 +17,7 @@ module ActionAdmin
 
     initializer 'action_admin', before: :load_config_initializers do
       Rails.application.routes.append do
-        mount ActionAdmin::Engine, at: 'admin'
+        mount ActionAdmin::Engine, at: 'admin', as: :admin
       end
     end
   end

data/lib/action_admin/version.rb

@@ -1,3 +1,3 @@
 module ActionAdmin
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - app/controllers/action_admin/devise/registrations_controller.rb
 - app/controllers/action_admin/devise/sessions_controller.rb
 - app/controllers/action_admin/devise/unlocks_controller.rb
+- app/controllers/action_admin/shortcodes_controller.rb
 - app/controllers/action_admin/welcome_controller.rb
 - app/controllers/concerns/action_admin/actionable.rb
 - app/controllers/concerns/action_admin/controller.rb
@@ -198,6 +199,7 @@ files:
 - app/helpers/action_admin/form_helper.rb
 - app/helpers/action_admin/markup_helper.rb
 - app/inputs/action_admin/attachment_input.rb
+- app/inputs/action_admin/attachments_input.rb
 - app/inputs/action_admin/select_list_input.rb
 - app/inputs/action_admin/seo_analysis_input.rb
 - app/inputs/action_admin/slug_input.rb
@@ -207,6 +209,7 @@ files:
 - app/inputs/action_admin/toggle_input.rb
 - app/inputs/action_admin/upload_input.rb
 - app/presenters/action_admin/presenter.rb
+- app/presenters/action_admin/shortcode_presenter.rb
 - app/presenters/concerns/action_admin/presentable.rb
 - app/views/action_admin/devise/confirmations/new.html.slim
 - app/views/action_admin/devise/passwords/edit.html.slim
@@ -216,6 +219,8 @@ files:
 - app/views/action_admin/devise/sessions/new.html.slim
 - app/views/action_admin/devise/shared/_links.html.slim
 - app/views/action_admin/devise/unlocks/new.html.slim
+- app/views/action_admin/shortcodes/form.html.slim
+- app/views/action_admin/shortcodes/preview.html.slim
 - app/views/action_admin/welcome/index.html.slim
 - app/views/admin/common/_alerts.html.slim
 - app/views/admin/common/_dropzone_template.html.slim
@@ -225,6 +230,7 @@ files:
 - app/views/admin/common/_media_modal.html.slim
 - app/views/admin/common/_messagebar.html.slim
 - app/views/admin/common/_noresults.html.slim
+- app/views/admin/common/_shortcode_modal.html.slim
 - app/views/admin/common/_sidebar.html.slim
 - app/views/admin/common/_topbar.html.slim
 - app/views/admin/common/action.html.slim
@@ -244,6 +250,7 @@ files:
 - app/views/admin/templates/_upload.html.slim
 - app/views/layouts/admin.html.slim
 - app/views/layouts/admin/devise.html.slim
+- app/views/layouts/shortcode.html.slim
 - config/initializers/admin_simple_form.rb
 - config/initializers/simple_attribute.rb
 - config/routes.rb