itsf_backend 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aa67a62f46eec27de9f3bc8d811708cfaa93f3d
-  data.tar.gz: 36d7dd982be6f157d03691c1ae801400a6357130
+  metadata.gz: 5691ac4f916cbb8e579376b552022c306c95ed07
+  data.tar.gz: 14463dc4f14178a8522811d95cdf2938193d5fda
 SHA512:
-  metadata.gz: 57b945928db7e7c0e25b0dfbecc86e057469e6aa003eaad4516f8fb5454207b9b5989b697e3ba39b797a5acfbd6c82847d88ebeea8fcecac312a819778643894
-  data.tar.gz: 9ee3d1316d314b955f42ceef014f4b39fc346fc424560d6938f2788d50d0035765e40282d835a9b1e1b0d0603744b956267c52daee041bc99fb1654f77c19f8c
+  metadata.gz: 688ea40c5f9318eda64cfb22cf7a55822dd6acb91da6e9aef5e1d8dce891949af889839fa16f74ea92253bbf00330e86d51b6dd3ab6e17c5ccdfea195672a1d2
+  data.tar.gz: 9219bcb15f27ffcf73da09eb96cebe624a43cf516825abd49f980f9308095861b85309d1bf710f21aae1b38f93d99972913fb2789b9d00ea89dda71fb53c612e

data/app/assets/stylesheets/itsf/backend/application.css.less

@@ -28,8 +28,9 @@
 @import "application/navigation-logo.css.less";
 @import "application/panel-footer-pagination.css.less";
 @import "application/panel-with-actions.css.less";
-@import "application/sidebar.css.less";
+/* @import "application/sidebar.css.less"; */
 @import "application/table-actions.css.less";
 @import "application/table-responsive.css.less";
 @import "application/tab-with-nav.css.less";
 @import "application/ui-autocomplete.css.less";
+@import "application/vertical-navigation.css.less";

data/app/assets/stylesheets/itsf/backend/application/vertical-navigation.css.less

@@ -0,0 +1,5 @@
+@media (min-width: 768px) {
+  #vertical-navigation {
+    margin-top: 60px;
+  }
+}

data/app/controllers/itsf/backend/dashboard_controller.rb

@@ -1,6 +1,7 @@
 module Itsf::Backend
   class DashboardController < Configuration.dashboard_base_controller.constantize
     helper Itsf::Backend::ApplicationHelper
+    helper Itsf::Backend::BootstrapHelper
     helper MultiClientHelper if Itsf::Backend.features?(:multi_client)
     
     layout 'itsf/backend/base'

data/app/controllers/itsf/backend/home_controller.rb

@@ -1,6 +1,7 @@
 module Itsf::Backend
   class HomeController < Configuration.home_base_controller.constantize
     helper Itsf::Backend::ApplicationHelper
+    helper Itsf::Backend::BootstrapHelper
     helper MultiClientHelper if Itsf::Backend.features?(:multi_client)
 
     def index

data/app/helpers/itsf/backend/bootstrap_helper.rb

@@ -0,0 +1,9 @@
+module Itsf
+  module Backend
+    module BootstrapHelper
+      def accordion_menu(options = {}, &block)
+        Bootstrap::AccordionMenu.new(self, options, &block).perform
+      end
+    end
+  end
+end

data/app/renderers/bootstrap/accordion_menu.rb

@@ -0,0 +1,24 @@
+module Bootstrap
+  class AccordionMenu
+    def initialize(view, options = {}, &block)
+      options.reverse_merge!(identifier: SecureRandom.urlsafe_base64, icon: 'folder-open')
+
+      @identifier = options.delete(:identifier)
+      @title      = options.delete(:title)
+      @icon      = options.delete(:icon)
+      @view       = view
+      @block      = block
+    end
+
+    def perform
+       items = @view.capture { @block.call(self) }
+       @view.render partial: 'bootstrap/accordion_menu', locals: { identifier: @identifier, title: @title, items: items, icon: @icon }
+     end
+
+    def item(options = {})
+      options.reverse_merge!(icon: nil, target: nil, title: nil, item_count: nil)
+
+      @view.render partial: 'bootstrap/accordion_menu/item', locals: options
+    end
+  end
+end

data/app/views/bootstrap/_accordion_menu.haml

