administrador 0.0.9.pre → 0.0.10.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46048331e06682dab34b2e1c9547ec55069fc7e8808b58c895c2aec832e59c60
-  data.tar.gz: 2268651c5949d3d63ab414ecfbd9b0492dec267edf2bacbb06f39eafb014ec4f
+  metadata.gz: ccf355a462b3ac438d1d0150a61fb3f75817feb427720bd7eb050ff5838f0944
+  data.tar.gz: 399cc94c0c8316678db40b523e368799f8c83d9bf88d921336fc855dba5ea130
 SHA512:
-  metadata.gz: eb7ed2cd43aa10b92f6d9447f084bf5c073d06a736372080cbd120351a92bc7cf7998a7fade196b27ccf17925c645bbd81bb2830fd26f1e782d32481078a5b11
-  data.tar.gz: 2a6a06e9f69e3224050ecb876aba79d72c64d0f0d5c335b0df79c28d91a306eba8e261f75932de17e800a00d7ec2b5cf31b9ef369cc7ba66285e787fbbf69869
+  metadata.gz: 4c2b00af3c5b04263e8cd06cb1545481be67450ee0b2eea837ab0f48ee0fa69dc27f6b00c2909b34966ae75db8bd99c3e6c7fd7583bdca53741eecd150793c29
+  data.tar.gz: 774c0776c61d23bbdb8177b9202d59192aecee2a51117e0b090cec7739a99e9262b2252a5cdebd50521ba9e7ac81452669e8f059c6d9e7da695ec757a01a12c9

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

@@ -13,4 +13,5 @@
 //= require rails-ujs
 //= require activestorage
 //= require rao-component/acts_as_list
-//= require_tree .
+//= require simple_sidebar
+//= require_tree ./application

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

@@ -1,7 +1,17 @@
-#engine-sidebar .administrador-object-count {
+#sidebar-engines .administrador-engine-actions {
+  width: 1rem;
+  min-height: 1px;
   margin-right: 1rem;
 }
 
-#engine-sidebar .list-group-item {
-  padding: 0.2rem 0.3rem;
+#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/layout.css

@@ -13,29 +13,4 @@ body {
 
 #main-navbar-tools .navbar-nav li {
   margin-left: 0.75rem;
-}
-
-#main-sidebar {
-  padding: 0;
-}
-
-@media (min-width: 768px) {
-  #main-sidebar {
-    min-height: 100vh;
-  }
-
-  #main-sidebar > .container-fluid > .row {
-    height: 100vh;
-  }
-}
-
-#main-sidebar-bottom-content {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-
-#main-sidebar-bottom-content .btn {
-  margin-bottom: 0.75rem;
-}
+}

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

@@ -0,0 +1,6 @@
+.sidebar {
+  background-color: white;
+}
+.sidebar-left.sidebar-push, .sidebar-right.sidebar-push {
+  margin-top: 4rem;
+}

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

@@ -10,6 +10,7 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
+ *= require simple_sidebar
  *= require_tree ./application
  *= require_self
  */

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

@@ -5,7 +5,6 @@ module Administrador
 
       included do
         view_helper Administrador::ApplicationViewHelper, as: :administrador_helper
-        view_helper Administrador::OffcanvasViewHelper,   as: :offcanvas
         view_helper Administrador::BreadcrumbsViewHelper, as: :breadcrumbs
 
         prepend Administrador::EngineRoutable::LocalizedConcern

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

@@ -3,9 +3,11 @@ module Administrador
     class Base < Administrador::ApplicationController
       layout false
 
-      def self.icon_name
-        :'ellipsis-v'
-      end
+      def self.icon_name; end
+      def self.sidebar_position; end
+      def self.sidebar_size; end
+      def self.sidebar_url; end
+      def self.sidebar_mode; end
 
       def show
         respond_to do |format|

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

@@ -2,13 +2,13 @@
   #main-navbar-content
     %ul.navbar-nav
       %li.nav-item
