feat: category 套用

Author: marsz

app/helpers/admin_helper.rb

@@ -106,13 +106,14 @@ def render_admin_pagination(collection)
     render partial: 'admin/base/pagination', as: :collection, object: collection
   end
 
-  def render_admin_data_table(data: nil, bordered: true, striped: true, hover: true, &block)
+  def render_admin_data_table(data: nil, total: nil, bordered: true, striped: true, hover: true, &block)
     locals = {
       body: capture(&block),
       data: data,
       bordered: bordered,
       striped: striped,
-      hover: hover
+      hover: hover,
+      total: total
     }
     render partial: 'admin/base/data_table', locals: locals
   end

app/views/admin/base/_pagination.html.slim

@@ -1,7 +1,7 @@
 .row
   .col-sm-4
     .dataTables_info
-      = "Total: #{collection.total_count}"
+      = "Total: #{collection.try(:total_count) || collection.size}"
   .col-sm-8.pull-right
     .dataTables_paginate.paging_simple_numbers
-      = paginate collection, theme: :admin
+      = paginate collection, theme: :admin if collection.respond_to?(:total_count)

app/views/admin/categories/_btns.html.slim

@@ -1,4 +1,4 @@
-= link_to "Show", admin_category_path(category), class: "btn btn-large"
-= link_to "Revisions", revisions_admin_category_path(category), class: "btn btn-large"
-= link_to "Edit", edit_admin_category_path(category, redirect_to: url_for(request.params)), class: "btn btn-large btn-success"
-= link_to "Delete", admin_category_path(category, redirect_to: ENV['HTTP_REFERER'] || admin_categories_path), class: "btn btn-large btn-danger", method: :delete, "data-confirm" => "Delete?"
+- append_page_button 'Show', admin_category_path(category)
+- append_page_button 'Revisions', revisions_admin_category_path(category)
+- append_page_button 'Edit', edit_admin_category_path(category, redirect_to: url_for(request.params)), class: 'btn-success'
+- append_page_button 'Delete', admin_category_path(category, redirect_to: ENV['HTTP_REFERER'] || admin_categories_path), class: 'btn-danger', method: :delete, 'data-confirm' => 'Delete?'

app/views/admin/categories/_filtering.html.slim

@@ -1,8 +1,8 @@
-= search_form_for @q, :builder => SimpleForm::FormBuilder, html: { class: "form-horizontal" }, wrapper: :admin, defaults: { required: false } do |f|
-  = f.input :name_cont, label: "name contains"
-  = f.input :delete_state, label: "delete state", as: :select, collection: collection_for_delete_state, include_blank: "Without deleted"
-  = f.input :tagged, label: "tagged with", as: :select, collection: collection_for_tags, input_html: { "data-select" => true, multiple: true }
+= admin_search_form_for @q, nil do |f|
+  = f.input :name_cont, label: 'name contains'
+  = f.input :delete_state, label: 'delete state', as: :select, collection: collection_for_delete_state, include_blank: 'Without deleted'
+  = f.input :tagged, label: 'tagged with', as: :select, collection: collection_for_tags, input_html: { 'data-select' => true, multiple: true }
   - if Rails.env.development?
-    = f.input :created_at_eq, as: :string, input_html: { name: "", value: @q.result.to_sql }, label: "debug sql"
+    = f.input :created_at_eq, as: :string, input_html: { name: '', value: @q.result.to_sql }, label: 'debug sql'
   .form-actions
-    = f.submit "Search", class: "btn btn-primary"
+    = f.submit_cancel 'Search'

app/views/admin/categories/_form.html.slim

@@ -1,4 +1,3 @@
 = f.input :name
-= f.input :tag_list, label: "Tags", as: :string, input_html: { "data-select" => "tags", "data-tags" => collection_for_tags.to_json }
-.form-actions
-  = f.submit class: "btn btn-primary"
+= f.input :tag_list, label: 'Tags', as: :string, input_html: { 'data-select' => 'tags', 'data-tags' => collection_for_tags.to_json }
+= f.submit_cancel cancel: admin_categories_path

app/views/admin/categories/edit.html.slim