@@ -0,0 +1,10 @@
+.accordion-menu.panel-group{ id: "accordion-menu-#{identifier}" }
+  .panel.panel-default
+    .panel-heading
+      %h4.panel-title
+        %a{"data-parent" => "#accordion-menu-#{identifier}", "data-toggle" => "collapse", href: "#accordion-menu-collapse-#{identifier}" }
+          %span{ class: "glyphicon.glyphicon-#{icon}" }
+          = title
+    .panel-collapse.collapse.in{ id: "accordion-menu-collapse-#{identifier}" }
+      %table.table.table-striped.table-hover.table-condensed
+        = items

data/app/views/bootstrap/accordion_menu/_item.haml

@@ -0,0 +1,8 @@
+%tr
+  %td
+    = link_to(target) do
+      %span{ class: "glyphicon glyphicon-#{icon}" }
+      = title
+    - unless item_count.nil?
+      %span.badge.pull-right
+        = item_count

data/app/views/layouts/itsf/backend/_vertical_navigation.haml

@@ -1,21 +1,10 @@
-#engine-navigations
-  #accordion.panel-group
-    - Itsf::Backend::Configuration.backend_engines.each do |engine|
-      - if !respond_to?(:engine_policy) || engine_policy(engine).access?
-        .panel.panel-default
-          .panel-heading
-            %h4.panel-title
-              %a{"data-parent" => "#accordion", "data-toggle" => "collapse", :href => "#collapse-#{engine.name.underscore.dasherize.gsub('/', '-')}"}
-                = t("classes.#{engine.name.underscore}")
-          .panel-collapse.collapse.in{ id: "collapse-#{engine.name.underscore.dasherize.gsub('/', '-')}" }
-            %div.list-group
-              = link_to(send(engine.engine_name).root_path, class: 'list-group-item') do
-                = t(".home")
-              - controllers = engine.to_s.gsub('::Engine', '::Configuration').constantize.registered_controllers.call
-              - controllers.each do |kontroller|  
-                - resource_klass = kontroller.resource_class
-                - if !Itsf::Backend.features?(:pundit) || policy(resource_klass).index?
-                  = link_to(send(engine.engine_name).url_for(controller: "/#{kontroller.controller_path}"), class: 'list-group-item') do
-                    = resource_klass.model_name.human(count: :other)
-                    %span.badge.badge-default= kontroller.resource_count.respond_to?(:call) ? instance_exec(&kontroller.resource_count) : kontroller.resource_count
-
+- Itsf::Backend::Configuration.backend_engines.each do |engine|
+  - if !respond_to?(:engine_policy) || engine_policy(engine).access?
+    = accordion_menu(identifier: engine.name.parameterize, title: t("classes.#{engine.name.underscore}"), icon: 'menu-down') do |menu|
+      = menu.item(icon: 'home', target: send(engine.engine_name).root_path, title: t(".home"))
+      - controllers = engine.to_s.gsub('::Engine', '::Configuration').constantize.registered_controllers.call
+      - controllers.each do |kontroller|  
+        - resource_klass = kontroller.resource_class
+        - if !Itsf::Backend.features?(:pundit) || policy(resource_klass).index?
+          - resource_count = kontroller.resource_count.respond_to?(:call) ? instance_exec(&kontroller.resource_count) : kontroller.resource_count
+          = menu.item(icon: 'list', target: send(engine.engine_name).url_for(controller: "/#{kontroller.controller_path}"), title: resource_klass.model_name.human(count: :other), item_count: resource_count)

data/app/views/layouts/itsf/backend/base.html.haml

@@ -33,16 +33,18 @@
   %body
     #auxiliary-navigation
       = render 'layouts/itsf/backend/auxiliary_navigation'
-    #wrapper
-      #sidebar-wrapper.brand-primary-background-color
-        = render 'layouts/itsf/backend/vertical_navigation'
 
-      #page-content-wrapper
-        .container-fluid
-          .row
-            .col-lg-12
-              = bootstrap_flash
-              = yield
+    .container-fluid
+      .row
+        .col-md-3.col-lg-2
+          #vertical-navigation
+            = render 'layouts/itsf/backend/vertical_navigation'
+        .col-md-9.col-lg-10
+          .container-fluid
+            .row
+              .col-lg-12
+                = bootstrap_flash
+                = yield
 
 
     %footer.footer-sticky

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '3.0.2'
+    VERSION = '3.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -494,6 +494,7 @@ files:
 - app/assets/stylesheets/itsf/backend/application/table-actions.css.less
 - app/assets/stylesheets/itsf/backend/application/table-responsive.css.less
 - app/assets/stylesheets/itsf/backend/application/ui-autocomplete.css.less
