killbill-kpm-ui 3.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +12 -1
  3. data/app/assets/javascripts/application.js +1 -4
  4. data/app/assets/stylesheets/application.css +2 -4
  5. data/app/views/kpm/layouts/kpm_application.html.erb +25 -22
  6. data/lib/kpm/engine.rb +2 -3
  7. data/lib/kpm/version.rb +1 -1
  8. metadata +3 -46
  9. data/app/assets/stylesheets/bootstrap_and_overrides.css +0 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d0be772188b7cdcde8980c1402cf847aaf3e50b451f04fb8738d7756f2022d7f
4
- data.tar.gz: 952122b3bf7007d7a4f5c8f0d8de311f37c0f8c2a243796edd33708cf0926281
3
+ metadata.gz: 567a176c7fce5c5aa551d01a85c5ae6f76979d50c7c36003ca2653b8f16a75b4
4
+ data.tar.gz: 06e7f360e47d1032773be81d61a0bca656ff5ba57c0e61a7f088a4d5f7b07142
5
5
  SHA512:
6
- metadata.gz: 1cd9f1fce18608cb03eefeb66d304bf122c8cdde02e1f6988524d3f48beadd456cb8eb2dbff8245e4391fda6fcb41ceb140d12abfc2b1c9228e35bdd5f6b5825
7
- data.tar.gz: 0d493ad68e58ebeb4097a5209c9ccc628f92674fd4dc45c611e8fad14bebde1738188fe1a799639766c06d3fa961ee4e898e2e49e0ea5dd3d5c35a24d2ad8f2f
6
+ metadata.gz: 4355e7ea93e2c0230f1aef1fdab9614f4175f614871a1ba8bc5ae3f0e4ce68f6e243aa4db58271df8bf2b525d64dadb2c877ffebef76bbdb50a71dbaf4114afe
7
+ data.tar.gz: 8548019f750789cec5b1f164176a629ecaa6f2f79afd8c46215616df5bf9f5a4f6ea69eda71b63702b06cd31984ac27822e962f6cc2b4d13ff9588c029d4180a
data/README.md CHANGED
@@ -14,7 +14,8 @@ Kill Bill compatibility
14
14
  | 0.2.y | 0.18.z (Rails 4) |
15
15
  | 0.3.y | 0.18.z (Rails 5) |
16
16
  | 1.x.y | 0.20.z (Rails 5) |
17
- | 2.x.y | 0.22.z (Rails 5) |
17
+ | 2.0.y | 0.22.z (Rails 5) |
18
+ | 2.1.y | 0.24.z (Rails 6) |
18
19
  | 3.x.y | 0.24.z (Rails 7) |
19
20
 
20
21
  Testing
@@ -32,3 +33,13 @@ To run tests:
32
33
  ```
33
34
  rails t
34
35
  ```