@@ -1,6 +1,5 @@
-- content_for :btns do
-  = render partial: "btns", object: @category, as: :category
+= render partial: 'btns', object: @category, as: :category
 
-= admin_widget_box "Edit Category" do
-  = simple_form_for @category, as: :category, wrapper: :admin do |f|
-    = render partial: "form", object: f, as: :f
+= admin_widget_box 'Edit Category' do
+  = admin_form_for @category, as: :category do |f|
+    = render partial: 'form', object: f, as: :f

app/views/admin/categories/index.html.slim

@@ -1,35 +1,32 @@
-= admin_widget_box "Filtering" do
-  = render partial: "filtering", as: :q, object: @q
-= admin_widget_box "Categories" do
-  .dataTables_wrapper
-    div
-      .dataTables_length
-        = link_to "New Category", new_admin_category_path, class: "btn btn-primary btn-mini"
-    table.table.table-bordered.table-striped.table-hover
-      thead
+- append_page_button 'New Category', new_admin_category_path, class: 'btn-primary'
+
+= admin_widget_box 'Filtering' do
+  = render partial: 'filtering', as: :q, object: @q
+
+= admin_widget_box 'Categories' do
+  = render_admin_data_table(data: @categories) do
+    thead
+      tr
+        th= '#'
+        th= 'Name'
+        th= 'Sort'
+        th= 'Sorting'
+        th= 'actions'
+    tbody
+      - @categories.each do |category|
         tr
-          th= "#"
-          th= "Name"
-          th= "Sort"
-          th= "Sorting"
-          th= "actions"
-      tbody
-        - @categories.each do |category|
-          tr
-            td= category.id
-            td= category.name
-            td= category.sort
-            td
-              - unless category.deleted?
-                = render_admin_sorting_buttons(category)
-            td
-              - if category.deleted?
-                = link_to "restore", restore_admin_category_path(category), class: "btn btn-mini btn-danger", method: :post, "data-confirm" => "Restore?"
-              - else
-                = link_to "show", admin_category_path(category), class: "btn btn-mini"
-                |  
-                = link_to "edit", edit_admin_category_path(category), class: "btn btn-mini btn-success"
-                |  
-                = link_to "delete", admin_category_path(category), class: "btn btn-mini btn-danger", method: :delete, "data-confirm" => "Delete?"
-    .ui-toolbar.ui-widget-header
-      = paginate @categories, theme: :admin
+          td= category.id
+          td= category.name
+          td= category.sort
+          td
+            - unless category.deleted?
+              = render_admin_sorting_buttons(category)
+          td
+            - if category.deleted?
+              = link_to 'restore', restore_admin_category_path(category), method: :post, 'data-confirm' => 'Restore?'
+            - else
+              = link_to 'show', admin_category_path(category)
+              |   |  
+              = link_to 'edit', edit_admin_category_path(category)
+              |   |  
+              = link_to 'delete', admin_category_path(category), method: :delete, 'data-confirm' => 'Delete?'

app/views/admin/categories/new.html.slim

@@ -1,3 +1,3 @@
-= admin_widget_box "New Category" do
-  = simple_form_for @category, as: :category, wrapper: :admin do |f|
-    = render partial: "form", object: f, as: :f
+= admin_widget_box 'New Category' do
+  = admin_form_for @category, as: :category do |f|
+    = render partial: 'form', object: f, as: :f

app/views/admin/categories/revisions.html.slim

@@ -1,23 +1,19 @@
-- content_for :btns do
-  = render partial: "btns", object: @category, as: :category
+= render partial: 'btns', object: @category, as: :category
 
-= admin_widget_box "Revisions ( total results: #{@versions.size} )" do
-  .dataTables_wrapper
-    div
-      .dataTables_length
-    table.table.table-bordered.table-striped.table-hover
-      thead
+= admin_widget_box "Revisions (Total versions: #{@versions.size} )" do
+  = render_admin_data_table(data: @versions) do
+    thead
+      tr
+        th= 'Event'
+        th= 'When'
+        th= 'Who'
+        th= 'What'
+    tbody
+      - @versions.reverse.each do |version|
         tr
