trestle 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1640cda170a3f473968769e1c0380de2689ac11ecdd88c0b19bf93796701680
-  data.tar.gz: c3c78457d933155de6eba4bac6500a906e4fb78dce4232a68040ddeb2dfd919e
+  metadata.gz: be67cdeb0e544dff3707615b388ab9380f23cc4f10b8ac026f77681a2b89a58d
+  data.tar.gz: e560c637fb2418ec119bbdb895dab33fef47af0647f5c479e53ae0bc7ca71307
 SHA512:
-  metadata.gz: d597693a4f29721adb0a3b8e0b6d15679bef552b6d050b390940fcf53a28922f99cca9c993d1f9458d284786f5f4e29fbce2bef6bcc7891be639b53e7502ea83
-  data.tar.gz: ba5bd00f7a509ea1a349e57d52dd46e15f86c78d95fd0cabc755a82c5079155fcc9db8b405523378977119f274d171ff9e3ca0d5c128631a39f6a2fb72577afa
+  metadata.gz: ced0081c87529f11111908d9688ccc17c8aa1816d723160980a52892ae1236628c4aa425324f051faa82029add5a042ef211e9a6e9327d3479590e68b0f25dbf
+  data.tar.gz: 6129c4dd280c17b4b395b58e3221728e8917a50fdecd1960eedc3ae9ccc1a6dadec63976de3780ef8f10e24022a007f9c523778740b985920e4626fc540aa472

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 
 before_install:
+  - gem update --system
   - gem install bundler
 
 rvm:
-  - 2.4.1
+  - 2.6.1
 
 gemfile:
   - gemfiles/rails-4.2.gemfile
@@ -15,3 +16,12 @@ gemfile:
 
 addons:
   chrome: stable
+
+matrix:
+  exclude:
+    gemfile: gemfiles/rails-4.2.gemfile
+
+  include:
+    gemfile: gemfiles/rails-4.2.gemfile
+    before_install:
+      - gem install bundler -v '< 2'

data/README.md

