spud_media 1.0.0.rc1.1 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 67e5af75d007adc5d4f07ed1e987a2fa3939ea71
4
- data.tar.gz: a8d3a683fef33f31b65ac16df9daa939def5558a
3
+ metadata.gz: 0e9c2453d19800672d8da310af2146a560927efb
4
+ data.tar.gz: 4717d42150bcdcc98142e93b05e140e72644f10d
5
5
  SHA512:
6
- metadata.gz: 67a5b81c1497e513b6efb2364ff3ff3f0040c1a26f4b47fe4122b5ece6f65dd4af5fb212d0adaa40965a76f4bd24bee05cac9b1eeff0dc2d70d5eb2f8dbdc840
7
- data.tar.gz: 804d825fea97544b6d955e7c11174aa7ea7277b0944d43149e1fb88a8613019e31019f6a7561d72dcff23649f7f9015e702c98866904caa99f1c502f89362d0f
6
+ metadata.gz: c7cb0b0b1d90028cd2b9dbd92dcbea400a2c39ba945d37304a34d04df58cb7298feb5a594cb2824bf5e3a2e62fb249c647051e0d65507cb97afcb94b5a512f34
7
+ data.tar.gz: ec81852c6b65a6eaf1a1c4a08eb636926a2da23d9f25b2d5d6f76a5af98d81e3596ed7514a39877b1bca335f262b19d4142c4f937231d19c8837a918059292f0
@@ -11,8 +11,8 @@
11
11
  (function() {
12
12
 
13
13
  // Tell spud about our plugin and button
14
- spud.admin.editor.registerPlugin('spud_media_picker');
15
- spud.admin.editor.registerButton('spud_media_picker');
14
+ window.SpudTinyMCE.registerPlugin('spud_media_picker');
15
+ window.SpudTinyMCE.registerButton('spud_media_picker');
16
16
 
17
17
  tinymce.create('tinymce.plugins.SpudMediaPicker', {
18
18
  /**
@@ -43,7 +43,7 @@
43
43
  ed.addButton('spud_media_picker', {
44
44
  title: 'Insert Spud Media',
45
45
  cmd: 'spudMediaShowPicker',
46
- image: '/assets/spud/admin/media_tiny.png'
46
+ image: '<%=asset_path 'spud/admin/media_tiny.png'%>'
47
47
  });
48
48
 
49
49
  ed.addCommand('spudMediaInsertSelected', function(ui, data){
@@ -49,9 +49,9 @@ img.size-50-thumb {
49
49
  #spud_media_cropper_toolbar{
50
50
  font-size: 11px;
51
51
  background: #ccc;
52
- width: 882px;
52
+ width: 900px;
53
53
  margin:0 auto;
54
- padding: 5px 10px;
54
+ padding: 10px 10px;
55
55
  border-top-right-radius: 8px;
56
56
  border-top-left-radius: 8px;
57
57
  background-image: linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
@@ -82,8 +82,8 @@ user-select: none;
82
82
  display: inline-block;
83
83
  margin: 0;
84
84
  font-size: 11px;
85
- height: 11px;
86
- line-height: 11px;
85
+ height: 15px;
86
+ line-height: 15px;
87
87
  }
88
88
  #spud_media_cropper_toolbar input[type=text]{
89
89
  width: 30px;
@@ -26,13 +26,13 @@
26
26
  <div class="spud_media_cropper_toolbar_item">
27
27
  <%= label_tag :scale, 'Size' %>
28
28
  <%= f.hidden_field :crop_s %>
29
- <a href="#" id="spud_media_cropper_resize_up"><i class="icon-plus"></i></a>
30
- <a href="#" id="spud_media_cropper_resize_down"><i class="icon-minus"></i></a>
29
+ <a href="#" id="spud_media_cropper_resize_up"><span class="glyphicon glyphicon-plus"></span></a>
30
+ <a href="#" id="spud_media_cropper_resize_down"><span class="glyphicon glyphicon-minus"></span></a>
31
31
  </div>
32
32
 
33
33
  <div id="spud_media_cropper_toolbar_actions">
34
- <%= f.submit 'Crop', :id => 'spud_media_cropper_submit', :class => 'btn btn-mini btn-primary' %>
35
- <%= link_to "Don't Crop", spud_admin_media_path, :class => 'btn btn-mini' %>
34
+ <%= f.submit 'Crop', :id => 'spud_media_cropper_submit', :class => 'btn btn-xs btn-primary' %>
35
+ <%= link_to "Don't Crop", spud_admin_media_path, :class => 'btn btn-xs' %>
36
36
  </div>
37
37
  <% end %>
38
38
  </div>
@@ -17,15 +17,23 @@
17
17
 
18
18
  <span class="edit_controls">
19
19
  <% if media.is_image? %>
20
- <%= link_to 'Crop', edit_spud_admin_medium_path(media.id), :class => 'btn' %>
20
+ <%= link_to edit_spud_admin_medium_path(media.id), :class => 'btn btn-sm btn-default' do%>
21
+ Crop
22
+ <%end%>
21
23
  <% end %>
22
24
  <% if media.is_protected %>
23
- <%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_spud_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn' %>
25
+ <%= link_to set_access_spud_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn btn-sm btn-default' do%>
26
+ <span class="glyphicon glyphicon-lock"></span>&nbsp; Protected
27
+ <%end%>
24
28
  <% else %>
25
- <%= link_to 'Public', set_access_spud_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn' %>
29
+ <%= link_to set_access_spud_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn btn-sm btn-default' do%>
30
+ Public
31
+ <%end%>
26
32
  <% end %>
27
- <%= link_to "Replace", replace_spud_admin_medium_path(:id => media.id), :class => "btn"%>
28
- <%=link_to "Remove", spud_admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this file?"%>
33
+ <%= link_to "Replace", replace_spud_admin_medium_path(:id => media.id), :class => "btn btn-sm btn-default"%>
34
+ <%=link_to spud_admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-sm btn-danger',:confirm => "Are you sure you want to remove this file?" do%>
35
+ <span class="glyphicon glyphicon-trash"></span>
36
+ <%end%>
29
37
  </span>
30
38
 
31
39
  <br style="clear:both;"/>
@@ -5,22 +5,25 @@
5
5
  <fieldset>
6
6
  <legend>Upload Media</legend>
7
7
 
8
- <div class="control-group">
9
- <%=f.label :attachment, "Choose File",:class =>"control-label"%>
10
- <div class="controls">
8
+ <div class="form-group">
9
+ <%=f.label :attachment, "Choose File",:class =>"control-label col-sm-4"%>
10
+ <div class="col-sm-8">
11
11
  <%=f.file_field :attachment%>
12
12
  </div>
13
13
  </div>
14
14
 
15
- <div class="control-group">
16
- <%= f.label :is_protected, 'Protected File', :class => 'control-label' %>
17
- <div class="controls">
15
+ <div class="form-group">
16
+ <%= f.label :is_protected, 'Protected File', :class => 'control-label col-sm-4' %>
17
+ <div class="col-sm-8">
18
18
  <%= f.check_box :is_protected %>
19
19
  </div>
20
20
  </div>
21
21
 
22
- <div class="form-actions">
22
+ <div class="form-group">
23
+ <div class="col-sm-8 col-sm-offset-4">
23
24
  <%=f.submit "Upload", :class=>"btn btn-primary","data-loading-text"=>"Uploading..."%> or <%=link_to "cancel",spud_admin_media_path,:class => "btn"%>
24
25
  </div>
26
+
27
+ </div>
25
28
  <%end%>
26
29
 
@@ -9,7 +9,7 @@ module Spud
9
9
  Spud::Core.append_admin_javascripts('spud/admin/media/application')
10
10
  Spud::Core.append_admin_stylesheets('spud/admin/media/application')
11
11
  Spud::Core.configure do |config|
12
- config.admin_applications += [{:name => "Media",:thumbnail => "spud/admin/media_thumb.png",:url => "/spud/admin/media",:order => 3,:retina => true}]
12
+ config.admin_applications += [{:name => "Media",:thumbnail => "spud/admin/media_icon.png",:url => "/spud/admin/media",:order => 3,:retina => true}]
13
13
  end
14
14
  end
15
15
  end
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Media
3
- VERSION = "1.0.0.rc1.1"
3
+ VERSION = "1.0.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_media
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc1.1
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Estes
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-10 00:00:00.000000000 Z
11
+ date: 2014-08-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - '>='
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.0.rc1
33
+ version: 1.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '>='
39
39
  - !ruby/object:Gem::Version
40
- version: 1.0.0.rc1
40
+ version: 1.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: paperclip
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -172,9 +172,6 @@ executables: []
172
172
  extensions: []
173
173
  extra_rdoc_files: []
174
174
  files:
175
- - MIT-LICENSE
176
- - Rakefile
177
- - Readme.markdown
178
175
  - app/assets/images/spud/admin/files_thumbs/dat_thumb.png
179
176
  - app/assets/images/spud/admin/files_thumbs/doc_thumb.png
180
177
  - app/assets/images/spud/admin/files_thumbs/jpg_thumb.png
@@ -186,18 +183,20 @@ files:
186
183
  - app/assets/images/spud/admin/files_thumbs/xls_thumb.png
187
184
  - app/assets/images/spud/admin/files_thumbs/zip_thumb.png
188
185
  - app/assets/images/spud/admin/media/checkers.jpg
186
+ - app/assets/images/spud/admin/media_icon.png
187
+ - app/assets/images/spud/admin/media_icon@2x.png
189
188
  - app/assets/images/spud/admin/media_thumb.png
190
189
  - app/assets/images/spud/admin/media_thumb@2x.png
191
190
  - app/assets/images/spud/admin/media_tiny.png
192
191
  - app/assets/javascripts/spud/admin/media/application.js
193
192
  - app/assets/javascripts/spud/admin/media/picker.js
194
- - app/assets/javascripts/spud/admin/media/plugin.js
193
+ - app/assets/javascripts/spud/admin/media/plugin.js.erb
195
194
  - app/assets/libs/jcrop/css/Jcrop.gif
196
195
  - app/assets/libs/jcrop/css/jquery.Jcrop.css
197
196
  - app/assets/libs/jcrop/css/jquery.Jcrop.min.css
197
+ - app/assets/libs/jcrop/js/jquery.color.js
198
198
  - app/assets/libs/jcrop/js/jquery.Jcrop.js
199
199
  - app/assets/libs/jcrop/js/jquery.Jcrop.min.js
200
- - app/assets/libs/jcrop/js/jquery.color.js
201
200
  - app/assets/libs/jcrop/js/jquery.min.js
202
201
  - app/assets/libs/tiny_mce/plugins/spud_media/blank.htm
203
202
  - app/assets/libs/tiny_mce/plugins/spud_media/css/template.css
@@ -228,11 +227,14 @@ files:
228
227
  - db/migrate/20120501203325_add_protected_to_spud_media.rb
229
228
  - db/migrate/20120508132153_add_cropping_to_spud_media.rb
230
229
  - lib/responds_to_parent.rb
231
- - lib/spud_media.rb
232
230
  - lib/spud_media/configuration.rb
233
231
  - lib/spud_media/engine.rb
234
232
  - lib/spud_media/version.rb
233
+ - lib/spud_media.rb
235
234
  - lib/tasks/spud_media_tasks.rake
235
+ - MIT-LICENSE
236
+ - Rakefile
237
+ - Readme.markdown
236
238
  homepage: http://www.github.com/spud-rails/spud_media
237
239
  licenses: []
238
240
  metadata: {}
@@ -247,12 +249,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
247
249
  version: '0'
248
250
  required_rubygems_version: !ruby/object:Gem::Requirement
249
251
  requirements:
250
- - - '>'
252
+ - - '>='
251
253
  - !ruby/object:Gem::Version
252
- version: 1.3.1
254
+ version: '0'
253
255
  requirements: []
254
256
  rubyforge_project:
255
- rubygems_version: 2.2.2
257
+ rubygems_version: 2.0.5
256
258
  signing_key:
257
259
  specification_version: 4
258
260
  summary: Spud File upload/management module