itsf_backend 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c6db79d22d4007559203369e1cdba6054143db
-  data.tar.gz: b4426e4b944e3896e176a13c2d3c2fc4ad93c410
+  metadata.gz: f10f146ccece0283434d65b74694792730e6e456
+  data.tar.gz: aa91271a030f5c339f5355995524b8bb202909dc
 SHA512:
-  metadata.gz: a94a73d38f029c3e8860e310da114002363a3a98a6a0ccb0abc76ce052b057dd5839a15ef5d05d9142461eed69a090e9696d577303337d2ce89542af91f66ea6
-  data.tar.gz: 40392bc4006a1d531b5c69ec1b5a3f84b06f115b1c35664280af5b095c46415f610751f4f917df91150b76784e3d02cacb2171971f10fa4e4a328096562e1a6e
+  metadata.gz: 85d62fcedaf46a798e8374c63ab3154940cd2e05d1217ee8c7be5ac4b57fcaaa4f159ba9baf7c5830c67bf02e980b15551206953d7728a0585e46d5c38e12681
+  data.tar.gz: 9bbb239ee75f5fc7729844f38ed40d47c39fc36d98c5424f903ce0008d06862cd7924ba0b7acbe1bf3c9e553a2921e5e750e15220a726ed4f44663cd084a24af

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

