express_admin 1.6.13 → 1.7.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f71fd192156c52c05acb215385cf75a655432dd8
4
- data.tar.gz: 21a9556a3f14af0727bc7b6068c9ef16aba774aa
3
+ metadata.gz: 483f96d0b2f08c4cc3ba4496a90306876565d732
4
+ data.tar.gz: 3bce021b18f151aa3327d435d807e8319035cbe8
5
5
  SHA512:
6
- metadata.gz: fc0a6969557aa77eeb687266786b0132d830cda6b8705849a6753ca0c39a0805d2fb1974f0587414cf1da42ebbb9a1b951f2e3f8197537ee0b0008ffc87acb01
7
- data.tar.gz: 4c44dd1df51a0b3e66dc6bb142b73da1e112250c3a74b502503c5a65a79440bb863de3e6b8f81f5b6f95c61f35dc48fcedb71b65ff71227f0de440a0999e7508
6
+ metadata.gz: 4b318f08e04c4f1a5f7e2783703a001fded9e66855cdf9506ed230ddb7ca929d0698c5c108fe32be94cbd8be7e8b82d4b66d128f1a8ac508b90b3242e47d053f
7
+ data.tar.gz: 684e42c0fc53d3fcc6e3c0c185650de726165414ca9262123a5c430f745eeb2e8ae51066d7554a755cb36dbbabf94111bb27095e8ffc2675171fcfb45616a765
@@ -499,6 +499,24 @@
499
499
  line-height: 1.5
500
500
  padding: 0
501
501
 
502
+ .select2-selection--multiple
503
+ border:
504
+ radius: 0
505
+ color: $silver
506
+ width: 1px
507
+ padding: .5em
508
+ min-height: 2.5em
509
+
510
+ .select2-search__field
511
+ margin: 0
512
+ padding: 0
513
+
514
+ .select2-search
515
+ margin:
516
+ top: 5px
517
+ width: auto
518
+
519
+
502
520
  .select2-results > .select2-results__options
503
521
  border:
504
522
  top: 1px solid $silver
@@ -26,7 +26,7 @@ module ExpressAdmin
26
26
  attribute: true
27
27
 
28
28
  before_build -> {
29
- set_attribute 'data-delete', config[:delete] if config[:delete]
29
+ set_attribute 'data-method', 'delete' if config[:delete]
30
30
  set_attribute 'data-confirm', config[:confirm] if config[:confirm]
31
31
  }
32
32
 
@@ -68,21 +68,12 @@ module ExpressAdmin
68
68
  current_module_path = current_module.to_s.underscore
69
69
  admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
70
70
  a = []
71
- a << stylesheet_link_tag("#{admin_path}/application")
72
- a << stylesheet_link_tag("app_express/admin/application") if defined?(AppExpress)
71
+ a << stylesheet_link_tag("#{admin_path}")
73
72
  a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)
74
- a << javascript_include_tag("#{admin_path}/application", 'data-turbolinks-track' => true)
73
+ a << javascript_include_tag("#{admin_path}", 'data-turbolinks-track' => true)
75
74
  a.join().html_safe
76
75
  end
77
76
 
78
- def include_theme_assets(theme_name)
79
- current_module_path = current_module.to_s.underscore
80
- theme_path = "#{current_module_path}/themes/#{theme_name}/application"
81
- a = []
82
- a << stylesheet_link_tag(theme_path)
83
- a.join.html_safe
84
- end
85
-
86
77
  def admin_menus
87
78
  menus = ExpressAdmin::Engine.all_addons.map do |engine|
88
79
  ExpressAdmin::Menu[engine.addon_name.to_s] rescue nil
@@ -10,8 +10,8 @@ div(class: 'grid-container') {
10
10
  form(:class => 'new_user', 'accept-charset' => "UTF-8", :action => "/users/sign_in", id: "new_user", method: "post") {
11
11
 
12
12
  div(style: "display:none") {
13
- input name: "utf8", type: "hidden", value: "✓"
14
- input name: "authenticity_token", type: "hidden", value: "Zp9VllF7siBJvRs2etlWJdCBwxy9fbKoY01B33d1B50="
13
+ add_child helpers.utf8_enforcer_tag
14
+ add_child helpers.send(:token_tag)
15
15
  }
16
16
 
17
17
  div(class: 'row') {
@@ -143,7 +143,7 @@ module ExpressAdmin
143
143
  load_resource
144
144
  resource.destroy!
145
145
  respond_to do |format|
146
- format.html { redirect_to :index }
146
+ format.html { redirect_to collection_path }
147
147
  end
148
148
  end
149
149
 
@@ -1,3 +1,3 @@
1
1
  module ExpressAdmin
2
- VERSION = "1.6.13"
2
+ VERSION = "1.7.1"
3
3
  end
@@ -5,8 +5,8 @@ div(class: 'devise-form-wrapper') {
5
5
  }
6
6
  form(class: 'new_user', 'accept-charset' => "UTF-8", :action => "/users/sign_in", id: "new_user", method: "post") {
7
7
  div(style: "display:none") {
8
- input name: "utf8", type: "hidden", value: "✓"
9
- input name: "authenticity_token", type: "hidden", value: "Zp9VllF7siBJvRs2etlWJdCBwxy9fbKoY01B33d1B50="
8
+ add_child helpers.utf8_enforcer_tag
9
+ add_child helpers.send(:token_tag)
10
10
  }
11
11
 
12
12
  label(class: 'hide', for: "user_email") { "Email" }
Binary file
@@ -43,7 +43,7 @@ module ExpressAdmin
43
43
  end
44
44
 
45
45
  test "delete attribute is true" do
46
- assert_match /data-delete="true"/, rendered_icon_link(delete: resource[:delete])
46
+ assert_match /data-method="delete"/, rendered_icon_link(delete: resource[:delete])
47
47
  end
48
48
 
49
49
  test "confirm attribute is true" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: express_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.13
4
+ version: 1.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steven Talcott Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-21 00:00:00.000000000 Z
11
+ date: 2015-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bourbon