kaui 0.9.0 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (76) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -3
  3. data/Gemfile.lock +142 -89
  4. data/app/assets/javascripts/application.js +4 -1
  5. data/app/assets/javascripts/kaui/bootstrap-tweaks.js +1 -1
  6. data/app/assets/javascripts/kaui/datatables-tweaks.js +3 -0
  7. data/app/assets/stylesheets/application.css +2 -0
  8. data/app/assets/stylesheets/bootstrap_and_overrides.css +0 -41
  9. data/app/assets/stylesheets/datatables.scss +14 -0
  10. data/app/assets/stylesheets/layout.scss +19 -0
  11. data/app/controllers/kaui/account_timelines_controller.rb +6 -14
  12. data/app/controllers/kaui/sessions_controller.rb +3 -0
  13. data/app/controllers/kaui/subscriptions_controller.rb +8 -8
  14. data/app/models/kaui/ability.rb +1 -3
  15. data/app/models/kaui/allowed_user.rb +7 -2
  16. data/app/models/kaui/invoice.rb +21 -0
  17. data/app/views/kaui/account_emails/_account_emails_table.html.erb +1 -1
  18. data/app/views/kaui/account_timelines/show.html.erb +27 -27
  19. data/app/views/kaui/accounts/_form.html.erb +107 -111
  20. data/app/views/kaui/accounts/index.html.erb +1 -1
  21. data/app/views/kaui/accounts/show.html.erb +6 -6
  22. data/app/views/kaui/admin_allowed_users/new.html.erb +2 -2
  23. data/app/views/kaui/admin_tenants/new.html.erb +3 -3
  24. data/app/views/kaui/admin_tenants/show.html.erb +1 -1
  25. data/app/views/kaui/bundles/index.html.erb +1 -1
  26. data/app/views/kaui/bundles/show.html.erb +1 -1
  27. data/app/views/kaui/chargebacks/_form.html.erb +1 -1
  28. data/app/views/kaui/charges/_form.html.erb +2 -2
  29. data/app/views/kaui/credits/_form.html.erb +2 -2
  30. data/app/views/kaui/custom_fields/index.html.erb +1 -1
  31. data/app/views/kaui/home/index.html.erb +1 -1
  32. data/app/views/kaui/invoice_items/edit.html.erb +1 -1
  33. data/app/views/kaui/invoices/index.html.erb +1 -1
  34. data/app/views/kaui/invoices/show.html.erb +2 -2
  35. data/app/views/kaui/layouts/kaui_application.html.erb +14 -10
  36. data/app/views/kaui/payment_methods/_form.html.erb +3 -3
  37. data/app/views/kaui/payment_methods/_new_creditcard_payment_method.html.erb +2 -2
  38. data/app/views/kaui/payment_methods/_payment_methods_table.html.erb +5 -5
  39. data/app/views/kaui/payment_methods/index.html.erb +1 -1
  40. data/app/views/kaui/payments/index.html.erb +1 -1
  41. data/app/views/kaui/payments/new.html.erb +1 -1
  42. data/app/views/kaui/refunds/new.html.erb +2 -2
  43. data/app/views/kaui/subscriptions/_subscriptions_table.html.erb +5 -5
  44. data/app/views/kaui/subscriptions/new.html.erb +1 -1
  45. data/app/views/kaui/subscriptions/show.html.erb +5 -5
  46. data/app/views/kaui/tags/_tags_table.html.erb +2 -2
  47. data/app/views/kaui/tags/index.html.erb +1 -1
  48. data/app/views/kaui/tenants/index.html.erb +1 -1
  49. data/app/views/kaui/transactions/_form.html.erb +2 -2
  50. data/config/initializers/devise.rb +28 -243
  51. data/config/routes.rb +1 -1
  52. data/db/migrate/20150112232813_create_kaui_allowed_users.rb +2 -2
  53. data/kaui.gemspec +11 -5
  54. data/lib/kaui/engine.rb +2 -0
  55. data/lib/kaui/version.rb +1 -1
  56. data/test/dummy/.gitignore +1 -0
  57. data/test/dummy/config/database.yml +6 -2
  58. data/test/dummy/config/environments/development.rb +3 -8
  59. data/test/dummy/config/environments/production.rb +2 -0
  60. data/test/dummy/config/environments/test.rb +5 -4
  61. data/test/dummy/config/initializers/killbill_client.rb +0 -1
  62. data/test/dummy/config/initializers/secret_token.rb +1 -1
  63. data/test/dummy/db/schema.rb +27 -27
  64. data/test/functional/kaui/subscriptions_controller_test.rb +2 -2
  65. data/test/functional/kaui/tenants_controller_test.rb +1 -7
  66. data/test/integration/kaui/integration_test_helper.rb +4 -4
  67. data/test/killbill_test_helper.rb +7 -8
  68. data/test/test_helper.rb +1 -0
  69. data/test/unit/kaui/money_helper_test.rb +7 -1
  70. data/vendor/assets/stylesheets/css/bootstrap-datepicker.cd46d38.css +2 -2
  71. metadata +63 -24
  72. data/test/dummy/db/migrate/20150116052157_devise_create_kaui_users.kaui.rb +0 -13
  73. data/test/dummy/db/migrate/20150116052158_create_kaui_tenants.kaui.rb +0 -13
  74. data/test/dummy/db/migrate/20150116052159_create_kaui_allowed_users.kaui.rb +0 -20
  75. data/vendor/assets/javascripts/jquery.dataTables.min.js +0 -155
  76. data/vendor/assets/stylesheets/css/bootstrap.v2.2.1.min.css +0 -9
