administrador 0.0.28.pre → 0.0.29.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5167050451ba9760bb4678226586b6a3b4f5002090926fdd2dc35258ae8e3af7
-  data.tar.gz: 80242dc969c800c2b56e2994ee77b4b7e4de8612755a96979d9dc4259e449147
+  metadata.gz: 64ed33cc2480c73e23abf8b7cb1a36fc1f9f45286b663e52cb6f06749ed111be
+  data.tar.gz: a22f0b79ef8fd03fe9f900733957cedd2c8df95cd45f8ad008f9ad3a71fa4cd3
 SHA512:
-  metadata.gz: 7a2ed5973892bbcd7d722910984c5847f1fa71664b79f3d7a384342e1fe4dfd54abcecd3519a177023fedc672df270cbc6f0808149c6262d886ec7a0801da0ab
-  data.tar.gz: a7e951054c9e4a42e25ba8046a8dc7d871b45db07a5928930469792d93f9094a384d1dcce006c629b07eaccf9c00f0047eb501067ccba6d47b80119ad28b62d6
+  metadata.gz: 576c6c74e7aeb4accc89baacd6052b114ff587ba45e83efab110df72e963ef89abe8c32ef81d3d0087dc08fe6ef3fa1958bbcfd381feeb5234d5c005483b2a63
+  data.tar.gz: e8557e255e1928ecb20fd0bd4b349a04b5b5da01aacb77f5eee78ec2f766ae9fcc7fae36b00ad28317d5a56060237165ecc044a262ada65eafd558aa1f123062

data/app/assets/javascripts/administrador/application/pagination_size.js.coffee

@@ -0,0 +1,13 @@
+$ ->
+  $('[data-select-pagination-size]').on 'change', (e) ->
+    queryParameters = {}
+    queryString = location.search.substring(1)
+    re = /([^&=]+)=([^&]*)/g
+    m = undefined
+
+    while m = re.exec(queryString)
+      queryParameters[decodeURIComponent(m[1])] = decodeURIComponent(m[2])
+
+    per_page = $(@).val()
+    queryParameters['per_page'] = per_page
+    location.search = $.param(queryParameters)

data/app/assets/javascripts/administrador.js

@@ -4,4 +4,4 @@
 //= require rao-component/awesome_nested_set
 //= require simple_sidebar
 //= require simple_form-datetimepicker
-//= require administrador/application
+//= require administrador/application

data/app/assets/stylesheets/administrador/application/breadcrumbs.css

@@ -1,6 +1,6 @@
 #main-breadcrumbs {
   background-color: #e2e6ea;
-  margin-top: 4rem;
+  /* margin-top: 4rem; */
 }
 
 #main-breadcrumbs ol.breadcrumb {

data/app/assets/stylesheets/administrador/application/engines.css

@@ -0,0 +1,36 @@
+#sidebar-engines .administrador-engine-actions {
+  width: 1rem;
+  min-height: 1px;
+  margin-right: 1rem;
+}
+
+#sidebar-engines .administrador-engine-resources-count, .registered-engine-widget .administrador-engine-resources-count {
+  width: 1rem;
+}
+
+#sidebar-engines .administrador-engine a {
+  color: grey;
+}
+
+#sidebar-engines .administrador-engine .badge-pill, .registered-engine-widget .badge-pill {
+  min-width: 1.75rem;
+}
+
+#sidebar-engines .administrador-engine-actions, .registered-engine-widget .administrador-engine-actions {
+  /* width: 2.5rem; */
+  min-height: 1px;
+  margin-right: 0.5rem;
+}
+
+
+.administrador-engine-actions, .administrador-engine-resources-count {
+  display: inline-block;
+}
+
+.administrador-engine-resources-count {
+  margin-right: 0.5rem;
+}
+
+.registered-engine-widget .badge-pill {
+  min-width: 2.3rem;
+}

data/app/assets/stylesheets/administrador/application/layout.css

@@ -2,10 +2,19 @@ body {
   font-family: 'Poppins', sans-serif;
 }
 
+#main-content {
+  padding-top: 4rem;
+  padding-bottom: 3rem;
+}
+
 #main-container {
   padding-top: 1rem;
 }
 
+#main-navbar {
+  /* height: 4rem; */
+}
+
 #main-navbar-tools .navbar-nav {
   flex-direction: row;
   flex-wrap: wrap;
@@ -13,4 +22,18 @@ body {
 
 #main-navbar-tools .navbar-nav li {
   margin-left: 0.75rem;
+}
+
+#page-footer {
+  height: 3rem;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+
+.collection-table {
+  white-space: nowrap;
+}
+.collection-table td:last-child {
+  width: 100%;
 }

data/app/assets/stylesheets/administrador/application/page-actions.css

@@ -1,3 +1,13 @@
-.edit-actions .btn, .show-actions .btn, .index-actions .btn, .new-actions .btn, .create-actions .btn {
-  margin-left: 0.5rem;
-}
+.edit-actions,
+.show-actions,
+.index-actions,
+.new-actions,
+.create-actions {
+  padding: 1rem;
+}
+
+.edit-actions .btn, 
+.show-actions .btn,
+.index-actions .btn,
+.new-actions .btn,
+.create-actions .btn {}

data/app/assets/stylesheets/administrador/application/pagination.css

@@ -0,0 +1,6 @@
+.pagination-controls {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+}
+
+.pagination-controls ul.pagination { margin: 0; }

data/app/assets/stylesheets/administrador/application/sidebar-theme.css