+- app/assets/stylesheets/itsf/backend/application/vertical-navigation.css.less
 - app/assets/stylesheets/itsf/backend/bootstrap_and_overrides.css.less
 - app/assets/stylesheets/itsf/backend/vendor/jquery.dragtable.css
 - app/assets/stylesheets/itsf/backend/vendor/timeline.min.css
@@ -535,13 +536,16 @@ files:
 - app/forms/concerns/form/additional_submit_buttons.rb
 - app/forms/concerns/form/ui_autocomplete.rb
 - app/helpers/itsf/backend/application_helper.rb
+- app/helpers/itsf/backend/bootstrap_helper.rb
 - app/inputs/fake_checkbox_input.rb
 - app/inputs/fake_text_input.rb
 - app/policies/itsf/backend/base_policy.rb
 - app/policies/itsf/backend/dashboard_policy.rb
 - app/policies/itsf/backend/engine_policy.rb
 - app/policies/itsf/backend/service/base_policy.rb
-- app/presenters/bootstrap_table_presenter.rb.old
+- app/renderers/bootstrap/accordion_menu.rb
+- app/views/bootstrap/_accordion_menu.haml
+- app/views/bootstrap/accordion_menu/_item.haml
 - app/views/itsf/backend/dashboard/_dashboard_panel.html.haml
 - app/views/itsf/backend/dashboard/_head_extras.html.haml
 - app/views/itsf/backend/dashboard/index.html.haml

data/app/presenters/bootstrap_table_presenter.rb.old

@@ -1,106 +0,0 @@
-class BootstrapTablePresenter < Admino::Table::Presenter
-  private
-
-  def table_html_options
-    { class: 'table table-striped table-hover table-admino table-scrollable table-condensed' }
-  end
-
-  def head_row(collection_klass, query, view_context)
-    HeadRow.new(collection_klass, query, view_context)
-  end
-
-  def resource_row(resource, view_context)
-    ResourceRow.new(resource, view_context)
-  end
-
-  class HeadRow < Admino::Table::HeadRow
-    def column(*args, &block)
-      attribute_name, label, html_options = parse_column_args(args)
-
-      if label.nil?
-        label = column_label(attribute_name)
-      elsif label.is_a? Symbol
-        label = column_label(label)
-      end
-
-      html_options = complete_column_html_options(
-        attribute_name,
-        html_options
-      )
-
-      # sorting_scope = html_options.delete(:sorting)
-      # sorting_html_options = html_options.delete(:sorting_html_options) { {} }
-
-      # if sorting_scope
-      #   raise ArgumentError, 'query object is required' unless query
-      #   label = query.sorting.scope_link(sorting_scope, label, sorting_html_options)
-      # end
-      if Itsf::Backend.features?(:ransack)
-        html_options.reverse_merge!(sortable: true, sortable_options: [])
-        sortable = html_options.delete(:sortable)
-        sortable_options = html_options.delete(:sortable_options)
-        if sortable_options.empty?
-          sortable_options << attribute_name
-          sortable_options << resource_klass.human_attribute_name(attribute_name) 
-        end
-
-
-        if sortable
-          label = h.sort_link(h.instance_variable_get("@q"), *sortable_options)
-          # label = h.sort_link(h.instance_variable_get("@q"), attribute_name)
-        else
-          label = label.to_s
-        end
-      end
-
-      @columns << h.content_tag(:th, label, html_options)
-    end
-  end
-
-  class ResourceRow < Admino::Table::ResourceRow
-    # def to_html
-    #   buffer = @columns
-
-    #   if @actions.any?
-    #     html_options = column_html_options(:actions)
-    #     buffer << h.content_tag(:td, html_options) do
-    #       actions_wrapper do
-    #         @actions.join(" ").html_safe
-    #       end
-    #     end
-    #   end
-
-    #   buffer.html_safe
-    # end
-
-    # def actions_wrapper(&block)
-    #   h.content_tag(:div, { class: 'btn-group' }, &block)
-    # end
-
-    # def edit_action_url
-    #   view_context.edit_resource_url(resource)
-    # end
-
-    # def destroy_action_url
-    #   view_context.resource_url(resource)
-    # end
-
-    # def show_action_html_options
-    #   { class: 'btn btn-default btn-xs' }
-    # end
-
-    # def edit_action_html_options
-    #   { class: 'btn btn-default btn-xs' }
-    # end
-
-    # def destroy_action_html_options
-    #   {
-    #     method: :delete,
-    #     class: 'btn btn-danger btn-xs',
-    #     data: {
-    #       confirm: I18n.t('confirmations.delete')
-    #     }
-    #   }
-    # end
-  end
-end