data/app/views/kaui/account_timelines/show.html.erb CHANGED
@@ -103,14 +103,14 @@
103
103
  <%= link_to 'Payment',
104
104
  kaui_engine.new_payment_path(:params => {:account_id => invoice.account_id,
105
105
  :invoice_id => invoice.invoice_id}),
106
- :class => "btn btn-mini #{'disabled' unless invoice.balance > 0}" %>
106
+ :class => "btn btn-xs #{'disabled' unless invoice.balance > 0}" %>
107
107
  </nobr>
108
108
  <% if can? :credit, Kaui::Invoice %>
109
109
  <nobr>
110
110
  <%= link_to 'Credit',
111
111
  kaui_engine.new_credit_path(:params => {:account_id => invoice.account_id,
112
112
  :invoice_id => invoice.invoice_id}),
113
- :class => 'btn btn-mini' %>
113
+ :class => 'btn btn-xs' %>
114
114
  </nobr>
115
115
  <% end %>
116
116
  <% if can? :charge, Kaui::Invoice %>
@@ -118,7 +118,7 @@
118
118
  <%= link_to 'Charge',
119
119
  kaui_engine.new_charge_path(:params => {:account_id => invoice.account_id,
120
120
  :invoice_id => invoice.invoice_id}),
121
- :class => 'btn btn-mini' %>
121
+ :class => 'btn btn-xs' %>
122
122
  </nobr>
123
123
  <% end %>
124
124
  </td>
@@ -187,7 +187,7 @@
187
187
  <%= link_to 'Refund', kaui_engine.new_refund_path(:params => {:payment_id => payment.payment_id,
188
188
  :account_id => @account.account_id,
189
189
  :invoice_id => payment.target_invoice_id}),
190
- :class => "btn btn-mini #{'disabled' unless payment.payment_id.present? and transaction.status == 'SUCCESS' }" %>
190
+ :class => "btn btn-xs #{'disabled' unless payment.payment_id.present? and transaction.status == 'SUCCESS' }" %>
191
191
  </nobr>
192
192
  <% end %>
193
193
  <% if can? :chargeback, Kaui::Payment %>
@@ -195,7 +195,7 @@
195
195
  <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => {:payment_id => payment.payment_id,
196
196
  :account_id => @account.account_id,
197
197
  :invoice_id => payment.target_invoice_id}),
198
- :class => "btn btn-mini #{'disabled' unless payment.payment_id.present? and transaction.status == 'SUCCESS'}" %>
198
+ :class => "btn btn-xs #{'disabled' unless payment.payment_id.present? and transaction.status == 'SUCCESS'}" %>
199
199
  </nobr>
200
200
  <% end %>
201
201
  <% elsif !invoice.present? %>
@@ -207,7 +207,7 @@
207
207
  :payment_method_id => payment.payment_method_id,
208
208
  :amount => transaction.amount,
209
209
  :currency => transaction.currency,
210
- :transaction_type => transaction_type), :class => 'btn btn-mini' %>
210
+ :transaction_type => transaction_type), :class => 'btn btn-xs' %>
211
211
  </nobr>
212
212
  <% end %>
213
213
  <% elsif %w(CAPTURE PURCHASE).include?(transaction.transaction_type) %>
