redde 0.3.30 → 0.3.31
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/redde/sel-989c9f.svg +5 -0
- data/app/assets/images/redde/sel.svg +0 -1
- data/app/assets/stylesheets/redde/blocks/redde-form.sass +1 -1
- data/app/assets/stylesheets/redde/elements/inp.sass +5 -0
- data/app/assets/stylesheets/redde/elements/sbm.sass +6 -4
- data/app/assets/stylesheets/redde/elements/sel.sass +10 -3
- data/app/assets/stylesheets/redde/elements/txtr.sass +8 -4
- data/app/form_builders/redde_form_builder.rb +8 -4
- data/app/helpers/redde/form_helper.rb +7 -2
- data/lib/redde/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3c4a508700287985787c27d14e482834468ef232
|
|
4
|
+
data.tar.gz: cd1c4b455798fd38672e8f97323064726205a3e1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e382ff66f81abe143da979b7d0bebb60a77500e1e3f0dde2149438ead6f7b64864a424cd0b57190535a5ff4fcd138f63013d367630c29b5d81ccf88921e252b6
|
|
7
|
+
data.tar.gz: 8abf8766f1588e85c8de3458e589d9ce5388021e84bcf866667438ed83b77b908e1b28668249c5ef3f260e80c7fd0a362adb34b89a2848661a6dae366589e35d
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
<svg
|
|
2
|
+
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 11 7"
|
|
3
|
+
style="enable-background:new 0 0 11 7;" xml:space="preserve" width="11" height="7">
|
|
4
|
+
<path fill="#989c9f" d="M1.283,0L0,1.324L5.5,7L11,1.324L9.717,0L5.5,4.351L1.283,0z"/>
|
|
5
|
+
</svg>
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
//= depend_on_asset redde/enter.svg
|
|
2
|
+
|
|
1
3
|
@import redde/mixins
|
|
2
4
|
|
|
3
5
|
.sbm
|
|
@@ -13,10 +15,6 @@
|
|
|
13
15
|
outline: none
|
|
14
16
|
text-decoration: none
|
|
15
17
|
|
|
16
|
-
&[disabled]
|
|
17
|
-
background: #9ea2a4
|
|
18
|
-
cursor: default
|
|
19
|
-
|
|
20
18
|
&:hover
|
|
21
19
|
background: mix($link, #388cb5)
|
|
22
20
|
background: linear-gradient($link 70%, #388cb5 100%)
|
|
@@ -31,3 +29,7 @@
|
|
|
31
29
|
width: round(16/13*$sbm-size)
|
|
32
30
|
margin-right: round(10/13*$sbm-size)
|
|
33
31
|
background: image-url('redde/enter.svg') no-repeat 0 5px
|
|
32
|
+
|
|
33
|
+
&[disabled]
|
|
34
|
+
background: #9ea2a4
|
|
35
|
+
cursor: default
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
//= depend_on_asset redde/sel.svg
|
|
2
|
+
//= depend_on_asset redde/sel-989c9f.svg
|
|
2
3
|
|
|
3
4
|
@import redde/mixins
|
|
4
5
|
|
|
@@ -24,6 +25,12 @@
|
|
|
24
25
|
border-color: #5bacd4
|
|
25
26
|
box-shadow: 0 0 0 1px #5bacd4
|
|
26
27
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
&._err
|
|
29
|
+
border-color: $light-red
|
|
30
|
+
box-shadow: 0 0 0 1px $light-red
|
|
31
|
+
|
|
32
|
+
&[disabled]
|
|
33
|
+
border-color: #ddd
|
|
34
|
+
background-color: #eee
|
|
35
|
+
color: #989c9f
|
|
36
|
+
background: #fff image-url('sel-989c9f.svg') no-repeat right 10px top 14px
|
|
@@ -15,11 +15,15 @@
|
|
|
15
15
|
&::placeholder
|
|
16
16
|
color: #989c9f
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
// box-shadow: 0 0 0 1px $light-red
|
|
18
|
+
&._err
|
|
19
|
+
border-color: $light-red
|
|
20
|
+
box-shadow: 0 0 0 1px $light-red
|
|
22
21
|
|
|
23
22
|
&:focus
|
|
24
23
|
border-color: #5bacd4
|
|
25
24
|
box-shadow: 0 0 0 1px #5bacd4
|
|
25
|
+
|
|
26
|
+
&[disabled]
|
|
27
|
+
border-color: #ddd
|
|
28
|
+
background-color: #eee
|
|
29
|
+
color: #989c9f
|
|
@@ -76,10 +76,14 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
|
|
|
76
76
|
end
|
|
77
77
|
|
|
78
78
|
def redde_submits *args, &block
|
|
79
|
-
content_tag :
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
content_tag :tfoot do
|
|
80
|
+
content_tag :tr do
|
|
81
|
+
content_tag :td, colspan: 2, class: 'redde-form__actions' do
|
|
82
|
+
concat redde_submit('Сохранить', class: 'redde-form__sbm')
|
|
83
|
+
concat redde_submit('Применить', class: 'redde-form__sbm')
|
|
84
|
+
concat capture(&block) if block_given?
|
|
85
|
+
end
|
|
86
|
+
end
|
|
83
87
|
end
|
|
84
88
|
end
|
|
85
89
|
|
|
@@ -12,11 +12,16 @@ module Redde::FormHelper
|
|
|
12
12
|
options[:builder] ||= ReddeFormBuilder
|
|
13
13
|
options[:html] = { 'data-redde' => { objectName: (object.kind_of?(Array) ? object.last : object).class.model_name.param_key }.to_json }
|
|
14
14
|
|
|
15
|
+
# через blank? не заработало
|
|
16
|
+
# options[:redde] = {} if options[:redde].blank?
|
|
17
|
+
# options[:redde][:submits] = true if options[:redde][:submits].blank?
|
|
18
|
+
options[:redde] = {} unless options.try(:key?, :redde)
|
|
19
|
+
options[:redde][:submits] = true unless options[:redde].try(:key?, :submits)
|
|
20
|
+
|
|
15
21
|
with_clean_form_field_error_proc do
|
|
16
22
|
form_for(object, options) do |f|
|
|
17
23
|
concat f.error_messages
|
|
18
|
-
concat content_tag(:table, capture(f, &block), class: 'redde-form__tbl')
|
|
19
|
-
concat f.redde_submits
|
|
24
|
+
concat content_tag(:table, capture(f, &block).concat(if options[:redde][:submits] then f.redde_submits end), class: 'redde-form__tbl')
|
|
20
25
|
end
|
|
21
26
|
end
|
|
22
27
|
end
|
data/lib/redde/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: redde
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.31
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Oleg Bovykin
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: exe
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2016-
|
|
12
|
+
date: 2016-07-11 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: jquery-rails
|
|
@@ -448,6 +448,7 @@ files:
|
|
|
448
448
|
- app/assets/images/redde/redactor/plugins/link.html
|
|
449
449
|
- app/assets/images/redde/redactor/plugins/table.html
|
|
450
450
|
- app/assets/images/redde/redactor/plugins/video.html
|
|
451
|
+
- app/assets/images/redde/sel-989c9f.svg
|
|
451
452
|
- app/assets/images/redde/sel.svg
|
|
452
453
|
- app/assets/images/redde/user.svg
|
|
453
454
|
- app/assets/javascripts/redde/file.js.coffee
|