chaltron 0.3.2 → 1.0.0

data/lib/generators/chaltron/templates/app/views/home/test.html.erb

@@ -2,11 +2,9 @@
   <div class='container-fluid'>
     <h1>Test #<%= @test %></h1>
     <p>
-      We use <%= link_to 'simple-navigation',
-      'https://github.com/codeplant/simple-navigation' %> and
-      <%= link_to 'simple_navigation_renderers',
-      'https://github.com/ShPakvel/simple_navigation_renderers' %>
-      to display navbar menu.
+      Chaltron uses <%= link_to 'simple-navigation',
+      'https://github.com/codeplant/simple-navigation' %>
+      to build navbar menu.
     </p>
     <p>
       Edit <code>config/navigation.rb</code> to setup your own navbar

data/lib/generators/chaltron/templates/app/views/layouts/_footer.html.erb

@@ -1,10 +1,8 @@
-<nav class='navbar navbar-inverse navbar-fixed-bottom'>
-  <div class='container-fluid'>
-    <%= content_tag :p, class: 'navbar-text' do %>
-      <%= icon('github') %>
-      Created with
-      <%= link_to 'chaltron', 'https://github.com/vicvega/chaltron', class: 'navbar-link' %>
-    <% end %>
-    <%= content_tag :p, revision, class: 'navbar-text pull-right' unless revision.nil? %>
-  </div>
+<nav class='navbar fixed-bottom navbar-dark bg-dark py-0'>
+  <%= content_tag :div, class: 'navbar-text' do %>
+    <%= icon('github') %>
+    Created with
+    <%= link_to 'chaltron', 'https://github.com/vicvega/chaltron', class: 'navbar-link' %>
+  <% end %>
+  <%= content_tag :div, revision, class: 'navbar-text ' unless revision.nil? %>
 </nav>

data/lib/generators/chaltron/templates/app/views/layouts/_navbar.html.erb

@@ -1,17 +1,10 @@
-<nav class='navbar navbar-inverse navbar-fixed-top' role='navigation'>
-  <div class='container-fluid'>
-    <div class='navbar-header'>
-      <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='#navbar-menu'>
-        <span class='sr-only'>Toggle navigation</span>
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-      </button>
-      <%= link_to 'Home', root_url, class: 'navbar-brand' %>
-    </div>
-    <div class='collapse navbar-collapse' id='navbar-menu'>
-      <%= render_navigation expand_all: true %>
-      <%= render_navigation expand_all: true, context: :chaltron %>
-    </div>
+<nav class='navbar fixed-top navbar-expand-lg navbar-dark bg-dark py-0'>
+  <%= link_to 'Home', root_url, class: 'navbar-brand' %>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation" aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navigation">
+    <%= render_navigation expand_all: true %>
+    <%= render_navigation expand_all: true, context: :chaltron %>
   </div>
 </nav>

data/lib/generators/chaltron/templates/config/initializers/chaltron.rb

@@ -2,66 +2,13 @@ Chaltron.setup do |config|
   # Add new roles to the right and NEVER change role order, or you'll break every role bitmask
   # config.roles = %w( admin user_admin )
 
-  # If LDAP enabled (see config/initializers/devise.rb), chaltron must use
-  # email field and may use first_name, last_name, full_name, department.
-  # Here is the field mapping on you own LDAP server.
-  # Default values are the following:
-  # config.ldap_field_mappings = {
-  #   first_name: 'givenname',
-  #   last_name: 'cn',
-  #   department: 'department',
-  #   email: 'mail'
-  # }
+  # If ldap enabled (see config/initializers/devise.rb), set this to true to
+  # allow every ldap authenitcated users to access you application
+  # config.ldap_allow_all = false
 
-  # If LDAP enabled, set this to true to allow every ldap authenitcated
-  # users to access you application
-  # config.ldap_allow_all = true
-
-  # You may set here default roles granted to new users (if automatically created)
+  # Default roles granted to new users (if automatically created)
   # config.default_roles = []
 
