chaltron 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a26003fe77f074bc5338438162de022181977c
-  data.tar.gz: 5cd76996bc7515911ae75c2eb4a2a0e18eacc365
+  metadata.gz: de230dc89777b90b7e81ef42da838180a72bd0ba
+  data.tar.gz: 8743eb92b1f9d903d4a7e5b40659f41647bea35e
 SHA512:
-  metadata.gz: 3164668cb7f1a83b126fc4adc955b1818bb0cb6beefbe659eb20f004a1ff07e455522133306825aa37f4f8568e26d9d97eab59ad4d5582b71f2d87dcd45a618c
-  data.tar.gz: 22b51a5420bc8f7c84d3875ce45e0f54ccc1fb584bac5bd3e59eb3e04f361efd745bcea933c07ff5398ee166400796485196392273e384b3864131d5adeb36f2
+  metadata.gz: 8d6f5040e582d1db6cae0ff8d4687ffb8975897a35b5f2cfacd39c118d5ab486a655479cda93ea24d86126537683ea058428a223e64eaef9d04c6986aaf14117
+  data.tar.gz: 4d6af95dddf706c9d68d3d148900bab57d4fb7b872bc2a5e56fc0c4cf91e5a0e44be8491ef38d46208464f8532be93e6ba631152a3f466369b2fed3508bf6c08

data/Rakefile

@@ -16,12 +16,10 @@ end
 
 APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
+load 'rails/tasks/statistics.rake'
 
 require 'rake/clean'
 
-
-load 'rails/tasks/statistics.rake'
-
 Bundler::GemHelper.install_tasks
 
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }

data/app/assets/stylesheets/chaltron/layout.scss

