action_admin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c1c4bce91ccdc0e91b160a64bb2d33c4813b5a
-  data.tar.gz: b4a4abebea3d0b3db713543c4a80600849ffb163
+  metadata.gz: cfa12b281f6b7400703f1de253f6748bb55dd2d5
+  data.tar.gz: c334bd62b1f4c7ff4b2176542d17f77b606a6f4c
 SHA512:
-  metadata.gz: a3d44fb6749ae4bc557f5d04d906427c5295073466633c6d8317bc67818d67d383943a57d66e4e4f7bd3e11a9340f3210a26bd4944538dad971cd7bbea73a55c
-  data.tar.gz: 1ab6296221e9377178c6fbf56f18cece1af8a5c9dc908140b75e83cf06bdd50537ec1a838e36b9fb8d640b3db3b951125ef4e9fb2ebd79ec7ad5da7d2256b1d4
+  metadata.gz: 1cf489226899b73d86acde8e54469a7b5a980555a7b138f44162a665bec5b4a988958ad8885157b7fe91054f6f1c44fad3915718fd78607f4134638e26179700
+  data.tar.gz: 2febc76021ba622ac7b9818694f30825999257fd9a3c649a224bad0c1105a42d2bbfafe7266d9ced7acbd13e37e6f239be0f306a7f696686261574bee2855b4c

data/app/controllers/concerns/action_admin/controller.rb

@@ -9,12 +9,20 @@ module ActionAdmin
       # Use forgery protection
       protect_from_forgery with: :exception
 
+      # Set locale
+      before_action :set_admin_locale
+
       # Render default view
       rescue_from ActionController::UnknownFormat, with: :render_default_view
     end
 
     private
 
+      # Set admin default locale
+      def set_admin_locale
+        I18n.locale = ActionAdmin.config.admin_locale || I18n.default_locale
+      end
+
       # Render default view template
       def render_default_view
         respond_to do |format|

data/app/helpers/action_admin/admin_helper.rb

@@ -46,5 +46,20 @@ module ActionAdmin
 
       render partial, options
     end
+
+    def admin_search?
+      params[:search].present?
+    end
+
+    def merge_params(original, keys, candidates)
+      original = Hash(original)
+      selected = candidates.select { |k, _v| Array(keys).include? :"#{k}" }
+
+      original.merge(selected)
+    end
+
+    def admin_search_url
+      url_for merge_params({}, [:per_page, :filter, :sort], params.permit(:per_page, filter: {}, sort: {}).to_h)
+    end
   end
 end

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

@@ -9,39 +9,39 @@ ruby:
     thumbnail_width:    "300"
   }
 
-#media-modal.reveal.full.reveal-panel 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-media-url=admin_media_url(per_page: 10000, format: :json)
   .panel
     .panel-header.border
       = 'Add Media'
       button.close-button aria-label='Close modal' data-close="" type="button"
         span aria-hidden="true" ×
 
-    .panel-header.border.padding-0
-      ul#media-modal-tabs.tabs.padding-0.border-none data-tabs=""
-        li.tabs-title.is-active
-          a aria-selected="true" href="#media-modal-library"
-            i.mdi.mdi-play-circle-outline
-            | Library
-        li.tabs-title
-          a href="#media-modal-uploads"
-            i.mdi.mdi-upload
-            | Upload
-
     .panel-content.border.padding-0
-      .tabs-content.border-none.padding-0 data-tabs-content="media-modal-tabs"
-        #media-modal-library.tabs-panel.is-active
-          .attachments-grid data-list-select=""
-        #media-modal-uploads.tabs-panel
-          = admin_form_for([:admin, current_record], html: { id: 'media-modal-upload', class: 'dropzone', data: options }) do |f|
-            = f.input :file, as: :hidden
-
-            .dz-message.bordered.margin-bottom-1
-              .no-content
-                i.mdi.mdi-upload
-                span = 'Drop files here to upload'
-                a#media-modal-upload-button.button.success.hollow.margin-top-1 = 'Select Files'
-
-            #media-modal-upload-previews.attachments-grid
+      .media-columns
+        .media-menu
+          ul#media-modal-tabs.tabs.menu.vertical.icons.icon-left data-tabs=""
+            li.tabs-title.is-active
+              a aria-selected="true" href="#media-modal-library"
+                = admin_icon 'play-circle-outline', text: 'Library'
+            li.tabs-title
+              a href="#media-modal-uploads"
+                = admin_icon 'upload', text: 'Upload'
+
+        .media-content
+          .tabs-content.border-none.padding-0 data-tabs-content="media-modal-tabs"
+            #media-modal-library.tabs-panel.is-active
+              .attachments-grid data-list-select=""
+            #media-modal-uploads.tabs-panel
+              = admin_form_for([:admin, current_record], html: { id: 'media-modal-upload', class: 'dropzone', data: options }) do |f|
+                = f.input :file, as: :hidden
+
+                .dz-message.bordered.margin-bottom-1
+                  .no-content
+                    i.mdi.mdi-upload
+                    span = 'Drop files here to upload'
+                    a#media-modal-upload-button.button.success.hollow.margin-top-1 = 'Select Files'
+
+                #media-modal-upload-previews.attachments-grid
 
     .panel-footer
       .grid-x

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