-  # Here you may specify a different base for your LDAP groups
-  # If not specified the :base parameter defined in Devise.omniauth_configs[:ldap] will be used
-  # config.ldap_group_base = 'ou=groups,dc=example,dc=com'
-
-  # Here you may specify a filter to retrieve LDAP group membership
-  # Accept entry (an instance of Chaltron::LDAP::Person) as parameter
-  # Default is
-  # config.ldap_group_member_filter = -> (entry) { "uniquemember=#{entry.dn}" }
-
-  # Roles granted to new users may be retrieved by LDAP group membership.
-  # config.ldap_role_mappings = {
-  #   'DN_of_LDAP_group1' => 'role1',
-  #   'DN_of_LDAP_group2' => 'role2'
-  # }
-
-  # The following callback is called after a successful LDAP authentication
-  # The callback may manipulate the user instance and
-  # must return user if ok, nil if not allowed do login
-  # Takes two parameters:
-  #  - user, current instance of User
-  #  - ldap, a new instance of Chaltron::LDAP::Connection
-  # Default is the following (it does nothing and return user)
-  # config.ldap_after_authenticate =  -> (user, ldap) { user }
-  #
-  # Example:
-  # config.ldap_after_authenticate = -> (user, ldap) {
-  #   ldap.find_by_uid(user.username).entry.enabled == ['true'] ? user : nil
-  # }
-
-  # The following callback is called before logout of an LDAP user
-  # Takes two parameters:
-  #  - user, current instance of User
-  #  - ldap, a new instance of Chaltron::LDAP::Connection
-  # Default is the following (does nothing)
-  # config.ldap_before_logout =  -> (user, ldap) { }
-  #
-  # Example:
-  # config.ldap_before_logout = -> (user, ldap) {
-  #   ldap.update_attributes(user.extern_uid, { lastLogout: Time.now.strftime('%Y%m%d%H%M%S%z') })
-  # }
-  #
-
   # If syslog enabled, all Log records will be available also in syslog flow
   # config.enable_syslog = false
   # config.syslog_facility = Syslog::LOG_SYSLOG

data/lib/generators/chaltron/templates/config/navigation.rb

@@ -4,10 +4,11 @@ SimpleNavigation::Configuration.run do |navigation|
   # Specify a custom renderer if needed.
   # The default renderer is SimpleNavigation::Renderer::List which renders HTML lists.
   # The renderer can also be specified as option in the render_navigation call.
-  navigation.renderer = SimpleNavigationBootstrap::Bootstrap3
+  # navigation.renderer = SimpleNavigation::Renderer::List
 
   # Specify the class that will be applied to active navigation items.
-  # Defaults to 'selected' navigation.selected_class = 'your_selected_class'
+  # Defaults to 'selected'
+  navigation.selected_class = 'active'
 
   # Specify the class that will be applied to the current leaf of
   # active navigation items. Defaults to 'simple-navigation-active-leaf'
@@ -54,14 +55,14 @@ SimpleNavigation::Configuration.run do |navigation|
     #                            against the current URI.  You may also use a proc, or the symbol <tt>:subpath</tt>.
     #
 
-    primary.item :news, { icon: 'fa fa-fw fa-bullhorn', text: 'Link 1' }, home_test1_path
-    primary.item :concerts, { icon: 'fa fa-fw fa-line-chart', text: 'Link 2' }, home_test2_path
-    primary.item :video, { icon: 'fa fa-fw fa-book', text: 'Link 3' }, home_test3_path
-    primary.item :info, { icon: 'fa fa-fw fa-hand-o-down', text: 'Submenu' }, '#' do |info_nav|
-      info_nav.item :main_info_page, { icon: 'fa fa-fw fa-paw', text: 'Link 4' }, home_test4_path
-      info_nav.item :about_info_page, { icon: 'fa fa-fw fa-headphones', text: 'Link 5' }, home_test5_path
-      info_nav.item :contact_info_page, { icon: 'fa fa-fw fa-soccer-ball-o', text: 'Link 6' }, home_test6_path
+    primary.item :news, 'Link 1', home_test1_path, link_html: { icon: 'bullhorn' }
+    primary.item :concerts, 'Link 2', home_test2_path, link_html: { icon: 'line-chart' }
+    primary.item :video, 'Link 3', home_test3_path, link_html: { icon: 'book' }
+    primary.item :info, 'Submenu', '#', link_html: { icon: 'hand-o-down' } do |info_nav|
+      info_nav.item :main_info_page, 'Link 4', home_test4_path, link_html: { icon: 'paw' }
+      info_nav.item :about_info_page, 'Link 5', home_test5_path, link_html: { icon: 'headphones' }
+      info_nav.item :contact_info_page, 'Link 6', home_test6_path, link_html: { icon: 'soccer-ball-o' }
     end