@@ -2,6 +2,6 @@
   background-color: white;
 }
 .sidebar-left.sidebar-push, .sidebar-right.sidebar-push {
-  margin-top: 4rem;
-  height: calc(100% - 4rem);
+  margin-top: calc(4rem + 2px);
+  height: calc(100% - 7rem - 2px);
 }

data/app/assets/stylesheets/administrador.css

@@ -3,3 +3,4 @@
  *= require simple_form-datetimepicker
  *= require administrador/application
  */
+ 

data/app/concerns/administrador/controller/engine_sidebar_concern.rb

@@ -0,0 +1,17 @@
+module Administrador
+  module Controller
+    module EngineSidebarConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :initial_engine_sidebar_state
+      end
+
+      private
+
+      def initial_engine_sidebar_state
+        Administrador::Configuration.initial_engine_sidebar_state
+      end
+    end
+  end
+end

data/app/concerns/administrador/controller/resources_concern.rb

@@ -22,6 +22,10 @@ module Administrador
         with_conditions_from_query(super)
       end if Administrador.features?(:rao_query)
 
+      def per_page_default
+        Administrador::Configuration.features[:kaminari].options[:per_page_default] || super
+      end if Administrador.features?(:kaminari)
+
 
       module ResourcesCountConcern
         extend ActiveSupport::Concern

data/app/controllers/administrador/home_controller/base.rb

@@ -1,6 +1,7 @@
 module Administrador
   class HomeController::Base < ApplicationController
     include Administrador::Controller::EngineConcern
+    include Administrador::Controller::EngineSidebarConcern
 
     def index; end
   end

data/app/controllers/administrador/home_controller.rb

@@ -1,5 +1,7 @@
 module Administrador
   class HomeController < Administrador::ApplicationController
+    include Controller::EngineSidebarConcern
+
     def index
     end
   end

data/app/controllers/administrador/resource_controller/base.rb

@@ -2,6 +2,7 @@ module Administrador
   module ResourceController
     class Base < Administrador::ApplicationController
       include Administrador::Controller::ResourceConcern
+      include Administrador::Controller::EngineSidebarConcern
     end
   end
 end

data/app/controllers/administrador/resources_controller/base.rb

@@ -2,6 +2,7 @@ module Administrador
   module ResourcesController
     class Base < Administrador::ApplicationController
       include Administrador::Controller::ResourcesConcern
+      include Administrador::Controller::EngineSidebarConcern
     end
   end
 end

data/app/controllers/administrador/service_controller/base.rb

@@ -2,6 +2,7 @@ module Administrador
   module ServiceController
     class Base < Administrador::ApplicationController
       include Administrador::Controller::ServiceConcern
+      include Administrador::Controller::EngineSidebarConcern
     end
   end
 end

data/app/view_helpers/administrador/application_view_helper.rb

@@ -1,7 +1,7 @@
 module Administrador
   class ApplicationViewHelper < Rao::ViewHelper::Base
-    def engines
-      Administrador::Configuration.engines
+    def registered_engines
+      Administrador::RegisteredEngine.all
     end
 
     def filter_attributes_for_form(attribute_names)
@@ -24,16 +24,20 @@ module Administrador
     end
 
     def render_engine_sidebars
-      engines.collect do |_, engine|
-        c.render partial: 'administrador/application_view_helper/render_engine_sidebars', locals: { engine: engine }
+      registered_engines.collect do |registered_engine|
+        c.render partial: 'administrador/application_view_helper/render_engine_sidebars', locals: { engine: registered_engine }
       end.join.html_safe
     end
 
     def body_html
-      css_classes = ['administrador', c.controller.class.name.underscore.gsub('/', '-').chomp('_controller'), c.action_name].compact.join(' ')
+      css_classes = ['administrador', 'd-flex flex-column h-100', c.controller.class.name.underscore.gsub('/', '-').chomp('_controller'), c.action_name].compact.join(' ')
       { class: css_classes }
     end
 
+    def render_registered_engine_widget(registered_engine)
+      render registered_engine: registered_engine
+    end
+
     private
 
     def bootstrapify_flash_keys(flash)

data/app/view_helpers/administrador/breadcrumbs_view_helper.rb

@@ -10,9 +10,9 @@ module Administrador
       if identifier.start_with?('.')
         prefix = self.class.name.underscore
         caller_method = caller[0].split(' ').last.gsub("'", '')
-        I18n.t("#{prefix}.#{caller_method}.#{identifier}", options)
+        I18n.t("#{prefix}.#{caller_method}.#{identifier}", *options)
       else
-        I18n.t(identifier, options)
+        I18n.t(identifier, **options)
       end
     end
 
@@ -31,9 +31,9 @@ module Administrador
         breadcrumbs << { label: t('.home'), url: c.administrador.root_path, link_html_options: {}, li_html_options: {}}
 
         if c.respond_to?(:engine_class, true) && c.engine_class.present?
-          engine = Administrador::Configuration.engines[c.engine_class.name]
-          if engine.present?
-            breadcrumbs << { label: t("classes.#{engine.engine.name.underscore}"), url: c.send(engine.router_name).root_path, link_html_options: {}, li_html_options: {} }
+          registered_engine = Administrador::RegisteredEngine.find_by_class(c.engine_class)
+          if registered_engine.present?
+            breadcrumbs << { label: t("classes.#{registered_engine.engine_class.name.underscore}"), url: c.send(registered_engine.router_name).root_path, link_html_options: {}, li_html_options: {} }
           end
         end
 

data/app/views/administrador/application/_navbar.html.haml

