diff --git a/Gemfile b/Gemfile index 196e24e..f52d456 100644 --- a/Gemfile +++ b/Gemfile @@ -13,34 +13,37 @@ gem 'jruby-jars', '~> 9.4.2' # gem 'kaui', path: '../killbill-admin-ui' gem 'kaui', github: 'killbill/killbill-admin-ui', ref: 'master' -gem 'kanaui' +# gem 'kanaui' # gem 'kanaui', :path => '../killbill-analytics-ui' -# gem 'kanaui', github: 'killbill/killbill-analytics-ui', ref: 'master' +gem 'kanaui', github: 'killbill/killbill-analytics-ui', ref: 'master' -gem 'killbill-avatax' +# gem 'killbill-avatax' # gem 'killbill-avatax', :path => '../killbill-avatax-ui' -# gem 'killbill-avatax', github: 'killbill/killbill-avatax-ui', ref: 'master' +gem 'killbill-avatax', github: 'killbill/killbill-avatax-ui', ref: 'master' -gem 'killbill-kpm-ui' +# gem 'killbill-kpm-ui' # gem 'killbill-kpm-ui', :path => '../killbill-kpm-ui' -# gem 'killbill-kpm-ui', github: 'killbill/killbill-kpm-ui', ref: 'master' +gem 'killbill-kpm-ui', github: 'killbill/killbill-kpm-ui', ref: 'master' -gem 'killbill-payment-test-ui' +# gem 'killbill-payment-test-ui' # gem 'killbill-payment-test-ui', :path => '../killbill-payment-test-ui' -# gem 'killbill-payment-test-ui', github: 'killbill/killbill-payment-test-ui', ref: 'master' +gem 'killbill-payment-test-ui', github: 'killbill/killbill-payment-test-ui', ref: 'master' -gem 'kenui' +# gem 'kenui' # gem 'kenui', :path => '../killbill-email-notifications-ui' -# gem 'kenui', github: 'killbill/killbill-email-notifications-ui', ref: 'master' +gem 'kenui', github: 'killbill/killbill-email-notifications-ui', ref: 'master' -gem 'killbill-deposit' +# gem 'killbill-deposit' # gem 'killbill-deposit', :path => '../killbill-deposit-ui' -# gem 'killbill-deposit', github: 'killbill/killbill-deposit-ui', ref: 'main' +gem 'killbill-deposit', github: 'killbill/killbill-deposit-ui', ref: 'main' gem 'killbill-client' # gem 'killbill-client', :path => '../killbill-client-ruby' # gem 'killbill-client', github: 'killbill/killbill-client-ruby', ref: 'master' +# gem 'killbill-assets-ui', :path => '../killbill-assets-ui' +gem 'killbill-assets-ui', github: 'killbill/killbill-assets-ui', ref: 'main' + gem 'i18n' gem 'tzinfo-data' @@ -67,7 +70,6 @@ end # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails' gem 'uglifier' end diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index c572a62..d30471e 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -4,48 +4,18 @@ //= link jquery.spin.js //= link jquery-ui.js //= link mustache.js -//= link bootstrap-sprockets.js //= link application.js //= link bootstrap-datepicker.js //= link jquery-ui/widgets/autocomplete.js -//= link dataTables/jquery.dataTables.js -//= link dataTables/bootstrap/3/jquery.dataTables.bootstrap.js -//= link dataTables/extras/dataTables.colVis.js -//= link_directory ../stylesheets .scss //= link_directory ../stylesheets .css //= link_directory ../javascripts .js - +//= link assets/common.js //= link bootstrap-datepicker/core.js //= link bootstrap-datepicker3.css - //= link d3.js -//= link dataTables/jquery.dataTables.css //= link jquery-ui/autocomplete.css -//= link dataTables/bootstrap/3/jquery.dataTables.bootstrap.css -//= link bootstrap_and_overrides.css -//= link kaui/kaui.scss -//= link kaui/tooltip.scss -//= link kaui/tooltip.css -//= link kaui_application.css - +//= link kaui/kaui.css //= link kaui/logo.png - -// Kanaui -//= require js-routes -// Required by log4javascript -//= require jquery-ui/widgets/autocomplete -//= require log4javascript -//= require spin -//= require jquery.spin -// KPM -// kpm/kpm.js - -// payment_test -// payment_test/payment_test.js - -// Deposit -// deposit/deposit.js -// +//= link kanaui/kanaui.css // Kaui (needs to be loaded last for overrides) //= link kaui/kaui.js -// diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c94e555..7893420 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,21 +13,12 @@ // Common (order matters) //= require jquery //= require jquery_ujs -//= require dataTables/jquery.dataTables -//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap -//= require dataTables/extras/dataTables.colVis //= require d3 // Avoid loading all locales, just load the core //= require bootstrap-datepicker/core //= require mustache // // Kanaui -//= require js-routes -// Required by log4javascript -//= require jquery-ui/widgets/autocomplete -//= require log4javascript -//= require spin -//= require jquery.spin //= require kanaui/kanaui // // KPM diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b728567..82ff19c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,11 +9,9 @@ * compiled file, but it's generally better to create a new file per style scope. * * Common + *= require_self *= require font-awesome *= require bootstrap-datepicker3 - *= require dataTables/jquery.dataTables - *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap - *= require dataTables/extras/dataTables.colVis * * Kanaui *= require kanaui/kanaui @@ -31,4 +29,5 @@ * * Kaui (needs to be loaded last for overrides) *= require kaui/kaui + *= require assets/common */ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.erb b/app/assets/stylesheets/bootstrap_and_overrides.css.erb deleted file mode 100644 index 1e8201a..0000000 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.erb +++ /dev/null @@ -1,9 +0,0 @@ -/* Override Bootstrap 3 font locations */ -@font-face { - font-family: 'Glyphicons Halflings'; - src: url('<%= asset_path('glyphicons-halflings-regular.eot') %>'); - src: url('<%= asset_path('glyphicons-halflings-regular.eot?#iefix') %>') format('embedded-opentype'), - url('<%= asset_path('glyphicons-halflings-regular.woff') %>') format('woff'), - url('<%= asset_path('glyphicons-halflings-regular.ttf') %>') format('truetype'), - url('<%= asset_path('glyphicons-halflings-regular.svg#glyphicons_halflingsregular') %>') format('svg'); -}