@@ -218,7 +218,7 @@
218
218
  :payment_method_id => payment.payment_method_id,
219
219
  :amount => transaction.amount,
220
220
  :currency => transaction.currency,
221
- :transaction_type => transaction_type), :class => 'btn btn-mini' %>
221
+ :transaction_type => transaction_type), :class => 'btn btn-xs' %>
222
222
  </nobr>
223
223
  <% end %>
224
224
  <% end %>
@@ -318,26 +318,26 @@
318
318
  };
319
319
 
320
320
  function initTable() {
321
- return $("#timeline-table").dataTable({
322
- "sDom": "<'row-fluid'<'span6'l><'span6 tableSearch'f>r>t<'row-fluid clearfix'<'span6 pull-left'i><'span6 pages pull-right'p>>",
323
- "sPaginationType": "bootstrap",
324
- "oLanguage": {
325
- "sLengthMenu": "_MENU_ records per page"
326
- },
327
- "iDisplayLength": 100,
328
- "bRetrieve": true,
329
- // Force a predictive order for event types, invoices and payments
330
- "aaSorting": [[1, 'desc'], [4, 'asc'], [3, 'desc']],
331
- "aoColumns": [
332
- { "sType": 'date' },
333
- { "sType": 'date' },
334
- null,
335
- { "sType": 'timeline-event' },
336
- { "sType": 'timeline-details' },
337
- null,
338
- null
339
- ]
340
- });
321
+ return $("#timeline-table").dataTable({
322
+ "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
323
+ "sPaginationType": "bootstrap",
324
+ "oLanguage": {
325
+ "sLengthMenu": "_MENU_ records per page"
326
+ },
327
+ "iDisplayLength": 100,
328
+ "bRetrieve": true,
329
+ // Force a predictive order for event types, invoices and payments
330
+ "aaSorting": [[1, 'desc'], [4, 'asc'], [3, 'desc']],
331
+ "aoColumns": [
332
+ { "sType": 'date' },
333
+ { "sType": 'date' },
334
+ null,
335
+ { "sType": 'timeline-event' },
336
+ { "sType": 'timeline-details' },
337
+ null,
338
+ null
339
+ ]
340
+ });
341
341
  }
342
342
 