@@ -1,13 +1,13 @@
-%nav.navbar.navbar-light.fixed-top
+%nav.navbar.navbar-dark.bg-dark.fixed-top
   #main-navbar-content
     %ul.navbar-nav
       %li.nav-item
-        %button.btn.btn-circle.btn-lg.btn-light{ data: { sidebar: { trigger: '#sidebar-engines' } } }
+        %button.btn.btn-circle.btn-lg.btn-dark{ data: { sidebar: { trigger: '#sidebar-engines' } } }
           %i.fas.fa-bars
   #main-navbar-tools
     %ul.navbar-nav
-      - administrador_helper(self).engines.each do |_, engine|
-        - engine.sidebar_controllers.each do |sc|
+      - administrador_helper(self).registered_engines.each do |registered_engine|
+        - registered_engine.sidebar_controllers.each do |sc|
           %li.nav-item
             %button.btn.btn-circle.btn-lg.btn-light{ data: { sidebar: { trigger: "#sidebar-#{sc.name.underscore.gsub('/', '-')}" } } }
               %i.fas{ class: "fa-#{(sc.icon_name || :'ellipsis-v')}"}

data/app/views/administrador/application/sidebars/_engine.html.haml

@@ -1,34 +1,39 @@
-%aside#sidebar-engines.p-2.pr-0{ data: { sidebar: { position: :left, size: '20rem', state: :closed, mode: :push } } }
+%aside#sidebar-engines.p-2.pr-0{ data: { sidebar: { position: :left, size: '20rem', state: initial_engine_sidebar_state, mode: :push } } }
   .container-fluid
     .row
       .col-12
-        - administrador_helper(self).engines.each do |_, engine|
+        - administrador_helper(self).registered_engines.each_with_index do |(engine), index|
           - next unless engine.options[:show_in_engine_sidebar]
           .administrador-engine.mb-4.text-secondary{ id: dom_id(engine), class: dom_class(engine) }
-            %h6.text-uppercase.administrador-engine-name
-              %i.fas.fa-home
+            %h6.administrador-engine-name.d-flex.text-uppercase
+              %i.fas.fa-home.mr-1
               = link_to(send(engine.router_name).root_path, class: 'administrador-link-to-engine-home') do
                 = engine.translated_name
-            %ul.list-group.list-group-flush
-              - engine.resources_controllers.each do |rc|
-                %li.list-group-item
-                  .administrador-engine-resources-count.float-right
-                    %span.badge.badge-pill.badge-success= rc.resource_count
-                  .administrador-engine-actions.float-right
-                    - if rc.available_rest_actions.include?(:new)
-                      %a.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
-                        %i.fas.fa-plus
-                  %a.administrador-link-to-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :index), class: "#{rc.name.underscore.gsub('_controller', '').split('/').last == controller_name ? 'current selected' : ''}" }
-                    = rc.resource_class.model_name.human(count: :other)
-              - engine.resource_controllers.each do |rc|
-                %li.list-group-item
-                  .administrador-engine-actions.float-right
-                    - if rc.available_rest_actions.include?(:new)
-                      %a.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
-                        %i.fas.fa-plus
-                  %a.administrador-link-to-resource{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :show) }
-                    = rc.resource_class.model_name.human(count: :other)
-              - engine.service_controllers.each do |sc|
-                %li.list-group-item
-                  %a.administrador-link-to-service{ href: send(engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :new) }
-                    = sc.service_class.model_name.human(count: :other)
+              %span.ml-auto
+                %a{ data: { toggle: "collapse" }, href: "#engine-menu-#{index}", role: 'button', aria: { expanded: "false", controls: "engine-menu-#{index}" } }
+                  %i.fas.fa-chevron-down
+            .engine-menu.collapse{ id: "engine-menu-#{index}", class: (engine.engine_class == controller.engine_class) ? "show" : nil }
+              %span
+              %ul.list-group.list-group-flush
+                - engine.resources_controllers.each do |rc|
+                  %li.list-group-item
+                    .administrador-engine-resources-count.float-right
+                      %span.badge.badge-pill.badge-success= rc.resource_count
+                    .administrador-engine-actions.float-right
+                      - if rc.available_rest_actions.include?(:new)
+                        %a.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
+                          %i.fas.fa-plus
+                    %a.administrador-link-to-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :index), class: "#{rc.name.underscore.gsub('_controller', '').split('/').last == controller_name ? 'current selected' : ''}" }
+                      = rc.resource_class.model_name.human(count: :other)
+                - engine.resource_controllers.each do |rc|
+                  %li.list-group-item
+                    .administrador-engine-actions.float-right
+                      - if rc.available_rest_actions.include?(:new)
+                        %a.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
+                          %i.fas.fa-plus
+                    %a.administrador-link-to-resource{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :show) }
+                      = rc.resource_class.model_name.human(count: :other)
+                - engine.service_controllers.each do |sc|
+                  %li.list-group-item
+                    %a.administrador-link-to-service{ href: send(engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :new) }
+                      = sc.service_class.model_name.human(count: :other)

data/app/views/administrador/application_view_helper/_render_engine_sidebars.html.haml

@@ -4,4 +4,5 @@
   - size = sc.sidebar_size || '250px'
   - url = sc.sidebar_url || send(engine.router_name).send("#{sc.name.demodulize.underscore.gsub('_controller', '').singularize}_path")
   - mode = sc.sidebar_mode || :modal
