bootsy 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/app/assets/javascripts/bootsy/bootsy.js.erb +5 -0
  2. data/app/views/bootsy/images/_index.html.erb +15 -6
  3. data/app/views/bootsy/images/_new.html.erb +6 -16
  4. data/lib/bootsy/core_ext.rb +1 -1
  5. data/lib/bootsy/version.rb +1 -1
  6. metadata +29 -29
data/app/assets/javascripts/bootsy/bootsy.js.erb CHANGED
@@ -55,4 +55,9 @@ $(document).ready(function(){
55
55
 
56
56
  bootsyInsertImage({src: src, alt: alt}, wysihtml5Editor);
57
57
  });
58
+
59
+ $('body').off('click.dropdown touchstart.dropdown.data-api', '.dropdown');
60
+ $('body').on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function(e){
61
+ e.stopPropagation();
62
+ });
58
63
  });
data/app/views/bootsy/images/_index.html.erb CHANGED
@@ -2,14 +2,23 @@
2
2
  <% images.each do |image| %>
3
3
  <li class="span1 dropdown">
4
4
  <%= link_to image_tag(image.image_file.thumb.url), '#', :class => 'thumbnail', data: { toggle: 'dropdown'} %>
5
- <ul class="dropdown-menu">
5
+ <ul class="dropdown-menu" role="menu">
6
6
  <li class="nav-header"><%= t 'bootsy.image.size' %></li>
7
- <li><%= link_to t('bootsy.image.small'), '#', :class => 'insert', data: { :'image-size' => 'small'} %></li>
8
- <li><%= link_to t('bootsy.image.medium'), '#', :class => 'insert', data: { :'image-size' => 'medium'} %></li>
9
- <li><%= link_to t('bootsy.image.large'), '#', :class => 'insert', data: { :'image-size' => 'large'} %></li>
10
- <li><%= link_to t('bootsy.image.original'), '#', :class => 'insert', data: { :'image-size' => 'original'} %></li>
7
+ <% [:small, :medium, :large, :original].each do |size| %>
8
+ <li>
9
+ <%= link_to '#', :class => 'insert', tabindex: '-1', data: { :'image-size' => size.to_s} do %>
10
+ <i class="icon-picture"></i>
11
+ <%= t "bootsy.image.#{size}" %>
12
+ <% end %>
13
+ </li>
14
+ <% end %>
11
15
  <li class="divider"></li>
12
- <li><%= link_to t('bootsy.action.destroy'), image, method: :delete, remote: true, data: { confirm: t('bootsy.image.confirm.destroy')}, :class => 'destroy_btn' %></li>
16
+ <li>
17
+ <%= link_to image, method: :delete, remote: true, data: { confirm: t('bootsy.image.confirm.destroy')}, tabindex: '-1', :class => 'destroy_btn' do %>
18
+ <i class="icon-trash"></i>
19
+ <%= t 'bootsy.action.destroy' %>
20
+ <% end %>
21
+ </li>
13
22
  </ul>
14
23
  </li>
15
24
  <% end %>
data/app/views/bootsy/images/_new.html.erb CHANGED
@@ -1,23 +1,13 @@
1
1
  <h3><%= t 'bootsy.image.new' %></h3>
2
2
 
3
- <%= form_for [bootsy, resource_or_nil(image.image_gallery), image], remote: true, html: {:class => 'bootsy'} do |f| %>
3
+ <%= form_for [bootsy, resource_or_nil(image.image_gallery), image], remote: true, html: {:class => 'bootsy form-inline'} do |f| %>
4
4
  <% if image.errors.any? %>
5
- <div id="error_explanation">
6
- <h2><%= pluralize(image.errors.count, "error") %> prohibited this image from being saved:</h2>
7
-
8
- <ul>
9
- <% image.errors.full_messages.each do |msg| %>
10
- <li><%= msg %></li>
11
- <% end %>
12
- </ul>
13
- </div>
5
+ <% image.errors.full_messages.each do |msg| %>
6
+ <div class="alert alert-error"><%= msg %></div>
7
+ <% end %>
14
8
  <% end %>
15
9
 
16
- <div class="field">
17
- <%= f.file_field :image_file %>
18
- </div>
10
+ <%= f.file_field :image_file %>
19
11
 
20
- <div class="actions">
21
- <%= f.submit t('bootsy.action.load'), :class => 'btn' %>
22
- </div>
12
+ <%= f.submit t('bootsy.action.load'), :class => 'btn btn-primary' %>
23
13
  <% end %>
data/lib/bootsy/core_ext.rb CHANGED
@@ -1,2 +1,2 @@
1
- ActionView::Helpers::FormHelper.send :include, Bootsy::FormHelper
1
+ ActionView::Base.send :include, Bootsy::FormHelper
2
2
  ActionView::Helpers::FormBuilder.send :include, Bootsy::FormBuilder
data/lib/bootsy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bootsy
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootsy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,14 +9,14 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-13 00:00:00.000000000 Z
12
+ date: 2012-09-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mini_magick
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - ! '>='
19
+ - - ~>
20
20
  - !ruby/object:Gem::Version