@@ -1,8 +1,15 @@
-@media (min-width: 1200px) {
+@media (min-width: 992px) {
   .sidebar-nav .navbar-brand {
-    float: unset;
+    /* float: unset; */
+    line-height: 24px;
   } 
 
+  .sidebar-nav #navigation-logo {
+    display: inline-block;
+    margin-top: 15px;
+    margin-left: 15px;
+  }
+
   .sidebar-nav .navbar-brand .logo {
      margin: 0 auto;
   }

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

@@ -1,4 +1,4 @@
-#navigation-logo {
+#main-navigation:not(.sidebar-nav) #navigation-logo {
   margin-top: 6px;
   margin-right: 8px;
 

data/app/views/itsf/backend/home/index.html.haml

@@ -1,5 +1,6 @@
 #page-title.bottom-margin-1
-  %h3= t('.title', engine_name: t("classes.#{engine.name.underscore}"))
+  .col-lg-12
+    %h3= t('.title', engine_name: t("classes.#{engine.name.underscore}"))
 
 .col-lg-12= render 'dashboard_panel', engine: engine
 

data/app/views/layouts/itsf/backend/{_main_navigation.html.haml → _engine_navigation.html.haml}

@@ -1,6 +1,6 @@
 - Itsf::Backend::Configuration.backend_engines.each do |engine|
   - if !respond_to?(:engine_policy) || engine_policy(engine).access?
     - if request.original_url  =~ /#{main_app.send("#{engine.engine_name}_path")}/
-      = render partial: 'layouts/itsf/backend/main_navigation_drop_down', locals: { engine: engine }
+      = render partial: 'layouts/itsf/backend/engine_navigation_drop_down', locals: { engine: engine }
     - else
       %li= link_to t("classes.#{engine.name.underscore}"), main_app.send("#{engine.engine_name}_path")

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

@@ -0,0 +1,18 @@
+%button.navbar-toggle(type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse")
+  %span.icon-bar
+  %span.icon-bar
+  %span.icon-bar
+#navigation-logo.pull-left
+  = render 'layouts/itsf/backend/logo'
+= Itsf::Backend::Configuration.title_link.call(self)
+.navbar-collapse.collapse.navbar-responsive-collapse
+  %ul.nav.navbar-nav
+    = render 'layouts/itsf/backend/engine_navigation'
+  %ul.nav.navbar-nav.pull-right
+    = render_i18n_navigation
+  - if respond_to?(:render_user_navigation)
+    %ul.nav.navbar-nav.pull-right
+      = render_user_navigation(dropdown: true)
+  - if Itsf::Backend.features?(:multi_client)
+    %ul.nav.navbar-nav.pull-right
+      = render_client_navigation   

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

@@ -26,33 +26,24 @@
       = "<!-- CSS for #{engine} -->".html_safe
       = stylesheet_link_tag engine.name.underscore.gsub('/', '_').gsub('_engine', ''), media: "all"
 
-  %body
+  %body{ class: Itsf::Backend::Configuration.main_navigation_style.eql?(:vertical) ? 'p-t-2' : nil }
     - if Itsf::Backend::Configuration.main_navigation_style.eql? :horizontal
-      .navbar.navbar-default.navbar-static-top
+      #main-navigation.navbar.navbar-default.navbar-static-top
         .container-fluid
-          %button.navbar-toggle(type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse")
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-          #navigation-logo.pull-left
-            = render 'layouts/itsf/backend/logo'
-          = Itsf::Backend::Configuration.title_link.call(self)
-          .navbar-collapse.collapse.navbar-responsive-collapse
-            %ul.nav.navbar-nav
-              = render 'layouts/itsf/backend/main_navigation'
-            %ul.nav.navbar-nav.pull-right
-              = render_i18n_navigation
-            - if respond_to?(:render_user_navigation)
-              %ul.nav.navbar-nav.pull-right
-                = render_user_navigation(dropdown: true)
-            - if Itsf::Backend.features?(:multi_client)
-              %ul.nav.navbar-nav.pull-right
-                = render_client_navigation   
+          = render 'layouts/itsf/backend/main_navigation'
 
     .container-fluid
       .row
-        .col-lg-12
-          = bootstrap_flash
-          = yield
+        - if Itsf::Backend::Configuration.main_navigation_style.eql? :vertical
+          .col-md-12
+            = bootstrap_flash
+            = yield
+        - else
+          .col-md-3
+            #main-navigation.sidebar-nav.navbar.navbar-default
+              = render 'layouts/itsf/backend/main_navigation'
+          .col-md-9
+            = bootstrap_flash
+            = yield
       %footer
         = render 'layouts/itsf/backend/footer'

data/config/locales/de.yml

@@ -56,12 +56,12 @@ de:
           view: 'Anzeigen'
         index:
           back: "Zurück"
-          title: "Willkommen im %{engine_name}-Modul"
+          title: "Willkommen im Modul für %{engine_name}"
       dashboard:
         dashboard_panel:
           view: 'Anzeigen'
         index:
-          title: "Willkommen im %{engine_name}-Modul"
+          title: "Willkommen im Modul für %{engine_name}"
       resource:
         base:
           edit:
@@ -103,6 +103,8 @@ de:
       backend:
         base:
           title: "%{application_name}"
+        main_navigation:
+          title: "%{application_name}"
   locales:
     de: Deutsch
   routes:

data/config/locales/en.yml

@@ -95,7 +95,7 @@ en:
   layouts:
     itsf:
       backend:
-        base:
+        main_navigation:
           title: "%{application_name}"
   locales:
     en: English

data/lib/generators/itsf/backend/install/templates/initializer.rb

@@ -1,9 +1,11 @@
 Itsf::Backend.configure do |config|
-  # Manually disable features
+  # Manually enable features.
   # 
-  # Default: config.disabled_features: []
-  # 
-  config.disabled_features = []
+  # Options: kaminari, :pundit, :ransack
+  #
+  # Default: config.enabled_features: []
+  #
+  config.enabled_features = [:kaminari]
   
   # Set the base controller the backend dashboards
   #

data/lib/itsf/backend/configuration.rb

@@ -16,7 +16,7 @@ module Itsf
       mattr_accessor :engine_mount_point
       mattr_accessor :title_link
       mattr_accessor :resource_title_methods
-      mattr_accessor(:disabled_features) { [] }
+      mattr_accessor(:enabled_features) { [] }
       mattr_accessor(:hidden_attributes_for) do
         { index: [], show: [], edit: [] }
       end

data/lib/itsf/backend/features.rb

@@ -6,7 +6,7 @@ module Itsf
       end
 
       def features?(name)
-        Gem::Specification.find_all_by_name(name.to_s).any? && !Itsf::Backend::Configuration.disabled_features.include?(name)
+        Gem::Specification.find_all_by_name(name.to_s).any? && Itsf::Backend::Configuration.enabled_features.include?(name)
       end
     end
   end

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '1.2.1'
+    VERSION = '1.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -564,10 +564,11 @@ files:
 - app/views/itsf/backend/service/base/index.html.haml
 - app/views/itsf/backend/service/base/invoke.html.haml
 - app/views/itsf/backend/service/base/success.html.haml
+- app/views/layouts/itsf/backend/_engine_navigation.html.haml
+- app/views/layouts/itsf/backend/_engine_navigation_drop_down.html.haml
 - app/views/layouts/itsf/backend/_footer.html.haml
 - app/views/layouts/itsf/backend/_logo.html.haml
-- app/views/layouts/itsf/backend/_main_navigation.html.haml
-- app/views/layouts/itsf/backend/_main_navigation_drop_down.html.haml
+- app/views/layouts/itsf/backend/_main_navigation.haml
 - app/views/layouts/itsf/backend/base.html.haml
 - config/initializers/assets.rb
 - config/initializers/extend_object.rb