-  %aside.py-2{ id: id, data: { sidebar: { position: position, size: size, state: :closed, mode: :modal, load: url } } }
+  %aside.py-2{ id: id, data: { sidebar: { position: position, size: size, state: :closed, mode: :modal, load: url } } }
+  

data/app/views/administrador/application_view_helper/_render_registered_engine_widget.html.haml

@@ -0,0 +1,41 @@
+.registered-engine-widget
+  .row
+    .col-12
+      %h3= t("classes.#{registered_engine.name.underscore}")
+
+  .row.mb-4
+    .col-12
+      %ul.list-group.list-group-flush
+        - registered_engine.resources_controllers.each do |rc|
+          %li.list-group-item.d-flex
+            %a.administrador-link-to-resources{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :index), class: "#{rc.name.underscore.gsub('_controller', '').split('/').last == controller_name ? 'current selected' : ''}" }
+              = rc.resource_class.model_name.human(count: :other)
+            .ml-auto
+              .administrador-engine-actions
+                .btn-group
+                  - if rc.available_rest_actions.include?(:new)
+                    %a.btn.btn-xs.btn-success{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
+                      %i.fas.fa-plus
+                  - if rc.available_rest_actions.include?(:index)
+                    %a.btn.btn-xs.btn-primary{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :index) }
+                      %i.fas.fa-eye
+              .administrador-engine-resources-count
+                %span.badge.badge-pill.badge-success= rc.resource_count
+
+        - registered_engine.resource_controllers.each do |rc|
+          %li.list-group-item
+            .administrador-engine-actions.float-right
+              .btn-group
+                - if rc.available_rest_actions.include?(:new)
+                  %a.btn.btn-xs.btn-success{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
+                    %i.fas.fa-plus
+                - if rc.available_rest_actions.include?(:show)
+                  %a.btn.btn-xs.btn-primary{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :show) }
+                    %i.fas.fa-plus
+            %a.administrador-link-to-resource{ href: send(registered_engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :show) }
+              = rc.resource_class.model_name.human(count: :other)
+
+        - registered_engine.service_controllers.each do |sc|
+          %li.list-group-item
+            %a.administrador-link-to-service{ href: send(registered_engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :new) }
+              = sc.service_class.model_name.human(count: :other)

data/app/views/administrador/home/index.de.html.haml

@@ -1,6 +1,4 @@
-.jumbotron.jumbotron-fluid
-  .container
-    %h1.display-4 Hallo,
-    %p.lead willkommen auf Deiner Administrationsoberfläche!
-    %hr.my-4/
-    %p Die in dieser Oberfläche verwalteten Inhalte findest Du mit einem Klick auf das Menü oben links. Zusätzliche Features sind über die Icons oben rechts zu finden.
+.row
+  - administrador_helper(self).registered_engines.each do |registered_engine|
+    .col-lg-6.col-xl-4
+      = administrador_helper(self).render_registered_engine_widget(registered_engine)

data/app/views/administrador/home_controller/base/index.html.haml

@@ -1,5 +1,4 @@
-.row
-  .col-12
-    %h3= t('.title', engine_name: t("classes.#{engine_class.name.underscore}"))
+- current_registered_engine = Administrador::RegisteredEngine.find_by_class!(engine_class)
+= administrador_helper(self).render_registered_engine_widget(current_registered_engine)
 
 = render partial: 'index_extras'

data/app/views/administrador/resources_controller/base/_edit_actions.html.haml

@@ -1,6 +1,5 @@
-= link_to({ action: :index }, class: 'btn btn-light btn-responsive') do
+= link_to({ action: :index }, class: 'btn btn-light btn-circle btn-lg') do
   %i.fas.fa-arrow-left
-  %span.btn-text= t('.back')
 
 .ml-auto
   = link_to([resource_namespace, resource], class: 'btn btn-success btn-circle btn-lg') do

data/app/views/administrador/resources_controller/base/_new_actions.html.haml

@@ -1,3 +1,2 @@
-= link_to({ action: :index }, class: 'btn btn-light btn-responsive') do
+= link_to({ action: :index }, class: 'btn btn-light btn-circle btn-lg') do
   %i.fas.fa-arrow-left
-  %span.btn-text= t('.back')

data/app/views/administrador/resources_controller/base/_pagination.html.haml

@@ -1 +1,8 @@
-= paginate(collection, theme: 'twitter-bootstrap-4')
+.pagination-controls.w-100.d-flex.justify-content-between
+  .d-hide
+  .d-flex.align-items-center
+    = paginate(collection, theme: 'twitter-bootstrap-4')
+
+  .d-flex.align-items-center
+    %select.pagination-size{ 'data-select-pagination-size': true }
+      = options_for_select({ '1': 1, '5': 5, '10': 10, '15': 15, '20': 20, '50': 50, '100': 100, t('views.pagination_size.all') => 'all' }, per_page)

data/app/views/administrador/resources_controller/base/_show_actions.html.haml

@@ -1,6 +1,5 @@
-= link_to({ action: :index }, class: 'btn btn-light btn-responsive') do
+= link_to({ action: :index }, class: 'btn btn-light btn-circle btn-lg') do
   %i.fas.fa-arrow-left
-  %span.btn-text= t('.back')
 
 .ml-auto
   - if available_rest_actions.include?(:destroy)

data/app/views/administrador/resources_controller/base/edit.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-12
-    %h1= t('.title', inflections)
+    %h1= t('.title', **inflections)
     
 .row
   .col-12

data/app/views/administrador/resources_controller/base/index.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-12
-    %h1= t('.title', inflections)
+    %h1= t('.title', **inflections)
 
 - if Administrador.features?(:rao_query)
   .row