@@ -9,6 +9,8 @@
 [![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle.svg?style=flat)](https://coveralls.io/github/TrestleAdmin/trestle)
 [![Code Climate](https://api.codeclimate.com/v1/badges/c529a7a9c500ed81baed/maintainability)](https://codeclimate.com/github/TrestleAdmin/trestle)
 
+[Demo Site](https://demo.trestle.io) | [Demo Source Code](https://github.com/TrestleAdmin/RailsFlixDemo)
+
 > A modern, responsive admin framework for Ruby on Rails
 
 <img src="https://trestle.io/images/Trestle-Screenshot-1-1x.png?" width="50%" /><img src="https://trestle.io/images/Trestle-Screenshot-2-1x.png?" width="50%" />
@@ -45,9 +47,11 @@ Trestle.resource(:posts) do
   end
 
   # Define custom scopes for the index view
-  scope :all, default: true
-  scope :published
-  scope :drafts, -> { Post.unpublished }
+  scopes do
+    scope :all, default: true
+    scope :published
+    scope :drafts, -> { Post.unpublished }
+  end
 
   # Define the index view table listing
   table do
@@ -98,6 +102,7 @@ The following plugins are currently available:
 | *trestle-tinymce* | [TinyMCE](https://www.tinymce.com/) (WYSIWYG editor) integration | [GitHub](https://github.com/TrestleAdmin/trestle-tinymce) \| [RubyGems](https://rubygems.org/gems/trestle-tinymce) |
 | *trestle-simplemde* | [SimpleMDE](https://simplemde.com/) (Markdown editor) integration | [GitHub](https://github.com/TrestleAdmin/trestle-simplemde) \| [RubyGems](https://rubygems.org/gems/trestle-simplemde) |
 | *trestle-sidekiq* | [Sidekiq](http://sidekiq.org/) integration | [GitHub](https://github.com/TrestleAdmin/trestle-sidekiq) \| [RubyGems](https://rubygems.org/gems/trestle-sidekiq) |
+| *trestle-active_storage* | [Active Storage](https://guides.rubyonrails.org/active_storage_overview.html) integration | [GitHub](https://github.com/richardvenneman/trestle-active_storage) \| [RubyGems](https://rubygems.org/gems/trestle-active_storage) |
 
 
 ## License

data/app/assets/javascripts/trestle/components/_confirmation.js

@@ -1,30 +1,30 @@
 Trestle.confirmation = {};
 
-Trestle.confirmation.DEFAULTS = {
-  rootSelector:   'body',
-  singleton:      true,
-  popout:         true,
-  title:          Trestle.i18n['admin.confirmation.title'] || 'Are you sure?',
-  btnOkIcon:      '',
-  btnOkClass:     'btn-primary',
-  btnOkLabel:     Trestle.i18n['admin.confirmation.ok'] || 'OK',
-  btnCancelIcon:  '',
-  btnCancelClass: 'btn-default',
-  btnCancelLabel: Trestle.i18n['admin.confirmation.cancel'] || 'Cancel',
-  copyAttributes: ''
-};
+Trestle.ready(function() {
+  Trestle.confirmation.DEFAULTS = {
+    rootSelector:   'body',
+    singleton:      true,
+    popout:         true,
+    title:          Trestle.i18n['trestle.confirmation.title'] || 'Are you sure?',
+    btnOkIcon:      '',
+    btnOkClass:     'btn-primary',
+    btnOkLabel:     Trestle.i18n['trestle.confirmation.ok'] || 'OK',
+    btnCancelIcon:  '',
+    btnCancelClass: 'btn-default',
+    btnCancelLabel: Trestle.i18n['trestle.confirmation.cancel'] || 'Cancel',
+    copyAttributes: ''
+  };
 
-Trestle.confirmation.CONFIRM = $.extend({}, Trestle.confirmation.DEFAULTS, {
-  selector: '[data-toggle="confirm"]'
-});
+  Trestle.confirmation.CONFIRM = $.extend({}, Trestle.confirmation.DEFAULTS, {
+    selector: '[data-toggle="confirm"]'
+  });
 
-Trestle.confirmation.DELETE = $.extend({}, Trestle.confirmation.DEFAULTS, {
-  selector:   '[data-toggle="confirm-delete"]',
-  btnOkClass: 'btn-danger',
-  btnOkLabel: Trestle.i18n['admin.confirmation.delete'] || 'Delete'
-});
+  Trestle.confirmation.DELETE = $.extend({}, Trestle.confirmation.DEFAULTS, {
+    selector:   '[data-toggle="confirm-delete"]',
+    btnOkClass: 'btn-danger',
+    btnOkLabel: Trestle.i18n['trestle.confirmation.delete'] || 'Delete'
+  });
 
-Trestle.ready(function() {
   // This must be bound to an element beneath document so
   // that it is fired before any jquery_ujs events.
   var root = $('body');

data/app/assets/stylesheets/trestle/components/_dropdown.scss

@@ -40,4 +40,32 @@
       right: 11px;
     }
   }
+
+  .dropup & {
+    margin-top: 0;
+    margin-bottom: 8px;
+
+    &:before {
+      top: auto;
+      bottom: -$dropdown-arrow-outer-width;
+
+      border-bottom: 0;
+      border-top: $dropdown-arrow-width solid $dropdown-fallback-border;
+      border-top-color: $dropdown-border;
+    }
+
+    &:after {
+      top: auto;
+      bottom: -$dropdown-arrow-width;
+
+      border-bottom: 0;
+      border-top: $dropdown-arrow-outer-width solid white;
+    }
+  }
 }
+
+.dropdown-header {
+  text-transform: uppercase;
+  font-size: 10px;
+  font-weight: bold;
+}

data/app/assets/stylesheets/trestle/components/_fields.scss

@@ -20,6 +20,11 @@
   // within Bootstrap tabs that are hidden when the page is first loaded.
   // See: https://github.com/select2/select2/issues/4220
   width: 100% !important;
+
+  .select2-results__group {
+    font-size: 10px;
+    text-transform: uppercase;
+  }
 }
 
 .date-select,

data/app/assets/stylesheets/trestle/core/_defaults.scss

@@ -84,6 +84,8 @@ $popover-arrow-width:        7px !default;
 $dropdown-arrow-width:       $popover-arrow-width !default;
 $dropdown-arrow-outer-width: $dropdown-arrow-width + 1px !default;
 
+$dropdown-header-color: #aaa !default;
+
 $input-border:       #ccc !default;
 $input-border-focus: mix($brand-primary, $input-border) !default;
 $input-bg-disabled:  #fafafa !default;

data/app/controllers/trestle/dashboard_controller.rb

@@ -6,7 +6,7 @@ class Trestle::DashboardController < Trestle::ApplicationController
 
 private
   def primary_admin
-    if navigation = Trestle.navigation.first
+    if navigation = Trestle.navigation(self).first
       navigation.admin
     elsif Trestle.admins.values.any?
       Trestle.admins.values.first

data/app/helpers/trestle/i18n_helper.rb

@@ -10,5 +10,11 @@ module Trestle
         [locale]
       end
     end
+
+    def default_translation(key)
+      translate(key, locale: :en)
+    rescue I18n::InvalidLocale
+      key.split(".").last.humanize
+    end
   end
 end

data/app/helpers/trestle/panel_helper.rb

@@ -3,7 +3,7 @@ module Trestle
     def panel(options={}, &block)
       html_class = options.fetch(:class) { "panel-default" }
 
-      content_tag(:div, class: ["panel", html_class]) do
+      content_tag(:div, options.slice(:id, :data).merge(class: ["panel", html_class])) do
         if options[:title]
           concat content_tag(:div, options[:title], class: "panel-heading")
         end

data/app/helpers/trestle/toolbars_helper.rb

@@ -1,7 +1,8 @@
 module Trestle
   module ToolbarsHelper
-    def toolbar(name, &block)
+    def toolbar(name, options={}, &block)
       toolbar = (toolbars[name.to_s] ||= Toolbar.new)
+      toolbar.clear! if options[:clear]
       toolbar.prepend(&block) if block_given?
       toolbar
     end

data/app/views/layouts/trestle/admin.html.erb

@@ -14,6 +14,8 @@
 
     <title><%= [yield(:title), Trestle.config.site_title].join(' :: ') %></title>
 
+    <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %>
+
     <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
 
     <%= hook :stylesheets %>
@@ -21,13 +23,13 @@
     <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks %>
     <%= javascript_include_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
 
-    <script type="text/javascript">
+    <%= javascript_tag nonce: true do %>
       <% Trestle.config.javascript_i18n_keys.each do |key| %>
-      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
+      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: default_translation(key))) %>";
       <% end %>
 
       Trestle.localize(<%= i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
-    </script>
+    <% end %>
 
     <%= hook :javascripts %>
 

data/app/views/trestle/application/_dialog.html.erb

@@ -22,12 +22,12 @@
 </div>
 
 <div class="modal-footer">
-  <div class="btn-toolbar secondary-toolbar">
+  <div class="btn-toolbar secondary-toolbar" role="toolbar">
     <%= render_toolbar(toolbar(:secondary)) %>
     <%= deprecated_toolbar(:secondary) %>
   </div>
 
-  <div class="btn-toolbar primary-toolbar">
+  <div class="btn-toolbar primary-toolbar" role="toolbar">
     <%= render_toolbar(toolbar(:primary)) %>
     <%= deprecated_toolbar(:primary) %>
   </div>

data/app/views/trestle/application/_header.html.erb

@@ -16,12 +16,12 @@
   </div>
 
   <div class="content-header-toolbars">
-    <div class="btn-toolbar primary-toolbar">
+    <div class="btn-toolbar primary-toolbar" role="toolbar">
       <%= render_toolbar(toolbar(:primary)) %>
       <%= deprecated_toolbar(:primary) %>
     </div>
 
-    <div class="btn-toolbar secondary-toolbar">
+    <div class="btn-toolbar secondary-toolbar" role="toolbar">
       <%= render_toolbar(toolbar(:secondary)) %>
       <%= deprecated_toolbar(:secondary) %>
     </div>

data/app/views/trestle/shared/_sidebar.html.erb

@@ -15,7 +15,7 @@
   <div class="app-sidebar-inner">
     <nav class="app-nav">
       <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
-      <% Trestle.navigation.visible(self).each do |group, items| %>
+      <% Trestle.navigation(self).each do |group, items| %>
         <ul<% if group.present? && collapsed.include?(group.id) %> class="collapsed"<% end %>>
           <% if group.present? %>
             <li class="nav-header"><%= link_to group.label, "##{group.id}" %></li>

data/config/locales/en.yml

@@ -24,6 +24,7 @@ en:
     ui:
       toggle_navigation: "Toggle navigation"
       toggle_sidebar: "Toggle sidebar"
+      toggle_dropdown: "Toggle dropdown"
 
     dialog:
       error: "The request could not be completed."

data/config/locales/ko.rb

@@ -0,0 +1,18 @@
+{
+  ko: {
+    date: {
+      formats: {
+        trestle_date: "%Y년 %m월 %d일",
+        trestle_calendar: "%Y년 %m월 %d일",
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: "%Y년 %m월 %d일",
+        trestle_time: "%H:%M",
+        trestle_time_with_seconds: "%H:%M:%S"
+      }
+    }
+  }
+}

data/config/locales/ko.yml

@@ -0,0 +1,96 @@
+ko:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "버전"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "%{entry_name}을(를) 찾을 수 없습니다."
+            one: "<strong>1</strong> %{entry_name} 표시중"
+            other: "<strong>모든 %{count}</strong> %{entry_name} 표시중"
+
+        more_pages:
+          display_entries: "<b>%{total}</b> 중 <strong>%{first}&nbsp;-&nbsp;%{last}</strong> %{entry_name} 표시중"
+
+    onboarding:
+      welcome: "Trestle에 오신 것을 환영합니다."
+      no_admins: "사용하시려면 <code>app/admin</code>에 admin을 생성하십시오."
+      no_template: "이 템플릿을 사용자화 하시려면, <code>%{path}</code>를 생성하십시오."
+      no_form: "form block을 정의하시거나 <code>_form.html</code> partial를 생성하십시오."
+
+    ui:
+      toggle_navigation: "네비게이션 토글"
+      toggle_sidebar: "사이드바 토글"
+
+    dialog:
+      error: "완료될 수 없는 요청입니다."
+
+    confirmation:
+      title: "정말 하시겠습니까?"
+      delete: "삭제"
+      cancel: "취소"
+
+  admin:
+    titles:
+      index: "%{pluralized_model_name} 목록"
+      new: "%{model_name} 생성"
+      edit: "%{model_name} 수정"
+
+    buttons:
+      new: "%{model_name} 생성"
+      save: "%{model_name} 저장"
+      delete: "%{model_name} 삭제"
+      show: "%{model_name} 보기"
+      edit: "%{model_name} 수정"
+      ok: "확인"
+
+    breadcrumbs:
+      home: "Home"
+
+    flash:
+      create:
+        success:
+          title: "성공!"
+          message: "%{lowercase_model_name} 성공적으로 생성되었습니다."
+
+        failure:
+          title: "경고!"
+          message: "하기된 에러를 확인하십시오."
+
+      update:
+        success:
+          title: "성공!"
+          message: "%{lowercase_model_name} 성공적으로 수정되었습니다."
+
+        failure:
+          title: "경고!"
+          message: "하기된 에러를 확인하십시오."
+
+      destroy:
+        success:
+          title: "성공!"
+          message: "%{lowercase_model_name} 성공적으로 삭제되었습니다."
+
+        failure:
+          title: "경고!"
+          message: "%{lowercase_model_name} 삭제할 수 없습니다."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- %{attribute_name} 선택 -"
+
+    format:
+      blank: "없음"
+
+    datepicker:
+      formats:
+        date: "Y/m/d"
+        datetime: "Y/m/d h:i K"
+        time: "h:i K"

data/gemfiles/rails-4.2.gemfile

@@ -13,4 +13,4 @@ end
 
 gem 'rails', '~> 4.2.0'
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

@@ -13,4 +13,4 @@ end
 
 gem 'rails', '~> 5.0.0'
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails-5.1.gemfile

@@ -13,4 +13,4 @@ end
 
 gem 'rails', '~> 5.1.0'
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails-5.2.gemfile

@@ -13,4 +13,4 @@ end
 
 gem 'rails', '~> 5.2.0'
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails-edge.gemfile

@@ -14,4 +14,4 @@ end
 gem 'rails', github: 'rails/rails'
 gem 'arel', github: 'rails/arel'
 
-gemspec :path => "../"
+gemspec path: "../"