36
+
37
+ This plugin is using [killbill-assets-ui](https://github.com/killbill/killbill-assets-ui) to load the common assets.
38
+ If you want to override the assets you can add it to ```app/assets/stylesheet/kpm``` or ```app/assets/javascripts/kpm```
39
+
40
+ For integrate run with [killbill-admin-ui-standalone](https://github.com/killbill/killbill-admin-ui-standalone), please update the Gemfile to use KPM locally
41
+
42
+ ```
43
+ # gem 'killbill-kpm-ui'
44
+ gem 'killbill-kpm-ui', :path => '../killbill-kpm-ui'
45
+ ```
data/app/assets/javascripts/application.js CHANGED
@@ -10,8 +10,5 @@
10
10
  // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
11
11
  // about supported directives.
12
12
  //
13
- //= require jquery
14
- //= require jquery_ujs
15
- //= require dataTables/jquery.dataTables
16
- //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
17
13
  //= require kpm/kpm
14
+ //= require assets/common
data/app/assets/stylesheets/application.css CHANGED
@@ -11,8 +11,6 @@
11
11
  * file per style scope.
12
12
  *
13
13
  *= require_self
14
- *= require dataTables/jquery.dataTables
15
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
16
- *= require font-awesome
17
14
  *= require kpm/kpm
18
- */
15
+ *= require assets/common
16
+ */
data/app/views/kpm/layouts/kpm_application.html.erb CHANGED
@@ -1,31 +1,34 @@
1
1
  <!DOCTYPE html>
2
2
  <html>
3
- <head>
4
- <title>KPM</title>
5
- <%= yield :scripts %>
6
- <%= stylesheet_link_tag 'application', :media => 'all' %>
7
- <%= javascript_include_tag 'application' %>
8
- <%= csrf_meta_tags %>
9
- </head>
10
- <div class="container-fluid">
11
- <%- # :alert used by devise -%>
12
- <% [:error, :alert].each do |key| %>
13
- <% if flash[key] %>
3
+ <head>
4
+ <title>KPM</title>
5
+ <%= yield :scripts %>
6
+ <%= stylesheet_link_tag 'application', :media => 'all' %>
7
+ <%= javascript_include_tag 'application' %>
8
+ <%= csrf_meta_tags %>
9
+ </head>
10
+ <body>
11
+ <div class="container">
12
+ <div class="container-fluid">
13
+ <%- # :alert used by devise -%>
14
+ <% [:error, :alert].each do |key| %>
15
+ <% if flash[key] %>
16
+ <div class="row">
17
+ <div class="col-md-10 col-md-offset-2">
18
+ <div class="alert alert-error"><%= flash[key] %></div>
19
+ </div>
20
+ </div>
21
+ <% end %>
22
+ <% end %>
23
+ <% if flash[:notice] %>
14
24
  <div class="row">
15
25
  <div class="col-md-10 col-md-offset-2">
16
- <div class="alert alert-error"><%= flash[key] %></div>
26
+ <div class="alert alert-info"><%= flash[:notice] %></div>
17
27
  </div>
18
28
  </div>
19
29
  <% end %>
20
- <% end %>
21
- <% if flash[:notice] %>
22
- <div class="row">
23
- <div class="col-md-10 col-md-offset-2">
24
- <div class="alert alert-info"><%= flash[:notice] %></div>
25
- </div>
30
+ <%= yield %>
26
31
  </div>
27
- <% end %>
28
- <%= yield %>
29
- </div>
30
- </body>
32
+ </div>
33
+ </body>
31
34
  </html>
data/lib/kpm/engine.rb CHANGED
@@ -6,10 +6,9 @@
6
6
  # We need to explicitly require all of our dependencies listed in kpm.gemspec
7
7
  #
8
8
  # See also https://github.com/carlhuda/bundler/issues/49
9
- require 'jquery-rails'
10
- require 'jquery-datatables-rails'
11
- require 'font-awesome-rails'
9
+
12
10
  require 'killbill_client'
11
+ require 'killbill_assets_ui'
13
12
 
14
13
  module KPM
15
14
  class Engine < ::Rails::Engine
data/lib/kpm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module KPM
4
- VERSION = '3.0.1'
4
+ VERSION = '3.0.2'
5
5
  end
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill-kpm-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.1
4
+ version: 3.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kill Bill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-22 00:00:00.000000000 Z
11
+ date: 2024-01-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: font-awesome-rails
14
+ name: killbill-assets-ui
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -24,34 +24,6 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
- - !ruby/object:Gem::Dependency
28
- name: jquery-datatables-rails
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: jquery-rails
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: 4.5.1
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: 4.5.1
55
27
  - !ruby/object:Gem::Dependency
56
28
  name: killbill-client
57
29
  requirement: !ruby/object:Gem::Requirement
@@ -94,20 +66,6 @@ dependencies:
94
66
  - - "~>"
95
67
  - !ruby/object:Gem::Version
96
68
  version: '7.0'
97
- - !ruby/object:Gem::Dependency
98
- name: sass-rails
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- version: '0'
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - ">="
109
- - !ruby/object:Gem::Version
110
- version: '0'
111
69
  description: Rails UI plugin for the KPM plugin.
112
70
  email: killbilling-users@googlegroups.com
113
71
  executables: []
@@ -122,7 +80,6 @@ files:
122
80
  - app/assets/javascripts/kpm/kpm.js
123
81
  - app/assets/javascripts/kpm/logs_refresh.js
124
82
  - app/assets/stylesheets/application.css
125
- - app/assets/stylesheets/bootstrap_and_overrides.css
126
83
  - app/assets/stylesheets/kpm/kpm.css
127
84
  - app/assets/stylesheets/kpm/nodes_info.css
128
85
  - app/controllers/kpm/engine_controller.rb
data/app/assets/stylesheets/bootstrap_and_overrides.css DELETED
@@ -1,9 +0,0 @@
1
- /* Override Bootstrap 3 font locations */
2
- @font-face {
3
- font-family: 'Glyphicons Halflings';
4
- src: url('../assets/glyphicons-halflings-regular.eot');
5
- src: url('../assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
6
- url('../assets/glyphicons-halflings-regular.woff') format('woff'),
7
- url('../assets/glyphicons-halflings-regular.ttf') format('truetype'),
8
- url('../assets/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
9
- }