-
+    primary.item :user, 'Link7', home_test7_path, link_html: { icon: 'user' }
   end
 end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= bootstrap_form_for(@<%= singular_table_name %>, layout: :horizontal) do |f| %>
+<%%= bootstrap_form_for(@<%= singular_table_name %>, layout: :horizontal, label_col: 'col-sm-2 col-form-label', control_col: 'col-sm-10') do |f| %>
 
 <% attributes.each do |attribute| -%>
   <% if attribute.field_type == :check_box -%>
@@ -10,9 +10,12 @@
   <% end -%>
 <% end -%>
 
-  <%%= f.form_group class: 'form-actions' do %>
-    <%%= f.submit 'Submit', class: 'btn btn-primary' %>
-    <%%= back_link class: 'btn btn-default pull-right' %>
-  <%% end %>
+  <div class='form-group row'>
+    <div class='col-sm-2'></div>
+    <div class='col-sm-10'>
+      <%%= f.submit 'Submit', class: 'btn btn-primary' %>
+      <%%= back_link class: 'btn btn-default pull-right' %>
+    </div>
+  </div>
 
 <%% end %>

data/lib/templates/erb/scaffold/edit.html.erb

@@ -1,20 +1,20 @@
 <div class='container-fluid'>
-  <h3 class='page-header'>Editing <%= singular_table_name %></h3>
+  <h3 class='pt-4'>Editing <%= singular_table_name %></h3>
   <div class='row'>
 
     <div class='col-md-3'>
-      <ul class='list-group'>
-        <%%= link_to <%= index_helper %>_path, class: 'list-group-item' do %>
+      <div class='list-group'>
+        <%%= link_to <%= index_helper %>_path, class: 'list-group-item list-group-item-action' do %>
           <%%= icon('list') %> <%= singular_table_name.capitalize %> index
         <%% end %>
-        <%%= link_to @<%= singular_table_name %>, class: 'list-group-item' do %>
+        <%%= link_to @<%= singular_table_name %>, class: 'list-group-item list-group-item-action' do %>
           <%%= icon('eye') %> Show
         <%% end %>
         <%%= link_to @<%= singular_table_name %>, data: {confirm: 'Are you sure?'},
-              method: :delete, class: 'list-group-item list-group-item-danger' do %>
-        <%%= icon('trash') %> Delete
-      <%% end %>
-      </ul>
+              method: :delete, class: 'list-group-item list-group-item-danger list-group-item-action' do %>
+          <%%= icon('trash') %> Delete
+        <%% end %>
+      </div>
     </div>
 
     <div class='col-md-9'>

data/lib/templates/erb/scaffold/index.html.erb

@@ -1,26 +1,20 @@
 <div class='container-fluid'>
-  <h3 class='page-header'><%= plural_table_name.titleize %></h3>
+  <h3 class='pt-4'><%= plural_table_name.titleize %></h3>
   <div class='row'>
-    <div class='col-md-12'>
-      <div class='panel panel-default'>
-        <div class='panel-body'>
-          <%%= content_tag 'table', class: 'table table-striped datatable' do %>
-            <thead>
-              <tr><% attributes.each do |attribute| %>
-                <th><%= attribute.name.humanize %></th><% end %>
-              </tr>
-            </thead>
-            <tbody>
-              <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-                <tr><% attributes.each do |attribute| %>
-                  <td><%%= link_to <%= singular_table_name %>.<%= attribute.name %>, <%= singular_table_name %> %></td><% end %>
-                </tr>
-              <%% end -%>
-            </tbody>
-          <%% end %>
-        </div>
-      </div>
-    </div>
+    <%%= content_tag 'table', class: 'table table-striped datatable' do %>
+      <thead>
+        <tr><% attributes.each do |attribute| %>
+          <th><%= attribute.name.humanize %></th><% end %>
+        </tr>
+      </thead>
+      <tbody>
+        <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+          <tr><% attributes.each do |attribute| %>
+            <td><%%= link_to <%= singular_table_name %>.<%= attribute.name %>, <%= singular_table_name %> %></td><% end %>
+          </tr>
+        <%% end -%>
+      </tbody>
+    <%% end %>
   </div>
   <hr>
   <%%= link_to new_<%= singular_table_name %>_path, class: 'btn btn-primary btn-lg' do %>