@@ -4,6 +4,7 @@ body {
 
 div#content {
   margin-top: 40px;
+  margin-bottom: 40px;
 }
 
 /**

data/config/chaltron_navigation.rb

@@ -11,7 +11,7 @@ SimpleNavigation::Configuration.run do |navigation|
         admin.item :users,
           { icon: 'fa fa-fw fa-users',
             text: I18n.t('chaltron.menu.users')
-          }, users_url, highlights_on: /\/(users|ldap)/ if can?(:manage, User)
+          }, users_url, highlights_on: /\/(users|ldap)(?!\/self_(show|edit|update))/ if can?(:manage, User)
         admin.item :logs,
           { icon: 'fa fa-fw fa-book',
             text: I18n.t('chaltron.menu.logs')
@@ -20,7 +20,7 @@ SimpleNavigation::Configuration.run do |navigation|
       primary.item :logged, current_user.display_name.html_safe, nil do |user|
         user.item :self_edit, { icon: 'fa fa-fw fa-user',
                   text: I18n.t('chaltron.menu.self_show') }, self_show_users_url,
-                  highlights_on: /\/self_(show|edit)/
+                  highlights_on: /\/self_(show|edit|update)/
 
         user.item :logout, { icon: 'fa fa-fw fa-sign-out', text: 'Logout' },
                   destroy_user_session_url, method: :delete

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/generators/chaltron/install_generator.rb

@@ -38,6 +38,7 @@ RUBY
       # html
       remove_file 'app/views/layouts/application.html.erb'
       directory 'app/views/layouts'
+      directory 'app/assets/images'
       # javascript
       inject_into_file 'app/assets/javascripts/application.js',
         "//= require chaltron\n", before: '//= require_tree .'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -357,15 +357,8 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/images/700x300.gif
-- app/assets/images/favicon.ico
-- app/assets/images/slide1.gif
-- app/assets/images/slide2.gif
-- app/assets/images/slide3.gif
 - app/assets/javascripts/chaltron.js
-- app/assets/javascripts/chaltron.js~
 - app/assets/javascripts/chaltron/datatables.js.coffee
-- 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/dataTables.bootstrap.min.js
@@ -442,6 +435,11 @@ files:
 - lib/chaltron/ldap/user.rb
 - lib/chaltron/version.rb
 - lib/generators/chaltron/install_generator.rb
+- lib/generators/chaltron/templates/app/assets/images/700x300.gif
+- lib/generators/chaltron/templates/app/assets/images/favicon.ico
+- lib/generators/chaltron/templates/app/assets/images/slide1.gif
+- lib/generators/chaltron/templates/app/assets/images/slide2.gif
+- lib/generators/chaltron/templates/app/assets/images/slide3.gif
 - lib/generators/chaltron/templates/app/assets/javascripts/home.js.coffee
 - lib/generators/chaltron/templates/app/assets/stylesheets/home.scss
 - lib/generators/chaltron/templates/app/controllers/home_controller.rb
@@ -462,7 +460,6 @@ files:
 - lib/templates/erb/scaffold/_form.html.erb
 - lib/templates/erb/scaffold/edit.html.erb
 - lib/templates/erb/scaffold/index.html.erb
-- lib/templates/erb/scaffold/index.html.erb~
 - lib/templates/erb/scaffold/new.html.erb
 - lib/templates/erb/scaffold/show.html.erb
 homepage: https://github.com/vicvega/chaltron
@@ -485,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Move faster and break things - revisited for rails 4

data/app/assets/javascripts/chaltron.js~

@@ -1,13 +0,0 @@
-//= require bootstrap-sprockets
-//= require dataTables/jquery.dataTables
-//= require dataTables/dataTables.bootstrap
-//= require dataTables/extras/dataTables.responsive
-//= require dataTables/extras/dataTables.select
-//= require nprogress
-//= require nprogress-turbolinks
-//= require nprogress-ajax
-//= require moment
-//= require moment/it.js
-//= require datetime-moment
-
-//= require_tree ./chaltron

data/app/assets/javascripts/chaltron/datatables.js.coffee~

@@ -1,106 +0,0 @@
-class DataTableBuilder
-  constructor: ->
-    @defaultOptions = {
-      destroy: true
-      autoWidth: false
-      responsive: true
-      stateSave: true
-    }
-
-  go: ->
-    # users
-    div = $('table#users')
-    @initTable(container: div)
-    # ldap create
-    div = $('table#ldap_create')
-    @initTable(container: div, params: {
-      paging: false
-      # default sorting: username (2nd column) asc
-      order: [[1,'asc']]
-      columnDefs: [
-        { orderable: false, className: 'select-checkbox', targets: 0 }
-      ]
-      dom: 'T<"clear">lfrtip'
-      select: { style: 'multi', info: false }
-    })
-
-    # logs
-    div = $('table#logs')
-    @initTable(container: div, params: {
-      processing: true
-      serverSide: true
-      ajax: div.data('source')
-      # default sorting: date (2nd column) desc
-      order: [[1,'desc']]
-      columnDefs: [
-        { orderSequence: ['desc', 'asc'], targets: [ 1 ] }
-      ]
-    })
-
-    # datatable class
-    div = $('table.datatable')
-    @initTable(container: div)
-
-    # datatable class (server side processing)
-    div = $('table[remote=true].datatable')
-    @initTable(container: div, params: {
-      processing: true
-      serverSide: true
-      ajax: div.data('source')
-    })
-
-  initTable: ({container, params} = {}) ->
-    if container.length > 0
-      params ?= {}
-      # add custom params if any
-      settings = $.extend({}, @defaultOptions, params)
-      # add language
-      settings = $.extend({}, settings, {language: Chaltron.locales('datatable')})
-
-      container.DataTable(settings)
-
-$(document).on 'page:change', ->
-  table = new DataTableBuilder
-  table.go()
-
-# specify date format (for sorting)
-$.fn.dataTable.moment('DD MMM HH:mm')
-
-$ ->
-  $('form#ldap_create').on 'submit', (e) ->
-
-    count = $('table#ldap_create').DataTable().rows( { selected: true } ).count()
-
-
-    console.log("----------------------------------- " + count)
-
-    if count == 0
-      message = Chaltron.locales('error_message')
-      label = Chaltron.locales('error_label')
-
-      flash = $("div.alert-warning:contains('#{message}')")
-      if flash.length == 0
-        # display warning flash message
-        flash = $("<div><strong>#{label}</strong>: #{message}</div>").addClass('alert alert-warning')
-        $('.flash-container').append(flash)
-      else
-        flash.show()
-      # closable
-      flash.click -> $(@).fadeOut()
-      # self disappearing
-      setTimeout (-> flash.fadeOut()), 5000
-
-      e.preventDefault()
-
-    for i in [0..count-1]
-
-      console.log("------CICLO FOR----------------------------- " + i)
-      console.log("------CICLO FOR----------------------------- " + $('table#ldap_create').DataTable().rows( { selected: true } ).data()[i][1])
-
-
-      $('<input/>', {
-        name: 'uids[]',
-        type: 'hidden',
-        multiple: 'multiple',
-        value: $('table#ldap_create').DataTable().rows( { selected: true } ).data()[i][1]
-      }).appendTo(@)

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

@@ -1,28 +0,0 @@
-<div class='container-fluid'>
-  <h3 class='page-header'><%= 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>
-              <%%= content_tag_for(:tr, @<%= plural_table_name %>) do |<%= singular_table_name %>| %><% attributes.each do |attribute| %>
-                <td><%%= link_to <%= singular_table_name %>.<%= attribute.name %>, <%= singular_table_name %> %></td><% end %>
-              <%% end -%>
-            </tbody>
-          <%% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-  <hr>
-  <%%= link_to new_<%= singular_table_name %>_path, class: 'btn btn-primary btn-large' do %>
-    <%%= icon('plus') %> New
-  <%% end %>
-
-</div>