343
343
  function filterEachNode(rows) {
data/app/views/kaui/accounts/_form.html.erb CHANGED
@@ -1,115 +1,111 @@
1
1
  <%= form_for @account, :html => {:class => 'form-horizontal'} do |f| %>
2
- <fieldset class="newAccountForm clearfix">
3
- <div class="groupWrapper span6 pull-left">
4
- <div class="control-group">
5
- <%= f.label :name, 'Name *', :class => 'control-label' %>
6
- <div class="controls">
7
- <%= f.text_field :name, :class => 'input-small', :required => true %>
8
- </div>
9
- </div>
10
- <div class="control-group">
11
- <%= f.label :first_name_length, 'First name length', :class => 'control-label' %>
12
- <div class="controls">
13
- <%= f.text_field :first_name_length, :class => 'input-small' %>
14
- </div>
15
- </div>
16
- <div class="control-group">
17
- <%= f.label :external_key, 'External key *', :class => 'control-label' %>
18
- <div class="controls">
19
- <%= f.text_field :external_key, :class => 'input-small', :required => true %>
20
- </div>
21
- </div>
22
- <div class="control-group">
23
- <%= f.label :email, 'Email *', :class => 'control-label' %>
24
- <div class="controls">
25
- <%= f.text_field :email, :class => 'input-small', :required => true %>
26
- </div>
27
- </div>
28
- <div class="control-group">
29
- <%= f.label :bill_cycle_day_local, 'Bill cycle day', :class => 'control-label' %>
30
- <div class="controls">
31
- <%= f.text_field :bill_cycle_day_local, :class => 'input-small' %>
32
- </div>
33
- </div>
34
- <div class="control-group">
35
- <%= f.label :currency, 'Currency', :class => 'control-label' %>
36
- <div class="controls">
37
- <%= f.select :currency, currencies, {}, :class => 'input-small' %>
38
- </div>
39
- </div>
40
- <div class="control-group">
41
- <%= f.label :time_zone, 'Timezone', :class => 'control-label' %>
42
- <div class="controls">
43
- <%= f.collection_select :time_zone, ActiveSupport::TimeZone.all, :formatted_offset, :to_s, :class => 'input-large' %>
44
- </div>
45
- </div>
46
- <div class="control-group">
47
- <%= f.label :address1, 'Address line 1', :class => 'control-label' %>
48
- <div class="controls">
49
- <%= f.text_field :address1, :class => 'input-small' %>
50
- </div>
51
- </div>
52
- <div class="control-group">
53
- <%= f.label :address2, 'Address line 2', :class => 'control-label' %>
54
- <div class="controls">
55
- <%= f.text_field :address2, :class => 'input-small' %>
56
- </div>
57
- </div>
58
- </div>
59
- <div class="groupWrapper span6 pull-left">
60
- <div class="control-group">
61
- <%= f.label :postal_code, 'Zip code', :class => 'control-label' %>
62
- <div class="controls">
63
- <%= f.text_field :postal_code, :class => 'input-small' %>
64
- </div>
65
- </div>
66
- <div class="control-group">
67
- <%= f.label :company, 'Company', :class => 'control-label' %>
68
- <div class="controls">
69
- <%= f.text_field :company, :class => 'input-small' %>
70
- </div>
71
- </div>
72
- <div class="control-group">
73
- <%= f.label :city, 'City', :class => 'control-label' %>
74
- <div class="controls">
75
- <%= f.text_field :city, :class => 'input-small' %>
76
- </div>
77
- </div>
78
- <div class="control-group">
79
- <%= f.label :state, 'State', :class => 'control-label' %>
80
- <div class="controls">
81
- <%= f.text_field :state, :class => 'input-small' %>
82
- </div>
83
- </div>
84
- <div class="control-group">
85
- <%= f.label :country, 'Country', :class => 'control-label' %>
86
- <div class="controls">
87
- <%= f.country_select :country, {priority: %w(US CA), prompt: 'Please select a country'}, :class => 'input-large' %>
88
- </div>
89
- </div>
90
- <div class="control-group">
91
- <%= f.label :locale, 'Locale', :class => 'control-label' %>
92
- <div class="controls">
93
- <%= f.text_field :locale, :class => 'input-small' %>
94
- </div>
95
- </div>
96
- <div class="control-group">
97
- <%= f.label :phone, 'Phone', :class => 'control-label' %>
98
- <div class="controls">
99
- <%= f.text_field :phone, :class => 'input-small' %>
100
- </div>
101
- </div>
102
- <div class="control-group">
103
- <%= f.label :is_migrated, 'Migrated?', :class => 'control-label' %>
104
- <div class="controls">
105
- <%= f.check_box :is_migrated, :class => 'input-small' %>
106
- </div>
107
- </div>
108
- <div class="control-group">
109
- <%= f.label :is_notified_for_invoices, 'Notified for invoices?', :class => 'control-label' %>
110
- <div class="controls">
111
- <%= f.check_box :is_notified_for_invoices, :class => 'input-small' %>
112
- </div>
2
+ <fieldset>
3
+ <div class="control-group">
4
+ <%= f.label :name, 'Name *', :class => 'control-label' %>
5
+ <div class="controls">
6
+ <%= f.text_field :name, :class => 'input-sm', :required => true %>
7
+ </div>
8
+ </div>
9
+ <div class="control-group">
10
+ <%= f.label :first_name_length, 'First name length', :class => 'control-label' %>
11
+ <div class="controls">
12
+ <%= f.text_field :first_name_length, :class => 'input-sm' %>
13
+ </div>
14
+ </div>
15
+ <div class="control-group">
16
+ <%= f.label :external_key, 'External key *', :class => 'control-label' %>
17
+ <div class="controls">
18
+ <%= f.text_field :external_key, :class => 'input-sm', :required => true %>
19
+ </div>
20
+ </div>
21
+ <div class="control-group">
22
+ <%= f.label :email, 'Email *', :class => 'control-label' %>
23
+ <div class="controls">
24
+ <%= f.text_field :email, :class => 'input-sm', :required => true %>
25
+ </div>
26
+ </div>
27
+ <div class="control-group">
28
+ <%= f.label :bill_cycle_day_local, 'Bill cycle day', :class => 'control-label' %>
29
+ <div class="controls">
30
+ <%= f.text_field :bill_cycle_day_local, :class => 'input-sm' %>
31
+ </div>
32
+ </div>
33
+ <div class="control-group">
34
+ <%= f.label :currency, 'Currency', :class => 'control-label' %>
35
+ <div class="controls">
36
+ <%= f.select :currency, currencies, {}, :class => 'input-sm' %>
37
+ </div>
38
+ </div>
39
+ <div class="control-group">
40
+ <%= f.label :time_zone, 'Timezone', :class => 'control-label' %>
41
+ <div class="controls">
42
+ <%= f.collection_select :time_zone, ActiveSupport::TimeZone.all, :formatted_offset, :to_s, :class => 'input-lg' %>
43
+ </div>
44
+ </div>
45
+ <div class="control-group">
46
+ <%= f.label :address1, 'Address line 1', :class => 'control-label' %>
47
+ <div class="controls">
48
+ <%= f.text_field :address1, :class => 'input-sm' %>
49
+ </div>
50
+ </div>
51
+ <div class="control-group">
52
+ <%= f.label :address2, 'Address line 2', :class => 'control-label' %>
53
+ <div class="controls">
54
+ <%= f.text_field :address2, :class => 'input-sm' %>
55
+ </div>
56
+ </div>
57
+ <div class="control-group">
58
+ <%= f.label :postal_code, 'Zip code', :class => 'control-label' %>
59
+ <div class="controls">
60
+ <%= f.text_field :postal_code, :class => 'input-sm' %>
61
+ </div>
62
+ </div>
63
+ <div class="control-group">
64
+ <%= f.label :company, 'Company', :class => 'control-label' %>
65
+ <div class="controls">
66
+ <%= f.text_field :company, :class => 'input-sm' %>
67
+ </div>
68
+ </div>
69
+ <div class="control-group">
70
+ <%= f.label :city, 'City', :class => 'control-label' %>
71
+ <div class="controls">
72
+ <%= f.text_field :city, :class => 'input-sm' %>
73
+ </div>
74
+ </div>
75
+ <div class="control-group">
76
+ <%= f.label :state, 'State', :class => 'control-label' %>
77
+ <div class="controls">
78
+ <%= f.text_field :state, :class => 'input-sm' %>
79
+ </div>
80
+ </div>
81
+ <div class="control-group">
82
+ <%= f.label :country, 'Country', :class => 'control-label' %>
83
+ <div class="controls">
84
+ <%= f.country_select :country, {priority: %w(US CA), prompt: 'Please select a country'}, :class => 'input-lg' %>
85
+ </div>
86
+ </div>
87
+ <div class="control-group">
88
+ <%= f.label :locale, 'Locale', :class => 'control-label' %>
89
+ <div class="controls">
90
+ <%= f.text_field :locale, :class => 'input-sm' %>
91
+ </div>
92
+ </div>
93
+ <div class="control-group">
94
+ <%= f.label :phone, 'Phone', :class => 'control-label' %>
95
+ <div class="controls">
96
+ <%= f.text_field :phone, :class => 'input-sm' %>
97
+ </div>
98
+ </div>
99
+ <div class="control-group">
100
+ <%= f.label :is_migrated, 'Migrated?', :class => 'control-label' %>
101
+ <div class="controls">
102
+ <%= f.check_box :is_migrated, :class => 'input-sm' %>
103
+ </div>
104
+ </div>
105
+ <div class="control-group">
106
+ <%= f.label :is_notified_for_invoices, 'Notified for invoices?', :class => 'control-label' %>
107
+ <div class="controls">
108
+ <%= f.check_box :is_notified_for_invoices, :class => 'input-sm' %>
113
109
  </div>
114
110
  </div>
115
111
 
data/app/views/kaui/accounts/index.html.erb CHANGED
@@ -21,7 +21,7 @@
21
21
  <%= javascript_tag do %>
22
22
  $(document).ready(function() {
23
23
  $('#accounts-table').dataTable({
24
- "sDom": "<'row-fluid'<'span6'l><'span6 tableSearch'f>r>t<'row-fluid clearfix'<'span6 pull-left'i><'span6 pages pull-right'p>>",
24
+ "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
25
25
  "sPaginationType": "bootstrap",
26
26
  "bProcessing": true,
27
27
  "bServerSide": true,
data/app/views/kaui/accounts/show.html.erb CHANGED
@@ -57,20 +57,20 @@
57
57
  <%= link_to 'Payment',
58
58
  kaui_engine.pay_all_invoices_account_path(@account.account_id),
59
59
  :method => :post,
60
- :class => "btn btn-mini #{"disabled" if !@account.account_balance.nil? and @account.account_balance <= 0}" %>
60
+ :class => "btn btn-xs #{"disabled" if !@account.account_balance.nil? and @account.account_balance <= 0}" %>
61
61
  </nobr>
62
62
  <% if can? :credit, Kaui::Account %>
63
63
  <nobr>
64
64
  <%= link_to 'Credit',
65
65
  kaui_engine.new_credit_path(:params => {:account_id => @account.account_id}),
66
- :class => "btn btn-mini" %>
66
+ :class => "btn btn-xs" %>
67
67
  </nobr>
68
68
  <% end %>
69
69
  <% if can? :charge, Kaui::Account %>
70
70
  <nobr>
71
71
  <%= link_to 'Charge',
72
72
  kaui_engine.new_charge_path(:params => {:account_id => @account.account_id}),
73
- :class => "btn btn-mini" %>
73
+ :class => "btn btn-xs" %>
74
74
  </nobr>
75
75
  <% end %>
76
76
  </dd>
@@ -86,18 +86,18 @@
86
86
  <% end %>
87
87
  </dd>
88
88
  <dt>Notified for inv?</dt>
89
- <dd><%= @account.is_notified_for_invoices %>&nbsp;<%= link_to "Toggle", kaui_engine.toggle_email_notifications_account_path(@account.account_id, :is_notified => !@account.is_notified_for_invoices), :method => :post, :class => 'btn btn-mini' %></dd>
89
+ <dd><%= @account.is_notified_for_invoices %>&nbsp;<%= link_to "Toggle", kaui_engine.toggle_email_notifications_account_path(@account.account_id, :is_notified => !@account.is_notified_for_invoices), :method => :post, :class => 'btn btn-xs' %></dd>
90
90
  <%= render :partial => "kaui/tags/tags_table",
91
91
  :locals => {:tags => @tags, :tags_url_or_path => kaui_engine.edit_account_tags_path(:params => {:account_id => @account.account_id}), :tags_show_path => kaui_engine.account_tags_path(:account_id => @account.account_id)} %>
92
92
  <%= render :partial => "kaui/account_emails/account_emails_table",
93
93
  :locals => {:account_emails => @account_emails, :account_id => @account.account_id} %>
94
94
  <dt>New base subscription:</dt>
95
- <dd><%= link_to "Create", kaui_engine.new_subscription_path(:params => {:account_id => @account.account_id, :product_category => "BASE"}), :class => "btn btn-mini" %></dd>
95
+ <dd><%= link_to "Create", kaui_engine.new_subscription_path(:params => {:account_id => @account.account_id, :product_category => "BASE"}), :class => "btn btn-xs" %></dd>
96
96
  </dl>
97
97
  <% if @payment_methods.present? %>
98
98
  <%= render :partial => "kaui/payment_methods/payment_methods_table", :locals => {:account_id => @account.account_id, :payment_methods => @payment_methods} %>
99
99
  <% end %>
100
- <%= link_to "Add payment method", kaui_engine.new_payment_method_path(:account_id => @account.account_id), :class => "btn btn-mini" %>
100
+ <%= link_to "Add payment method", kaui_engine.new_payment_method_path(:account_id => @account.account_id), :class => "btn btn-xs" %>
101
101
  <% @bundles.each do |bundle| %>
102
102
  <% subs = @subscriptions_by_bundle_id[bundle.bundle_id] %>
103
103
  <% if subs.present? %>
data/app/views/kaui/admin_allowed_users/new.html.erb CHANGED
@@ -4,13 +4,13 @@
4
4
  <div class="control-group">
5
5
  <%= f.label :kb_username, 'Name', :class => 'control-label' %>
6
6
  <div class="controls">
7
- <%= f.text_field :kb_username, :class => 'input-small', :required => true %>
7
+ <%= f.text_field :kb_username, :class => 'input-sm', :required => true %>
8
8
  </div>
9
9
  </div>
10
10
  <div class="control-group">
11
11
  <%= f.label :description, 'Description', :class => 'control-label' %>
12
12
  <div class="controls">
13
- <%= f.text_field :description, :class => 'input-small', :required => false %>
13
+ <%= f.text_field :description, :class => 'input-sm', :required => false %>
14
14
  </div>
15
15
  </div>
16
16
  <div class="form-actions">
data/app/views/kaui/admin_tenants/new.html.erb CHANGED
@@ -5,7 +5,7 @@
5
5
  <div class="control-group">
6
6
  <%= f.label :name, 'Name', :class => 'control-label' %>
7
7
  <div class="controls">
8
- <%= f.text_field :name, :class => 'input-small', :required => true %>
8
+ <%= f.text_field :name, :class => 'input-sm', :required => true %>
9
9
  </div>
10
10
  </div>
11
11
 
@@ -13,14 +13,14 @@
13
13
  <div class="control-group">
14
14
  <%= f.label :api_key, 'API Key', :class => 'control-label' %>
15
15
  <div class="controls">
16
- <%= f.text_field :api_key, :class => 'input-small', :required => true %>
16
+ <%= f.text_field :api_key, :class => 'input-sm', :required => true %>
17
17
  </div>
18
18
  </div>
19
19
 
20
20
  <div class="control-group">
21
21
  <%= f.label :api_secret, 'API Secret', :class => 'control-label' %>
22
22
  <div class="controls">
23
- <%= f.password_field :api_secret, :class => 'input-small', :required => true %>
23
+ <%= f.password_field :api_secret, :class => 'input-sm', :required => true %>
24
24
  </div>
25
25
  </div>
26
26
 
data/app/views/kaui/admin_tenants/show.html.erb CHANGED
@@ -24,7 +24,7 @@
24
24
  <td><%= u.description %></td>
25
25
  <td>
26
26
  <button type="button" class="btn btn-default btn-sm" id="<%= "allowed-user-remove-#{u.id}" %>">
27
- <span class="icon-remove"></span>
27
+ <span class="glyphicon glyphicon-remove"></span>
28
28
  </button>
29
29
  </td>
30
30
  </tr>
data/app/views/kaui/bundles/index.html.erb CHANGED
@@ -19,7 +19,7 @@
19
19
  <%= javascript_tag do %>
20
20
  $(document).ready(function() {
21
21
  $('#bundles-table').dataTable({
22
- "sDom": "<'row-fluid'<'span6'l><'span6 tableSearch'f>r>t<'row-fluid clearfix'<'span6 pull-left'i><'span6 pages pull-right'p>>",
22
+ "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
23
23
  "sPaginationType": "bootstrap",
24
24
  "bProcessing": true,
25
25
  "bServerSide": true,
data/app/views/kaui/bundles/show.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  <dt>Bundle key:</dt>
8
8
  <dd>
9
9
  <%= @bundle.external_key %>&nbsp;
10
- <%= link_to 'Transfer Ownership', kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => 'btn btn-mini' %>
10
+ <%= link_to 'Transfer Ownership', kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => 'btn btn-xs' %>
11
11
  </dd>
12
12
  <%= render :partial => 'kaui/tags/tags_table',
13
13
  :locals => {:tags => @tags, :tags_url_or_path => kaui_engine.edit_bundle_tags_path(:params => {:bundle_id => @bundle.bundle_id}), :tags_show_path => kaui_engine.bundle_tags_path(:bundle_id => @bundle.bundle_id)} %>
data/app/views/kaui/chargebacks/_form.html.erb CHANGED
@@ -5,7 +5,7 @@
5
5
  <div class="control-group">
6
6
  <%= f.label :amount, 'Chargeback amount', :class => 'control-label' %>
7
7
  <div class="controls">
8
- <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'input-small' %>
8
+ <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'input-sm' %>
9
9
  <p class="help-inline"><%= @chargeback.currency %></p>
10
10
  </div>
11
11
  </div>
data/app/views/kaui/charges/_form.html.erb CHANGED
@@ -32,7 +32,7 @@
32
32
  <div class="control-group">
33
33
  <%= f.label :amount, 'Charge amount', :class => 'control-label' %>
34
34
  <div class="controls">
35
- <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-small' %>
35
+ <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-sm' %>
36
36
  <% if @invoice.present? %>
37
37
  <p class="help-inline"><%= @invoice.currency %></p>
38
38
  <% end %>
@@ -42,7 +42,7 @@
42
42
  <div class="control-group">
43
43
  <%= f.label :currency, 'Currency', :class => 'control-label' %>
44
44
  <div class="controls">
45
- <%= f.select :currency, currencies, {}, :class => 'input-small' %>
45
+ <%= f.select :currency, currencies, {}, :class => 'input-sm' %>
46
46
  </div>
47
47
  </div>
48
48
  <% end %>
data/app/views/kaui/credits/_form.html.erb CHANGED
@@ -32,7 +32,7 @@
32
32
  <div class="control-group">
33
33
  <%= f.label :credit_amount, 'Credit amount', :class => 'control-label' %>
34
34
  <div class="controls">
35
- <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-small' %>
35
+ <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-sm' %>
36
36
  <% if @invoice.present? %>
37
37
  <p class="help-inline"><%= @invoice.currency %></p>
38
38
  <% end %>
@@ -42,7 +42,7 @@
42
42
  <div class="control-group">
43
43
  <%= label_tag :currency, 'Currency', :class => 'control-label' %>
44
44
  <div class="controls">
45
- <%= select_tag :currency, options_for_select(currencies, :selected => 'USD'), :class => 'input-small' %>
45
+ <%= select_tag :currency, options_for_select(currencies, :selected => 'USD'), :class => 'input-sm' %>
46
46
  </div>
47
47
  </div>
48
48
  <% end %>
data/app/views/kaui/custom_fields/index.html.erb CHANGED
@@ -18,7 +18,7 @@
18
18
  <%= javascript_tag do %>
19
19
  $(document).ready(function() {
20
20
  $('#custom_fields-table').dataTable({
21
- "sDom": "<'row-fluid'<'span6'l><'span6 tableSearch'f>r>t<'row-fluid clearfix'<'span6 pull-left'i><'span6 pages pull-right'p>>",
21
+ "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
22
22
  "sPaginationType": "bootstrap",
23
23
  "bProcessing": true,
24
24
  "bServerSide": true,
data/app/views/kaui/home/index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <header class='hero-unit'>
1
+ <header class='jumbotron'>
2
2
  <h1>Welcome to Kaui!</h1>
3
3
  <p class='lead'>Online documentation can be found at <a href='http://kill-bill.org/' target='_blank'>http://kill-bill.org/</a></p>
4
4
 
data/app/views/kaui/invoice_items/edit.html.erb CHANGED
@@ -69,7 +69,7 @@
69
69
  <div class="control-group">
70
70
  <%= f.label :amount, 'Item amount', :class => 'control-label' %>
71
71
  <div class="controls">
72
- <%= f.text_field :amount, :class => 'input-small' %>
72
+ <%= f.text_field :amount, :class => 'input-sm' %>
73
73
  <p class="help-inline"><%= @invoice_item.currency %></p>
74
74
  </div>
75
75
  </div>
data/app/views/kaui/invoices/index.html.erb CHANGED
@@ -20,7 +20,7 @@
20
20
  <%= javascript_tag do %>
21
21
  $(document).ready(function() {
22
22
  $('#invoices-table').dataTable({
23
- "sDom": "<'row-fluid'<'span6'l><'span6 tableSearch'f>r>t<'row-fluid clearfix'<'span6 pull-left'i><'span6 pages pull-right'p>>",
23
+ "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
24
24
  "sPaginationType": "bootstrap",
25
25
  "bProcessing": true,
26
26
  "bServerSide": true,
data/app/views/kaui/invoices/show.html.erb CHANGED
@@ -66,7 +66,7 @@
66
66
  <nobr>
67
67
  <%= link_to "Adjust",
68
68
  kaui_engine.edit_invoice_item_path(item.invoice_item_id, :invoice_id => @invoice.invoice_id),
69
- :class => "btn btn-mini #{"disabled" unless item.amount > 0 and item.subscription_id.present?}" %>
69
+ :class => "btn btn-xs #{"disabled" unless item.amount > 0 and item.subscription_id.present?}" %>
70
70
  </nobr>
71
71
  <% end %>
72
72
  <nobr>
@@ -74,7 +74,7 @@
74
74
  kaui_engine.invoice_item_path(item.invoice_item_id, :account_id => @invoice.account_id, :invoice_id => @invoice.invoice_id),
75
75
  :confirm => 'Are you sure?',
76
76
  :method => :delete,
77
- :class => "btn btn-mini #{"disabled" unless item.description =~ /account credit/ and item.amount > 0 and item.linked_invoice_item_id.nil? and !@cba_items_not_deleteable.include?(item.invoice_item_id) and @invoice.balance - item.amount >= 0}" %>
77
+ :class => "btn btn-xs #{"disabled" unless item.description =~ /account credit/ and item.amount > 0 and item.linked_invoice_item_id.nil? and !@cba_items_not_deleteable.include?(item.invoice_item_id) and @invoice.balance - item.amount >= 0}" %>
78
78
  </nobr>
79
79
  </td>
80
80
  </tr>