trestle 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0e145542ea21344ab56ce456f98a2eab365820c9cb65da1a2c64e57b7041e1
-  data.tar.gz: 9957f9704925389b5adf30d148dee1f41843fd450bd1d5442b40a296b6daf21f
+  metadata.gz: c79f7b5d12b485966fe7c165b5481e00f9e411e353a74818d91dc9d17c4dd6f2
+  data.tar.gz: 8502c2dee447e7ad01ccb3df23d3b17dc1e02db3e8f1de5049cbb3a245655a43
 SHA512:
-  metadata.gz: c43a3a0a73533519d3fcaac45788fb1bb41c1bf746d5d0b2c4516c172f90f73cf51a1cc88560f0e546e76b3b0d269550ee91e39a5176ec63ba9933fc1f33e6c5
-  data.tar.gz: c415ad3ce71f604c39af7dd052556b1b53da73b5c4214ae60802f7024edc38cb761548ee78373f780987a95c8fdb9b753fc7dbfff1b270c400515f6454151f9d
+  metadata.gz: 8c86b38910a39e0c8cc45625db9b34860074491b4f6b8033c7ac54d17706ca2efae535d9657efb6725b744adcb5c91b4854e84c6e58ff34a79f8648328dc36be
+  data.tar.gz: e597539d8dc3285a710da28be1b935d2c0c0ef2d555d193dd03d402f109929a93c63db9b3e5d518846e33a69ad4e52be712b5a7f3aefb9bc02d3cd2ae5303a0d

data/.travis.yml

@@ -8,6 +8,7 @@ before_install:
 
 rvm:
   - 2.6.5
+  - 2.7.1
 
 gemfile:
   - gemfiles/rails-5.0.gemfile

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'coveralls',   require: false
-  gem 'guard-rspec', require: false
+  gem 'coveralls_reborn', require: false
+  gem 'guard-rspec',      require: false
 
   gem 'capybara'
   gem 'capybara-selenium'

data/app/helpers/trestle/hook_helper.rb

@@ -1,31 +1,5 @@
 module Trestle
   module HookHelper
-    def hook(name, *args)
-      hooks = hooks(name)
-
-      if hooks.any?
-        safe_join(hooks.map { |hook|
-          hook.evaluate(self, *args)
-        }, "\n")
-      elsif block_given?
-        capture(*args, &Proc.new)
-      end
-    end
-
-    def hook?(name)
-      hooks(name).any?
-    end
-
-  protected
-    def hooks(name)
-      hook_sets.map { |set| set.for(name) }.inject(&:+).select { |h| h.visible?(self) }
-    end
-
-    def hook_sets
-      @_hook_sets ||= [
-        (admin.hooks if defined?(admin) && admin),
-        Trestle.config.hooks
-      ].compact
-    end
+    include Trestle::Hook::Helpers
   end
 end

data/app/helpers/trestle/table_helper.rb

@@ -47,5 +47,20 @@ module Trestle
 
       render "trestle/table/table", table: table, collection: collection
     end
+
+    # Renders the pagination controls for a collection.
+    #
+    # collection - The paginated Kaminari collection to render controls for (required).
+    # options    - Hash of options that will be passed to the Kaminari #paginate method (default: {}):
+    #
+    # Examples
+    #
+    #   <%= pagination collection: Account.page(params[:page]), remote: true %>
+    #
+    # Returns the HTML representation of the pagination controls as a HTML-safe String.
+    def pagination(collection:, entry_name: nil, **options)
+      collection = collection.call if collection.respond_to?(:call)
+      render "trestle/table/pagination", collection: collection, entry_name: entry_name, options: options
+    end
   end
 end

data/app/views/trestle/resource/index.html.erb

@@ -20,6 +20,6 @@
   <footer class="main-content-footer">
     <%= hook("resource.index.footer") %>
 
-    <%= render "trestle/table/pagination", collection: collection, entry_name: admin.model_name %>
+    <%= pagination collection: collection, entry_name: admin.model_name, remote: admin.pagination_options[:ajax] %>
   </footer>
 <% end %>

data/app/views/trestle/table/_pagination.html.erb

@@ -1,5 +1,5 @@
 <nav class="pagination-container">
   <p><%= page_entries_info(collection, entry_name: (entry_name if local_assigns.has_key?(:entry_name))) %>
 
-  <%= paginate(collection, theme: "trestle") %>
+  <%= paginate(collection, **{ theme: "trestle" }.reverse_merge(local_assigns.has_key?(:options) ? options : {})) %>
 </nav>