-        %button.btn.btn-circle.btn-lg.btn-light#engine-sidebar-trigger
+        %button.btn.btn-circle.btn-lg.btn-light{ 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|
           %li.nav-item
-            %button.btn.btn-circle.btn-lg.btn-light{ id: "#{sc.name.underscore.gsub('/', '-')}-trigger" }
-              %i.fas{ class: "fa-#{sc.icon_name}"}
+            %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,32 +1,33 @@
-%aside#engine-sidebar.py-2
+%aside#sidebar-engines.p-2.pr-0{ data: { sidebar: { position: :left, size: '20rem', state: :closed, mode: :push } } }
   .container-fluid
     .row
       .col-12
         - administrador_helper(self).engines.each do |_, engine|
-          .administrador-engine-in-sidebar.mb-4{ id: dom_id(engine), class: dom_class(engine) }
-            %h5.administrador-engine-name= engine.translated_name
-            .list-group
-              %a.list-group-item.administrador-link-to-engine-home{ href: send(engine.router_name).root_path }
-                %i.fas.fa-home
-                %span.hidden-sm-down.small= t('.home')
+          .administrador-engine.mb-4.text-secondary{ id: dom_id(engine), class: dom_class(engine) }
+            %h6.text-uppercase.administrador-engine-name
+              %i.fas.fa-home
+              = 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|
-                .list-group-item
-                  %a.administrador-link-to-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :index) }
-                    %i.fas.fa-folder
-                    %span.hidden-sm-down.small= rc.resource_class.model_name.human(count: :other)
-                  - if rc.available_rest_actions.include?(:new)
-                    %a.float-right.btn.btn-xs.btn-primary.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
-                      %i.fas.fa-plus
-                  %span.administrador-object-count.float-right.badge.badge-pill.badge-light= rc.resource_count
+                %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|
-                .list-group-item
-                  %a.administrador-link-to-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :show) }
-                    %i.fas.fa-file
-                    %span.hidden-sm-down.small= rc.resource_class.model_name.human
-                  - if rc.available_rest_actions.include?(:new)
-                    %a.float-right.btn.btn-xs.btn-primary.administrador-link-to-new-resources{ href: send(engine.router_name).url_for(controller: "/#{rc.name.underscore.gsub('_controller', '')}", action: :new) }
-                      %i.fas.fa-plus
+                %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|
-                %a.list-group-item{ href: send(engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :new) }
-                  %i.fas.fa-running
-                  %span.hidden-sm-down.small= sc.service_class.model_name.human(count: :other)
+                %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

@@ -1,4 +1,7 @@
 - engine.sidebar_controllers.each do |sc|
-  - id = sc.name.underscore.gsub('/', '-')
-  %aside.py-2{ id: "#{id}-sidebar" }
-  = offcanvas(self).offcanvas("#{id}-sidebar", modifiers: 'right,overlay', triggerButton: "##{id}-trigger", load: send(engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :show, format: :html, only_path: true) )
+  - id = "sidebar-#{sc.name.underscore.gsub('/', '-')}"
+  - position = sc.sidebar_position || :right
+  - size = sc.sidebar_size || '250px'
+  - url = sc.sidebar_url || send(engine.router_name).url_for(controller: "/#{sc.name.underscore.gsub('_controller', '')}", action: :show, format: :html, only_path: true)
+  - mode = sc.sidebar_mode || :modal
+  %aside.py-2{ id: id, data: { sidebar: { position: position, size: size, state: :closed, mode: :modal, load: url } } }

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

@@ -8,8 +8,6 @@
     %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"}/
-    / js-offcanvas CSS
-    %link{:href => "https://unpkg.com/js-offcanvas@1.2.8/dist/_css/prefixed/js-offcanvas.css", :rel => "stylesheet"}/
     / Fonts
     %link{:href => "https://fonts.googleapis.com/css?family=Poppins", :rel => "stylesheet"}/
     / jQuery JS
@@ -18,8 +16,6 @@
     %script{:crossorigin => "anonymous", :integrity => "sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=", :src => "https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"}
     / jQuery redirect JS
     %script{:src => "https://cdn.jsdelivr.net/npm/jquery.redirect@1.1.4/jquery.redirect.min.js"}