21
21
  version: '3.4'
22
22
  type: :runtime
@@ -24,7 +24,7 @@ dependencies:
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
- - - ! '>='
27
+ - - ~>
28
28
  - !ruby/object:Gem::Version
29
29
  version: '3.4'
30
30
  - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  none: false
34
34
  requirements:
35
- - - ! '>='
35
+ - - ~>
36
36
  - !ruby/object:Gem::Version
37
37
  version: 0.6.2
38
38
  type: :runtime
@@ -40,7 +40,7 @@ dependencies:
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
- - - ! '>='
43
+ - - ~>
44
44
  - !ruby/object:Gem::Version
45
45
  version: 0.6.2
46
46
  - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  none: false
50
50
  requirements:
51
- - - ! '>='
51
+ - - ~>
52
52
  - !ruby/object:Gem::Version
53
53
  version: 1.0.2
54
54
  type: :runtime
@@ -56,7 +56,7 @@ dependencies:
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  none: false
58
58
  requirements:
59
- - - ! '>='
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: 1.0.2
62
62
  - !ruby/object:Gem::Dependency
@@ -64,23 +64,23 @@ dependencies:
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  none: false
66
66
  requirements:
67
- - - ! '>='
67
+ - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 3.2.6
69
+ version: 3.2.8
70
70
  type: :development
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
- - - ! '>='
75
+ - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 3.2.6
77
+ version: 3.2.8
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: sqlite3
80
80
  requirement: !ruby/object:Gem::Requirement
81
81
  none: false
82
82
  requirements:
83
- - - ! '>='
83
+ - - ~>
84
84
  - !ruby/object:Gem::Version
85
85
  version: 1.3.6
86
86
  type: :development
@@ -88,7 +88,7 @@ dependencies:
88
88
  version_requirements: !ruby/object:Gem::Requirement
89
89
  none: false
90
90
  requirements:
91
- - - ! '>='
91
+ - - ~>
92
92
  - !ruby/object:Gem::Version
93
93
  version: 1.3.6
94
94
  - !ruby/object:Gem::Dependency
@@ -96,7 +96,7 @@ dependencies:
96
96
  requirement: !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
- - - ! '>='
99
+ - - ~>
100
100
  - !ruby/object:Gem::Version
101
101
  version: 2.11.0
102
102
  type: :development
@@ -104,7 +104,7 @@ dependencies:
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
- - - ! '>='
107
+ - - ~>
108
108
  - !ruby/object:Gem::Version
109
109
  version: 2.11.0
110
110
  - !ruby/object:Gem::Dependency
@@ -112,23 +112,23 @@ dependencies:
112
112
  requirement: !ruby/object:Gem::Requirement
113
113
  none: false
114
114
  requirements:
115
- - - ! '>='
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 3.5.0
117
+ version: 4.1.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  none: false
122
122
  requirements:
123
- - - ! '>='
123
+ - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 3.5.0
125
+ version: 4.1.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: database_cleaner
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  none: false
130
130
  requirements:
131
- - - ! '>='
131
+ - - ~>
132
132
  - !ruby/object:Gem::Version
133
133
  version: 0.8.0
134
134
  type: :development
@@ -136,7 +136,7 @@ dependencies:
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  none: false
138
138
  requirements:
139
- - - ! '>='
139
+ - - ~>
140
140
  - !ruby/object:Gem::Version
141
141
  version: 0.8.0
142
142
  - !ruby/object:Gem::Dependency
@@ -144,22 +144,22 @@ dependencies:
144
144
  requirement: !ruby/object:Gem::Requirement
145
145
  none: false
146
146
  requirements:
147
- - - ! '>='
147
+ - - ~>
148
148
  - !ruby/object:Gem::Version
149
- version: 1.2.1
149
+ version: 1.3.0
150
150
  type: :development
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
153
153
  none: false
154
154
  requirements:
155
- - - ! '>='
155
+ - - ~>
156
156
  - !ruby/object:Gem::Version
157
- version: 1.2.1
157
+ version: 1.3.0
158
158
  description: Bootsy is a WYSIWIG editor for Rails applications based on WYSIHTML5
159
159
  and Twitter Bootstrap. It integrates images uploads using CarrierWave, as an image
160
160
  gallery scoped in models of your application.
161
161
  email:
162
- - lrvolmer@gmail.com
162
+ - volmerius@gmail.com
163
163
  executables: []
164
164
  extensions: []
165
165
  extra_rdoc_files: []
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
218
218
  version: '0'
219
219
  segments:
220
220
  - 0
221
- hash: 2854455113211705351
221
+ hash: 2387402174944412572
222
222
  required_rubygems_version: !ruby/object:Gem::Requirement
223
223
  none: false
224
224
  requirements:
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
227
227
  version: '0'
228
228
  segments:
229
229
  - 0
230
- hash: 2854455113211705351
230
+ hash: 2387402174944412572
231
231
  requirements: []
232
232
  rubyforge_project:
233
233
  rubygems_version: 1.8.24