data/config/locales/vi.rb

@@ -0,0 +1,18 @@
+{
+  vi: {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "%d/%m/%Y" },
+        trestle_calendar: "%d/%m/%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "%d/%m/%Y" },
+        trestle_time: "%H:%M",
+        trestle_time_with_seconds: "%H:%M:%S"
+      }
+    }
+  }
+}

data/config/locales/vi.yml

@@ -0,0 +1,101 @@
+vi:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Version"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Không có %{entry_name} được tìm thấy"
+            one: "Hiển thị <strong>1</strong> %{entry_name}"
+            other: "Hiển thị <strong>tất cả %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Hiển thị %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> của <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Welcome to Trestle"
+      no_admins: "To begin, please create an admin within <code>app/admin</code>."
+      no_template: "To customize this template, please create <code>%{path}</code>."
+      no_form: "Please define a form block or create a <code>_form.html</code> partial."
+
+    ui:
+      toggle_navigation: "Toggle navigation"
+      toggle_sidebar: "Toggle sidebar"
+      toggle_dropdown: "Toggle dropdown"
+
+    dialog:
+      error: "Yêu cầu chưa hoàn thành."
+
+    confirmation:
+      title: "Bạn có chắc?"
+      delete: "Xoá"
+      cancel: "Huỷ"
+
+    file:
+      choose_file: "Chọn tập tin..."
+      browse: "Tải lên"
+
+  admin:
+    titles:
+      index: "Danh sách %{pluralized_model_name}"
+      new: "Tạo mới %{model_name}"
+      edit: Chỉnh sửa %{model_name}"
+
+    buttons:
+      new: "Tạo mới %{model_name}"
+      save: "Lưu %{model_name}"
+      delete: "Xoá %{model_name}"
+      show: "Xem %{model_name}"
+      edit: "Chỉnh sửa %{model_name}"
+      ok: "Đồng ý"
+
+    breadcrumbs:
+      home: "Trang Chủ"
+
+    flash:
+      create:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} được tạo mới thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Vui lòng chính xác các thông tin bên dưới!"
+
+      update:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} đã được cập nhật thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Vui lòng chính xác các thông tin bên dưới!."
+
+      destroy:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} đã được xoá thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Không thể xoá %{lowercase_model_name}."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Chọn %{attribute_name} -"
+
+    format:
+      blank: "Chưa có"
+
+    datepicker:
+      formats:
+        date: "m/d/Y"
+        datetime: "m/d/Y h:i K"
+        time: "h:i K"

data/frontend/css/components/_scopes.scss

@@ -19,6 +19,8 @@
   }
 
   a {
+    display: inline-block;
+
     background-color: $scope-bg;
 
     font-size: 0.8rem;

data/frontend/css/components/_table.scss

@@ -24,6 +24,10 @@
   .main-content-sidebar & {
     @include table-container-background($content-sidebar-bg);
   }
+
+  &.loading {
+    opacity: 0.5;
+  }
 }
 
 .trestle-table {

data/frontend/js/components/pagination.js

@@ -0,0 +1,51 @@
+/* global history */
+
+import $ from 'jquery'
+
+import { triggerInit } from '../core/events'
+
+const REMOTE_PAGINATION_SELECTOR = '.page-link[data-remote]'
+
+$(document)
+  .on('ajax:send', function (e) {
+    const $context = $(e.target).closest('[data-context]')
+    const $table = $context.find('.table-container')
+    $table.addClass('loading')
+  })
+
+  .on('ajax:complete', function (e) {
+    const $context = $(e.target).closest('[data-context]')
+    const $table = $context.find('.table-container')
+    $table.removeClass('loading')
+  })
+
+  .on('ajax:success', REMOTE_PAGINATION_SELECTOR, function (e) {
+    const $link = $(e.target)
+    const $context = $link.closest('[data-context]')
+
+    // Update table and pagination
+    const $doc = $(e.detail[0])
+
+    const $table = $doc.find('.table-container')
+    $context.find('.table-container').replaceWith($table)
+
+    triggerInit($table)
+
+    const $pagination = $doc.find('.pagination-container')
+    $context.find('.pagination-container').replaceWith($pagination)
+
+    // Update the URL in the browser and context
+    const location = $link.attr('href')
+
+    if (location) {
+      // TODO: Implement URL updating with back button support
+      // if ($context.hasClass('app-main')) {
+      //   history.pushState({}, '', location)
+      // }
+
+      $context.data('context', location)
+    }
+
+    // Scroll to top of table
+    $table[0].scrollIntoView(true)
+  })