@@ -12,17 +12,21 @@
   .col-12
     .before-index-table= render partial: 'before_index_table', locals: { collection: @collection }
 
+- if Administrador.features?(:kaminari) && @collection.respond_to?(:total_pages)
+  .row
+    .col-12
+      = render partial: 'pagination', locals: { collection: @collection }
+
 .row
   .col-12
-    = collection_table(collection: @collection, resource_class: resource_class, table_html: "collection-table table table-responsive #{resource_class.name.underscore.pluralize.gsub('/', '-')} table-xs") do |table|
+    = collection_table(collection: @collection, resource_class: resource_class, table_html: "collection-table table table-responsive #{resource_class.name.underscore.pluralize.gsub('/', '-')}") do |table|
       = render partial: 'index_table', locals: { table: table }
       = render partial: 'index_table_actions', locals: { table: table }
   
 - if Administrador.features?(:kaminari) && @collection.respond_to?(:total_pages)
   .row
     .col-12.d-flex
-      .mx-auto
-        = render partial: 'pagination', locals: { collection: @collection }
+      = render partial: 'pagination', locals: { collection: @collection }
 
 .row
   .col-12

data/app/views/administrador/resources_controller/base/new.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-12
-    %h1= t('.title', inflections)
+    %h1= t('.title', **inflections)
     
 .row
   .col-12

data/app/views/administrador/service_controller/base/create.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-12
-    %h1= t('.title', inflections)
+    %h1= t('.title', **inflections)
 
 .row
   .col-12

data/app/views/administrador/service_controller/base/new.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-12
-    %h1= t('.title', inflections)
+    %h1= t('.title', **inflections)
     
 .row
   .col-12

data/app/views/layouts/administrador/application.html.haml

@@ -1,5 +1,5 @@
 !!!
-%html{:lang => I18n.locale }
+%html{ lang: I18n.locale, class: "h-100" }
   %head
     / Required meta tags
     %meta{:charset => "utf-8"}/
@@ -8,8 +8,9 @@
     %link{:crossorigin => "anonymous", :href => "https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css", :integrity => "sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS", :rel => "stylesheet"}/
     / Font Awesome CSS
     %link{:crossorigin => "anonymous", :href => "https://use.fontawesome.com/releases/v5.6.3/css/all.css", :integrity => "sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/", :rel => "stylesheet"}/
-    / Fonts
+    / Fonts CSS
     %link{:href => "https://fonts.googleapis.com/css?family=Poppins", :rel => "stylesheet"}/
+
     / jQuery JS
     %script{:crossorigin => "anonymous", :integrity => "sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=", :src => "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"}
     / jQuery UI JS
@@ -17,13 +18,13 @@
     / jQuery redirect JS
     %script{:src => "https://cdn.jsdelivr.net/npm/jquery.redirect@1.1.4/jquery.redirect.min.js"}
 
-    - Administrador::Configuration.engines.each do |engine, options|
-      = "<!-- Javascript for #{engine} -->".html_safe
-      = javascript_include_tag engine.underscore.gsub('/', '_').gsub('_engine', '')
+    - Administrador::RegisteredEngine.all.each do |registered_engine|
+      = "<!-- Javascript for #{registered_engine} -->".html_safe
+      = javascript_include_tag registered_engine.engine_class.name.underscore.gsub('/', '_').gsub('_engine', '')
 
-    - Administrador::Configuration.engines.each do |engine, options|
-      = "<!-- CSS for #{engine} -->".html_safe
-      = stylesheet_link_tag engine.underscore.gsub('/', '_').gsub('_engine', ''), media: "all"
+    - Administrador::RegisteredEngine.all.each do |registered_engine|
+      = "<!-- CSS for #{registered_engine} -->".html_safe
+      = stylesheet_link_tag registered_engine.engine_class.name.underscore.gsub('/', '_').gsub('_engine', ''), media: "all"
 
     %title Administrador
     
@@ -34,22 +35,34 @@
 
     = render partial: 'html_head_extras'
   %body{ administrador_helper(self).body_html }
-    #main-content
+    %main
+      #main-navbar
+        = render '/administrador/application/navbar'
+      #main-content
+        .container-fluid
+          .row
+            .col-12.px-0
+              #main-breadcrumbs.container-fluid
+                .row
+                  .col-12
+                    = breadcrumbs(self).render
+              #main-container.container-fluid
+                .row
+                  .col-12
+                    #flash-messages
+                      = administrador_helper(self).flash_messages
+                    = yield
+
+    %footer#page-footer.mt-auto.bg-dark.text-white.py-3
       .container-fluid
         .row
-          .col-12.px-0
-            #main-navbar.mb-4
-              = render '/administrador/application/navbar'
-            #main-breadcrumbs.container-fluid
-              .row
-                .col-12
-                  = breadcrumbs(self).render
-            #main-container.container-fluid
-              .row
-                .col-12
-                  #flash-messages
-                    = administrador_helper(self).flash_messages
-                  = yield
+          .col-12.d-flex
+            .ml-auto
+              .small
+                Administrador
+                = Administrador::VERSION
+                by
+                = link_to("BeeGood IT", "https://www.beegoodit.de/", target: "_blank")
 
     = render "/administrador/application/sidebars/engine"
 

data/config/locales/de.yml

@@ -74,4 +74,7 @@ de:
       first: "<<"
       next: ">"
       last: ">>"
-      previous: "<"
+      previous: "<"
+      truncate: "…"
+    pagination_size:
+      all: "Alle"