-          th= "Event"
-          th= "When"
-          th= "Who"
-          th= "What"
-      tbody
-        - @versions.reverse.each do |version|
-          tr
-            td= version.event
-            td= version.created_at
-            td= User.find(version.whodunnit).name rescue version.whodunnit
-            td
-              - convert_changes_string(version.object_changes).each do |column, diffs|
-                .diff= "#{column}: #{diffs[0].nil? ? "NULL" : diffs[0]} -> #{diffs[1].nil? ? "NULL" : diffs[1]}"
+          td= version.event
+          td= version.created_at
+          td= User&.find_by(id: version.whodunnit)&.name
+          td
+            - convert_changes_string(version.object_changes).each do |column, diffs|
+              .diff= "#{column}: #{diffs[0].nil? ? "NULL" : diffs[0]} -> #{diffs[1].nil? ? "NULL" : diffs[1]}"

app/views/admin/categories/show.html.slim

@@ -1,20 +1,18 @@
-- content_for :btns do
-  = render partial: "btns", object: @category, as: :category
+= render partial: 'btns', object: @category, as: :category
 = admin_widget_box "Category ##{@category.id}" do
-  table.table.table-bordered.table-striped.table-hover
-    tbody
-      tr
-        td= "ID"
-        td= @category.id
-      tr
-        td= "Name"
-        td= @category.name
-      tr
-        td= "Sort"
-        td= @category.sort
-      tr
-        td= "created at"
-        td= @category.created_at
-      tr
-        td= "updated at"
-        td= @category.updated_at
+  = render_admin_data_table(bordered: false) do
+    tr
+      th ID
+      td= @category.id
+    tr
+      th Name
+      td= @category.name
+    tr
+      th Sort
+      td= @category.sort
+    tr
+      th Created at
+      td= @category.created_at
+    tr
+      th Updated at
+      td= @category.updated_at

app/views/admin/users/_filtering.html.slim

@@ -1,7 +1,7 @@
 = admin_search_form_for @q, nil do |f|
-  = f.input :has_avatar, as: :switch, label: "has avatar"
-  = f.input :name_cont, label: "name contains"
-  = f.input :email_cont, label: "email contains"
+  = f.input :has_avatar, as: :switch, label: 'has avatar'
+  = f.input :name_cont, label: 'name contains'
+  = f.input :email_cont, label: 'email contains'
   - if Rails.env.development?
-    = f.input :created_at_eq, as: :string, input_html: { name: "", value: @q.result.to_sql }, label: "debug sql"
+    = f.input :created_at_eq, as: :string, input_html: { name: '', value: @q.result.to_sql }, label: 'debug sql'
   = f.submit_cancel 'Search'

app/views/admin/users/index.html.slim

@@ -1,26 +1,26 @@
 - append_page_button('Export', url_for(request.params.merge(format: :csv)))
 - append_page_button('New User', new_admin_user_path)
 
-= admin_widget_box "Filtering" do
-  = render partial: "filtering", as: :q, object: @q
+= admin_widget_box 'Filtering' do
+  = render partial: 'filtering', as: :q, object: @q
 
-= admin_widget_box "Users" do
+= admin_widget_box 'Users' do
   = render_admin_data_table(data: @users) do
     thead
       tr
-        th= "#"
-        th= "Name"
-        th= "Email"
-        th= "Confirmed"
-        th= "actions"
+        th= '#'
+        th= 'Name'
+        th= 'Email'
+        th= 'Confirmed'
+        th= 'actions'
     tbody
       - @users.each do |user|
         tr class="pointer #{cycle('odd', 'even')}"
           td= user.id
           td= user.name
           td= user.email
           td
-            = "Y" if user.try(:confirmed?)
+            = 'Y' if user.try(:confirmed?)
           td
             = link_to 'Show', admin_user_path(user)
             |   |  

app/views/admin/users/new.html.slim

@@ -1,3 +1,3 @@
-= admin_widget_box "New User" do
-  = admin_form_for @user, as: :user, wrapper: :admin do |f|
-    = render partial: "form", object: f, as: :f
+= admin_widget_box 'New User' do
+  = admin_form_for @user, as: :user do |f|
+    = render partial: 'form', object: f, as: :f