data/lib/templates/erb/scaffold/new.html.erb

@@ -1,8 +1,4 @@
 <div class='container-fluid'>
-  <h3 class='page-header'>New <%= singular_table_name %></h3>
-  <div class='row'>
-    <div class='col-md-12'>
-      <%%= render 'form' %>
-    </div>
-  </div>
+  <h3 class='pt-4'>New <%= singular_table_name %></h3>
+  <%%= render 'form' %>
 </div>

data/lib/templates/erb/scaffold/show.html.erb

@@ -1,25 +1,25 @@
 <div class='container-fluid'>
-  <h3 class='page-header'>Show <%= singular_table_name %></h3>
+  <h3 class='pt-4'>Show <%= singular_table_name %></h3>
   <div class='row'>
 
     <div class='col-md-3'>
-      <ul class='list-group'>
-        <%%= link_to <%= index_helper %>_path, class: 'list-group-item' do %>
+      <div class='list-group'>
+        <%%= link_to <%= index_helper %>_path, class: 'list-group-item list-group-item-action' do %>
           <%%= icon('list') %> <%= singular_table_name.capitalize %> index
         <%% end %>
-        <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'list-group-item' do %>
+        <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'list-group-item list-group-item-action' do %>
           <%%= icon('wrench') %> Edit
         <%% end %>
-        <%%= link_to new_<%= singular_table_name %>_path, class: 'list-group-item' do %>
+        <%%= link_to new_<%= singular_table_name %>_path, class: 'list-group-item list-group-item-action' do %>
           <%%= icon('plus') %> New <%= singular_table_name %>
         <%% end %>
-      </ul>
+      </div>
     </div>
 
     <div class='col-md-9'>
-      <div class='panel panel-default'>
-        <div class='panel-heading'>Details</div>
-        <ul class='list-group'><% attributes.each do |attribute| %>
+      <div class='card'>
+        <div class='card-header'>Details</div>
+        <ul class='list-group list-group-flush'><% attributes.each do |attribute| %>
           <li class='list-group-item'>
             <span><%= attribute.human_name %>: </span>
             <strong><%%= @<%= singular_table_name %>.<%= attribute.name %> %></strong>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gitlab_omniauth-ldap
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: gitlab_omniauth-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-sass
+  name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_navigation_bootstrap
+  name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-datatables-rails
+  name: jquery-datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -389,12 +389,12 @@ files:
 - app/assets/javascripts/chaltron/datatables.js.coffee
 - app/assets/javascripts/chaltron/localization.js.coffee
 - app/assets/javascripts/chaltron/main.js.coffee
-- app/assets/javascripts/dataTables/extras/dataTables.select.min.js
+- app/assets/javascripts/chaltron/navbar.js.coffee
+- app/assets/javascripts/dataTables/dataTables.bootstrap4.min.js
 - app/assets/stylesheets/chaltron.scss
 - app/assets/stylesheets/chaltron/layout.scss
+- app/assets/stylesheets/chaltron/logs.scss
 - app/assets/stylesheets/chaltron/mixins.scss
-- app/assets/stylesheets/dataTables/dataTables.bootstrap.css
-- app/assets/stylesheets/dataTables/extras/select.dataTables.css
 - app/controllers/chaltron/ldap_controller.rb
 - app/controllers/chaltron/logs_controller.rb
 - app/controllers/chaltron/omniauth_callbacks_controller.rb
@@ -405,7 +405,6 @@ files:
 - app/helpers/chaltron/logs_helper.rb
 - app/helpers/chaltron/users_helper.rb
 - app/helpers/chaltron_helper.rb
-- app/models/application_record.rb
 - app/models/authorizable.rb
 - app/models/locales/en.yml
 - app/models/locales/it.yml
@@ -415,7 +414,6 @@ files:
 - app/views/chaltron/ldap/multi_create.html.erb
 - app/views/chaltron/ldap/multi_new.html.erb
 - app/views/chaltron/ldap/search.html.erb
-- app/views/chaltron/logs/_log.html.erb
 - app/views/chaltron/logs/index.html.erb
 - app/views/chaltron/logs/show.html.erb
 - app/views/chaltron/users/_form.html.erb
@@ -505,7 +503,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Move faster and break things - revisited for rails 4