data/config/locales/en.yml

@@ -74,4 +74,7 @@ en:
       first: "<<"
       next: ">"
       last: ">>"
-      previous: "<"
+      previous: "<"
+      truncate: "…"
+    pagination_size:
+      all: "All"

data/lib/administrador/configuration.rb

@@ -4,13 +4,17 @@ module Administrador
       yield self
     end
 
-    mattr_accessor(:engines) { {} }
     mattr_accessor(:features) { {} }
     mattr_accessor(:resource_label_methods) { [:human, :name, :email, :to_s] }
     mattr_accessor(:base_controller_class_name) { '::ApplicationController' }
+    mattr_accessor(:initial_engine_sidebar_state) { :closed }
+
+    def self.engines
+      Administrador::RegisteredEngine.all
+    end
 
     def register_engine(name, options = {})
-      @@engines[name] = Administrador::RegisteredEngine.new(name, options)
+      Administrador::RegisteredEngine.create(name: name, options: options)
     end
 
     def enable_feature(name, options = {})

data/lib/administrador/feature.rb

@@ -1,5 +1,7 @@
 module Administrador
   class Feature
+    attr_reader :options
+
     def initialize(name, options = {})
       @name, @options = name, options
     end

data/lib/administrador/registered_engine.rb

@@ -20,7 +20,7 @@ module Administrador
   #    require 'example_app/configuration'
   #    Administrador.configure { |c| c.register_engine('ExampleApp::Application', {}) }
   #
-  # You will need to add a confifguration module:
+  # You will need to add a configuration module:
   #
   #    # lib/example_app/configuration.rb
   #    module ExampleApp
@@ -35,19 +35,50 @@ module Administrador
   class RegisteredEngine
     attr_accessor :options, :name
 
-    def initialize(name, options)
+    @store = []
+
+    def self.create(attributes = {})
+      @store << new(attributes)
+    end
+
+    def self.all
+      @store
+    end
+
+    def self.find_by_name(name)
+      @store.find { |re| re[:name] == name }
+    end
+
+    def self.find_by_class(klass)
+      @store.find { |re| re.engine_class == klass }
+    end
+
+    def self.find_by_class!(klass)
+      engine = @store.find { |re| re.engine_class == klass }
+      raise "Could not find engine #{klass}" if engine.nil?
+      engine
+    end
+
+    def self.find_by_class_name(class_name)
+      @store.find { |re| re.engine_class.name == class_name }
+    end
+
+    def initialize(attributes = {})
+      options = attributes.delete(:options)
       options.reverse_merge!(
         show_in_engine_sidebar: true
       )
-      @name, @options = name, options
+      attributes.merge(options: options).each do |key, value|
+        send("#{key}=", value)
+      end
     end
 
-    def engine
+    def engine_class
       @name.constantize
     end
 
     def main_app?
-      engine.ancestors.include?(::Rails::Application)
+      engine_class.ancestors.include?(::Rails::Application)
     end
 
     def to_key
@@ -59,7 +90,7 @@ module Administrador
     end
 
     def translated_name
-      I18n.t("classes.#{engine.name.underscore}")
+      I18n.t("classes.#{engine_class.name.underscore}")
     end
 
     def router_name
@@ -80,7 +111,7 @@ module Administrador
       elsif configuration.respond_to?(:resources_controllers)
         configuration.resources_controllers.call
       else
-        Rails.logger.warn("Administrador: The namespace #{engine.name.deconstantize} either does not define a Configuration class or the class #{engine.name.deconstantize}::Configuration does not respond_to :resources_controllers.")
+        Rails.logger.warn("Administrador: The namespace #{engine_class.name.deconstantize} either does not define a Configuration class or the class #{engine_class.name.deconstantize}::Configuration does not respond_to :resources_controllers.")
         []
       end
     end
@@ -89,7 +120,7 @@ module Administrador
       if configuration.respond_to?(:resource_controllers)
         configuration.resource_controllers.call
       else
-        Rails.logger.warn("Administrador: The namespace #{engine.name.deconstantize} either does not define a Configuration class or the class #{engine.name.deconstantize}::Configuration does not respond_to :resource_controllers.")
+        Rails.logger.warn("Administrador: The namespace #{engine_class.name.deconstantize} either does not define a Configuration class or the class #{engine_class.name.deconstantize}::Configuration does not respond_to :resource_controllers.")
         []
       end
     end
@@ -100,7 +131,7 @@ module Administrador
       elsif configuration.respond_to?(:service_controllers)
         configuration.service_controllers.call
       else
-        Rails.logger.warn("Administrador: The namespace #{engine.name.deconstantize} either does not define a Configuration class or the class #{engine.name.deconstantize}::Configuration does not respond_to :service_controllers.")
+        Rails.logger.warn("Administrador: The namespace #{engine_class.name.deconstantize} either does not define a Configuration class or the class #{engine_class.name.deconstantize}::Configuration does not respond_to :service_controllers.")
         []
       end
     end
@@ -109,7 +140,7 @@ module Administrador
       if configuration.respond_to?(:sidebar_controllers)
         configuration.sidebar_controllers.call
       else
-        Rails.logger.warn("Administrador: The namespace #{engine.name.deconstantize} either does not define a Configuration class or the class #{engine.name.deconstantize}::Configuration does not respond_to :sidebar_controllers.")
+        Rails.logger.warn("Administrador: The namespace #{engine_class.name.deconstantize} either does not define a Configuration class or the class #{engine_class.name.deconstantize}::Configuration does not respond_to :sidebar_controllers.")
         []
       end
     end