-    / js-offcanvas JS
-    %script{:src => "https://unpkg.com/js-offcanvas@1.2.8/dist/_js/js-offcanvas.pkgd.min.js"}
 
     - Administrador::Configuration.engines.each do |engine, options|
       = "<!-- Javascript for #{engine} -->".html_safe
@@ -38,25 +34,24 @@
 
     = render partial: 'html_head_extras'
   %body{ administrador_helper(self).body_html }
-    .container-fluid.c-offcanvas-content-wrapper
-      .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
-                #main-content
+    #main-content
+      .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
 
     = render "/administrador/application/sidebars/engine"
-    = offcanvas(self).offcanvas("engine-sidebar", modifiers: 'left,overlay', triggerButton: "#engine-sidebar-trigger" )
 
     = administrador_helper(self).render_engine_sidebars
     / Optional JavaScript

data/config/locales/de.yml

@@ -2,8 +2,6 @@ de:
   administrador:
     application:
       sidebars:
-        engine:
-          home: 'Home'
         i18n:
           title: 'Überseztungen'
         messages:

data/lib/administrador/version.rb

@@ -1,3 +1,3 @@
 module Administrador
-  VERSION = '0.0.9.pre'.freeze
+  VERSION = '0.0.10.pre'.freeze
 end

data/lib/administrador.rb

@@ -8,6 +8,7 @@ require "rao-resource_controller"
 require "rao-resources_controller"
 require "rao-service_controller"
 require "simple_form"
+require "simple_sidebar"
 require "bootstrap4-kaminari-views"
 require "rails-i18n"
 require "administrador/feature"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrador
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre
+  version: 0.0.10.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_sidebar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4.pre
 - !ruby/object:Gem::Dependency
   name: bootstrap4-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +399,7 @@ files:
 - app/assets/stylesheets/administrador/application/layout.css
 - app/assets/stylesheets/administrador/application/page-actions.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
@@ -404,8 +419,6 @@ files:
 - app/models/administrador/application_record.rb
 - app/view_helpers/administrador/application_view_helper.rb
 - app/view_helpers/administrador/breadcrumbs_view_helper.rb
-- app/view_helpers/administrador/offcanvas_view_helper.rb
-- app/views/administrador/application/_main_sidebar_right.html.haml
 - app/views/administrador/application/_navbar.html.haml
 - app/views/administrador/application/sidebars/_engine.html.haml
 - app/views/administrador/application/sidebars/_i18n.html.haml
@@ -469,7 +482,6 @@ files:
 - app/views/administrador/sidebar_controller/base/show.html.haml
 - app/views/breadcrumbs/_render.html.haml
 - app/views/layouts/administrador/application.html.haml
-- app/views/offcanvas_view_helper/_offcanvas.html.erb
 - config/initializers/localized_engines_fix.rb
 - config/locales/de.yml
 - config/locales/en.yml

data/app/view_helpers/administrador/offcanvas_view_helper.rb

@@ -1,8 +0,0 @@
-module Administrador
-  class OffcanvasViewHelper < Rao::ViewHelper::Base
-    def offcanvas(id, options = {})
-      on_open_url = options.delete(:load)
-      c.render partial: 'offcanvas_view_helper/offcanvas', locals: { id: id, options: options, on_open_url: on_open_url }
-    end
-  end
-end

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

@@ -1 +0,0 @@
-%aside#offcanvas-right.py-2

data/app/views/offcanvas_view_helper/_offcanvas.html.erb

@@ -1,11 +0,0 @@
-<script>
-$(document).ready(function() {
-  $('#<%= id %>').offcanvas({
-<%= options.collect { |k,v| "    #{k}: \"#{v}\"" }.join(",\n").html_safe %>
-  })
-<% if on_open_url.present? %>
-  .on( "open.offcanvas", function( e ){ $( "#<%= id %>" ).load("<%= on_open_url %>"); } )
-<% end %>
-  ;
-});
-</script>