@@ -1 +1 @@
-.callout.warning = 'No results found'
+.callout.warning.margin-0 = 'No results found'

data/app/views/admin/records/index.html.slim

@@ -1,24 +1,13 @@
-- if current_records.empty?
-  = render 'admin/common/noresults'
-
-- else
-  .panel
-    .panel-header
-      = action_name.titleize
-
-    .panel-content.padding-0.border-none
-      table.unstriped.margin-0
-        thead
-          tr
-            = admin_present(current_model).render_table_header(:index)
-            th.shrink.actions.text-right = 'Actions'
-
-        tbody
-          - admin_present_many(current_records).each do |record|
-            tr
-              = record.render_table_columns(:index)
-              = record.action_links(:td, class: 'shrink actions')
-
-    - if current_records.respond_to? :current_page
-      .panel-footer
-        = admin_table_pagination current_records
+.panel
+  .panel-header
+    = render 'admin/records/table/header'
+
+  .panel-content.padding-0.border-none
+    - if current_records.empty?
+      = render 'admin/common/noresults'
+    - else
+      = render 'admin/records/table/body'
+
+  - if current_records.respond_to? :current_page
+    .panel-footer
+      = render 'admin/records/table/footer'

data/app/views/admin/records/table/_body.html.slim

@@ -0,0 +1,11 @@
+table.unstriped.margin-0
+  thead
+    tr
+      = admin_present(current_model).render_table_header(:index)
+      th.shrink.actions.text-right = 'Actions'
+
+  tbody
+    - admin_present_many(current_records).each do |record|
+      tr
+        = record.render_table_columns(:index)
+        = record.action_links(:td, class: 'shrink actions')

data/app/views/admin/records/table/_footer.html.slim

@@ -0,0 +1 @@
+= admin_table_pagination current_records

data/app/views/admin/records/table/_header.html.slim

@@ -0,0 +1,16 @@
+.grid-x
+  .cell.shrink
+    form action=request.path method="get"
+      .input-group.margin-0
+        input.input-group-field.small type="text" name="per_page" size="2" value=@pagination_params[:per_page]
+        .input-group-button
+          button.button.default.small type="submit" = 'Per Page'
+  .cell.auto.text-right
+    = form_for :search, method: :get, url: admin_search_url, html: { class: 'search-form display-inline-block' } do |f|
+      - if params[:per_page]
+        input type="hidden" name="per_page" value=params[:per_page]
+
+      .input-group.margin-0
+        = f.text_field :s, class: 'input-group-field small', placeholder: 'Search...', name: :search, value: params[:search]
+        .input-group-button
+          button.button.default.small type="submit" = admin_icon 'magnify'

data/config/initializers/simple_attribute.rb

@@ -1,6 +1,6 @@
 SimpleAttribute.setup do |config|
   config.avatar   = { html: { class: 'rounded bordered' } }
-  config.image    = { html: { class: 'thumbnail' }, default_value: 'upload-preview.svg' }
+  config.image    = { html: { class: 'thumbnail' }, default_value: 'admin/upload-preview.svg' }
   config.boolean  = { true: 'success', false: 'alert', wrapper: { class: 'label' } }
   config.wrappers = { badge: { class: 'badge' } }
 

data/lib/action_admin/config.rb

@@ -1,8 +1,9 @@
 module ActionAdmin
   class Config < Hashie::Dash
-    property :app_name, default: 'Action Admin'
-    property :app_urls, default: :web_url
-    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
 
     def menu(name, &block)
       if self.menus.send(:"#{name}").nil?

data/lib/action_admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,9 @@ files:
 - app/views/admin/records/index.html.slim
 - app/views/admin/records/new.html.slim
 - app/views/admin/records/show.html.slim
+- app/views/admin/records/table/_body.html.slim
+- app/views/admin/records/table/_footer.html.slim
+- app/views/admin/records/table/_header.html.slim
 - app/views/admin/templates/_settings.html.slim
 - app/views/admin/templates/_upload.html.slim
 - app/views/layouts/admin.html.slim