data/lib/administrador/version.rb

@@ -1,3 +1,3 @@
 module Administrador
-  VERSION = '0.0.28.pre'.freeze
+  VERSION = '0.0.29.pre'.freeze
 end

data/lib/administrador.rb

@@ -12,6 +12,7 @@ require "simple_form-datetimepicker"
 require "simple_sidebar"
 require "bootstrap4-kaminari-views"
 require "rails-i18n"
+require "administrador/version"
 require "administrador/feature"
 require "administrador/configuration"
 require "administrador/engine"

data/lib/generators/administrador/install/templates/initializer.rb

@@ -12,13 +12,19 @@ Administrador.configure do |config|
   #
   config.base_controller_class_name = '::ApplicationController'
 
+  # Initial state of the engine sidebar. Can be :open or :closed.
+  #
+  # Default: config.initial_engine_sidebar_state = :closed
+  #
+  config.initial_engine_sidebar_state = :closed
+
   # Enable additional features here.
   #
-  # config.enable_feature(:kaminari, {})
+  # config.enable_feature(:kaminari, { per_page_default: 10 })
   # config.enable_feature(:rao_query, {})
 
   # Engines that are registered will be shown in the administrador main menu
   # sidebar. Additionally they can register sidebars.
   #
-  # config.register_engine 'Ecm::Blog::Backend::Engine', {}
+  # config.register_engine 'Cmor::Blog::Backend::Engine', {}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrador
 version: !ruby/object:Gem::Version
-  version: 0.0.28.pre
+  version: 0.0.29.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.48.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.48.pre
 - !ruby/object:Gem::Dependency
   name: route_translator
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4.pre
+        version: 0.0.6.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4.pre
+        version: 0.0.6.pre
 - !ruby/object:Gem::Dependency
   name: bootstrap4-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ files:
 - app/assets/javascripts/administrador.js
 - app/assets/javascripts/administrador/application.js
 - app/assets/javascripts/administrador/application/keep.js
-- app/assets/javascripts/administrador/application/sidebar.js.coffee~
+- app/assets/javascripts/administrador/application/pagination_size.js.coffee
 - app/assets/stylesheets/administrador.css
 - app/assets/stylesheets/administrador/application.css
 - app/assets/stylesheets/administrador/application/bootstrap-btn-responsive.css
@@ -411,15 +411,16 @@ files:
 - app/assets/stylesheets/administrador/application/bootstrap-table-xs.css
 - app/assets/stylesheets/administrador/application/breadcrumbs.css
 - app/assets/stylesheets/administrador/application/colors.css
-- app/assets/stylesheets/administrador/application/engine-sidebar.css
+- app/assets/stylesheets/administrador/application/engines.css
 - app/assets/stylesheets/administrador/application/forms.css
 - app/assets/stylesheets/administrador/application/layout.css
 - app/assets/stylesheets/administrador/application/page-actions.css
+- app/assets/stylesheets/administrador/application/pagination.css
 - app/assets/stylesheets/administrador/application/query_form.css
 - app/assets/stylesheets/administrador/application/sidebar-theme.css
-- app/assets/stylesheets/administrador/application/sidebar.css~
 - app/concerns/administrador/controller/application_concern.rb
 - app/concerns/administrador/controller/engine_concern.rb
+- app/concerns/administrador/controller/engine_sidebar_concern.rb
 - app/concerns/administrador/controller/resource_concern.rb
 - app/concerns/administrador/controller/resources_concern.rb
 - app/concerns/administrador/controller/service_concern.rb
@@ -446,6 +447,7 @@ files:
 - app/views/administrador/application/sidebars/_user.html.haml
 - app/views/administrador/application_view_helper/_flash_messages.html.haml
 - app/views/administrador/application_view_helper/_render_engine_sidebars.html.haml
+- app/views/administrador/application_view_helper/_render_registered_engine_widget.html.haml
 - app/views/administrador/home/_html_head_extras.html.haml
 - app/views/administrador/home/index.de.html.haml
 - app/views/administrador/home/index.en.html.haml
@@ -477,7 +479,6 @@ files:
 - app/views/administrador/resources_controller/base/_index_actions.html.haml
 - app/views/administrador/resources_controller/base/_index_table.html.haml
 - app/views/administrador/resources_controller/base/_index_table_actions.html.haml
-- app/views/administrador/resources_controller/base/_index_table_actions.html.haml~
 - app/views/administrador/resources_controller/base/_new_actions.html.haml
 - app/views/administrador/resources_controller/base/_pagination.html.haml
 - app/views/administrador/resources_controller/base/_query_form.html.haml
@@ -527,14 +528,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.4
+      version: 2.6.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Administrador - The rails administration interface.

data/app/assets/javascripts/administrador/application/sidebar.js.coffee~

@@ -1,104 +0,0 @@
-# Usage:
-#
-# Put all the content that is not in the sidebar in a container with the id #main-content a trigger button and add a sidebar.
-#
-#     <body>
-#       <div id="main-content">
-#         <button data-sidebar-trigger="#example-sidebar">
-#           Toggle the example sidebar!  
-#         </button>
-#       </div>
-#       <aside
-#         id="example-sidebar">
-#         data-sidebar-load="/de/backend/authentifizierung/user_sidebar.html"
-#         data-sidebar-mode="overlay"
-#         data-sidebar-position="right"
-#         data-sidebar-size="20rem"
-#         data-sidebar-state="closed"
-#         <h3>Hello from the example sidebar!</h3>
-#       </aside>
-#     </body>
-#
-# Options:
-#
-#   load: Passing an url to load will load the content of the url via ajax and display it in the sidebar.
-#   mode:
-#     push: This will decrease the size of the main content, making room for the sidebar.
-#     overlay: This will show the sidebar on top of the content, without moving it.
-#     modal: Like overlay, but with a modal background.
-#  position: left|right|top|bottom
-#  size: size that the sidebar will take up (width for left and right, height for top and bottom). Pass any css size in px, rem or whatever you like.
-#
-$ ->
-  $('body').on 'click', '#sidebar-modal-background', ->
-    target = $("##{$(@).data('sidebar-target')}")
-    closeModal(target)
-
-  $('[data-sidebar-position]').each (_, e) ->
-    position = $(@).data('sidebar-position')
-    $(e).addClass("sidebar sidebar-#{position}")
-    if $(@).data('sidebar-state') == 'opened'
-      openModal($(@))
-
-  $('[data-sidebar-trigger]').on 'click', ->
-    target = $($(@).data('sidebar-trigger'))
-    state = target.data('sidebar-state')
-    
-    if state == 'closed'
-      openModal(target)
-    else
-      closeModal(target)
-
-openModal = (target) ->
-  main_content = $('#main-content')
-
-  position = target.data('sidebar-position')
-  mode = target.data('sidebar-mode')
-  size_attribute = if position in ['top', 'bottom'] then 'height' else 'width'
-  size = target.data('sidebar-size')
-
-  target.css("display", "inherit")
-  target.css(size_attribute, size)
-  main_content.css("margin-#{position}", size) if mode == 'push'
-
-
-  # modal
-  if mode == 'modal'
-    $("body").append("<div id=\"sidebar-modal-background\" data-sidebar-target=\"#{target.attr('id')}\"></div>")
-
-  # load
-  if target.data('sidebar-load')
-    url = target.data('sidebar-load')
-    $.ajax
-      type: 'GET'
-      url: url
-      success: (response) ->
-        $(target).html(response)
-        return
-
-  # set state
-  target.data('sidebar-state', 'opened')
-
-closeModal = (target) ->
-  main_content = $('#main-content')
-
-  position = target.data('sidebar-position')
-  mode = target.data('sidebar-mode')
-  size_attribute = if position in ['top', 'bottom'] then 'height' else 'width'
-  size = target.data('sidebar-size')
-  
-  # push
-  if mode == 'push'
-    main_content.css("margin-#{position}", size)
-
-  # modal
-  if mode == 'modal'
-    $("#sidebar-modal-background").remove()
-
-  target.css(size_attribute, '0px')
-
-  if mode == 'push'
-    main_content.css("margin-#{position}", '0px')
-
-  # set state
-  target.data('sidebar-state', 'closed')

data/app/assets/stylesheets/administrador/application/engine-sidebar.css

@@ -1,17 +0,0 @@
-#sidebar-engines .administrador-engine-actions {
-  width: 1rem;
-  min-height: 1px;
-  margin-right: 1rem;
-}
-
-#sidebar-engines .administrador-engine-resources-count {
-  width: 1rem;
-}
-
-#sidebar-engines .administrador-engine a {
-  color: grey;
-}
-
-#sidebar-engines .administrador-engine .badge-pill {
-  min-width: 1.75rem;
-}

data/app/assets/stylesheets/administrador/application/sidebar.css~

@@ -1,51 +0,0 @@
-.sidebar {
-  position: fixed;
-  z-index: 3000;
-  overflow-x: hidden;
-  transition: 0.5s;
-}
-
-.sidebar-left {
-  height: 100%;
-  width: 0;
-  top: 0;
-  left: 0;
-}
-.sidebar-right {
-  height: 100%;
-  width: 0;
-  top: 0;
-  right: 0;
-}
-.sidebar-top {
-  width: 100%;
-  height: 0;
-  left: 0;
-  top: 0;
-}
-.sidebar-bottom {
-  width: 100%;
-  height: 0;
-  left: 0;
-  bottom: 0;
-}
-
-#sidebar-modal-background {
-  position: fixed;
-  z-index: 2000;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgb(0,0,0);
-  background-color: rgba(0,0,0,0.4);
-}
-
-#main-content {
-  transition: margin .5s;
-}
-
-/* @media screen and (max-height: 450px) {
-  .sidebar {padding-top: 15px;}
-  .sidebar a {font-size: 18px;}
-} */

data/app/views/administrador/resources_controller/base/_index_table_actions.html.haml~

@@ -1,16 +0,0 @@
-= table.column(:actions, title: false) do |resource|
-  - capture_haml do
-    .w-100.d-flex
-      .btn-group.ml-auto
-        - if available_rest_actions.include?(:show)
-          = link_to({ action: :show, id: resource.to_param }, class: 'show btn btn-xs btn-responsive btn-primary') do
-            %i.fas.fa-eye
-            %span.btn-text= t('.show')
-        - if available_rest_actions.include?(:edit)
-          = link_to({ action: :edit, id: resource.to_param }, class: 'edit btn btn-xs btn-responsive btn-secondary') do
-            %i.fas.fa-edit
-            %span.btn-text= t('.edit')
-        - if available_rest_actions.include?(:destroy)
-          = link_to({ action: :show, id: resource.to_param }, class: 'destroy btn btn-xs btn-responsive btn-danger', method: :delete, 'data-confirm': I18n.t('administrador.controller.confirmations.destroy')) do
-            %i.fas.fa-fire
-            %span.btn-text= t('.destroy')