tb_media 1.0.8 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e003b647c6daf3a4154d9f4be103bbd7c0967c4b
-  data.tar.gz: 0ca6e7cec76779943f3d0285c634fc4b7e0e5871
+  metadata.gz: 113523e49c829fd56bda7df24ae33a556660fee5
+  data.tar.gz: f657496378550afd5bcb74b82fb774aee76277b8
 SHA512:
-  metadata.gz: 6131013a9382913db5263624078d7b242371fb2d5d4ebe6392401f07fff197099aca03597facf7e387bc90ef66e80d00ef74a5879de258ffc0c4bc6a118370b7
-  data.tar.gz: 2fd6a6e22a8de93cd57a555e6526d243657d8230a6a3a06503d5538b1998e01106a5d756865816c5c8473735f96dab31b3ab2b3b5e645b45b582f51063a87068
+  metadata.gz: f603cbb40c6ec92e57797ee3d3b095b3db21f37419e0564caa736dc410506ea60322d1517f147e76d7fc6649d93e563a4c1b50647659169707197bf2bc3a6349
+  data.tar.gz: 363afcc5f0f28cb0bfd3ec0605d202aad048570998ad48918e08cdb542527f925b20344e324210429c206c4089a3a05702b2e83dabf4caba8fc3ebb6fa1feff0

data/app/assets/javascripts/admin/media/picker.js

@@ -152,12 +152,12 @@ spud.admin.mediapicker = new function(){
 
   this.setProgressBarPrecent = function(percent){
     var progress = $('.spud_media_picker_upload_progress');
-    progress.find('.bar').css({width: percent + '%'});
+    progress.find('.progress-bar').css({width: percent + '%'});
     if(percent == 100){
-      progress.addClass('progress-success');
+      // progress.addClass('progress-bar-success');
     }
     else{
-      progress.removeClass('progress-success');
+      // progress.removeClass('progress-bar-success');
     }
   };
 

data/app/assets/stylesheets/admin/media/application.css.scss

@@ -48,7 +48,7 @@ img.size-50-thumb {
 #spud_media_cropper_toolbar{
   font-size: 11px;
   background: #ccc;
-  width: 882px;
+  width: 900px;
   margin:0 auto;
   padding: 5px 10px;
   border-top-right-radius: 8px;
@@ -86,6 +86,7 @@ user-select: none;
 }
 #spud_media_cropper_toolbar input[type=text]{
   width: 30px;
+  height: 22px;
 }
 .spud_media_cropper_toolbar_item{
   margin-right: 6px;

data/app/assets/stylesheets/admin/media/plugin.css

@@ -56,6 +56,7 @@
 /* Uploader 
 ------------ */
 .spud_media_picker_upload_progress{
+  margin: 10px 0 0;
   display: none;
 }
 .spud_media_picker_upload_progress .bar{

data/app/views/admin/media/edit.html.erb

@@ -1,4 +1,4 @@
-<%= error_messages_for(@media) %>
+<%= tb_form_errors(@media) %>
 
 <div id="spud_media_cropper_toolbar">
   <%= form_for @media, :url => admin_medium_path(@media) do |f| %>
@@ -26,13 +26,13 @@
     <div class="spud_media_cropper_toolbar_item">
       <%= label_tag :scale, 'Size' %>
       <%= f.hidden_field :crop_s %>
-      <a href="#" id="spud_media_cropper_resize_up"><i class="icon-plus"></i></a>
-      <a href="#" id="spud_media_cropper_resize_down"><i class="icon-minus"></i></a>
+      <a href="#" id="spud_media_cropper_resize_up"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
+      <a href="#" id="spud_media_cropper_resize_down"><span class="glyphicon glyphicon-minus" aria-hidden="true"></span></a>
     </div>
 
     <div id="spud_media_cropper_toolbar_actions">
-      <%= f.submit 'Crop', :id => 'spud_media_cropper_submit', :class => 'btn btn-mini btn-primary' %>
-      <%= link_to "Don't Crop", admin_media_path, :class => 'btn btn-mini' %>
+      <%= f.submit 'Crop', :id => 'spud_media_cropper_submit', :class => 'btn btn-xs btn-primary' %>
+      <%= link_to "Don't Crop", admin_media_path, :class => 'btn btn-xs' %>
     </div>
   <% end %>
 </div>

data/app/views/admin/media/index.html.erb

@@ -1,37 +1,35 @@
-<%=content_for :data_controls do%>
-<%=link_to "Upload File",new_admin_medium_path(),:class => "btn btn-primary",:title => "Upload File"%>
-<%end%>
-<%=content_for :detail do%>
-	<div class="page_list">
-			<%@media.each do |media|%>
-				<div class="page_row">
-					
-				<span class="row_meta">
-					<% if media.is_protected && media.is_image? %>
-						<img src="<%= media.image_from_type %>" class="size-50-thumb" />
-					<% else %>
-						<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
-					<% end %>
-					<%= link_to media.attachment_file_name, media.attachment_url %>					
-				</span>
+<%= content_for :data_controls do %>
+	<%= link_to "Upload File", new_admin_medium_path, :class => "btn btn-primary", :title => "Upload File" %>
+<% end %>
 
-				<span class="edit_controls">
-					<% if media.is_image? %>
-						<%= link_to 'Crop', edit_admin_medium_path(media.id), :class => 'btn' %>
-					<% end %>
-					<% if media.is_protected %>
-						<%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn' %>
-					<% else %>
-						<%= link_to 'Public', set_access_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn' %>
-					<% end %>
-					<%=link_to "Remove", admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-danger', :data => {:confirm => "Are you sure you want to remove this file?"} %>
-				</span>
-				
-				<br style="clear:both;"/>
-			</div>
-			<%end%>
-			<%=will_paginate @media%>
-
-	</div>
-
-<%end%>
+<%= content_for :detail do %>
+	<div class="table-responsive">
+		<table class="table table-striped table-hover">
+			<tbody>
+				<% @media.each do |media| %>
+					<tr>
+						<td>
+							<% if media.is_protected && media.is_image? %>
+								<img src="<%= media.image_from_type %>" class="size-50-thumb" />
+							<% else %>
+								<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
+							<% end %>
+							<%= link_to media.attachment_file_name, media.attachment_url %>
+						</td>
+						<td class="table-actions">
+							<% if media.is_image? %>
+								<%= link_to 'Crop', edit_admin_medium_path(media.id), :class => 'btn btn-sm btn-default' %>
+							<% end %>
+							<% if media.is_protected %>
+								<%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn btn-sm btn-default' %>
+							<% else %>
+								<%= link_to 'Public', set_access_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn btn-sm btn-default' %>
+							<% end %>
+							<%= link_to "Remove", admin_medium_path(media), :method => :delete, :class => 'btn btn-sm btn-danger', :data => {:confirm => "Are you sure you want to remove this file?"} %>
+						</td>
+					</tr>
+				<% end %>
+			</tbody>
+		</table>
+	</div>	
+<% end %>

data/app/views/admin/media/new.html.erb

@@ -1,27 +1,6 @@
-
-  
-
-  <%=form_for @media,:url => admin_media_path(),:html=>{:class=>"form-horizontal", :multipart => true} do |f|%>
-  <%= tb_form_errors(@media) %>
-  <fieldset>
-	  <legend>Upload Media</legend>
-	  
-	  <div class="control-group">
-		  <%=f.label :attachment, "Choose File",:class =>"control-label"%>
-      <div class="controls">
-  		  <%=f.file_field :attachment%>
-      </div>
-	  </div>
-	  
-    <div class="control-group">
-      <%= f.label :is_protected, 'Protected File', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.check_box :is_protected %>
-      </div>
-    </div>
-
-  <div class="form-actions">
-      <%=f.submit "Upload", :class=>"btn btn-primary","data-loading-text"=>"Uploading..."%> or <%=link_to "cancel",admin_media_path,:class => "btn"%>
-    </div>
-  <%end%>
-
+<%=form_for @media, :url => admin_media_path, :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal", :multipart => true} do |f|%>
+  <%= tb_form_error_header(@media) %>
+  <%= f.tb_file_field :attachment %>
+  <%= f.tb_check_box :is_protected %>
+  <%= f.tb_save_buttons('File', admin_media_path) %>
+<% end %>

data/app/views/admin/media_picker/index.html.erb

@@ -20,12 +20,12 @@
       <%= form_for :spud_media, :html => {:class => 'spud_media_picker_upload_form', :target => 'spud_media_picker_upload_target'} do |f| %>
         <%= f.label :attachment, 'Upload New File' %>
         <%= f.file_field :attachment%>
-        <div class="progress progress-striped active spud_media_picker_upload_progress">
-          <div class="bar"></div>
+        <div class="progress spud_media_picker_upload_progress">
+          <div class="progress-bar progress-bar-striped active" role="progressbar"style="width: 60%;"></div>
         </div>
         <div class="spud_media_picker_buttons">
-          <%= f.submit 'Upload', :class => 'btn btn-mini btn-primary spud_media_picker_tab_upload_submit' %>
-          <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+          <%= f.submit 'Upload', :class => 'btn btn-xs btn-primary spud_media_picker_tab_upload_submit' %>
+          <%= link_to 'Cancel', '#', :class => 'btn btn-xs btn-default spud_media_picker_button_cancel' %>
         </div>
       <% end %>
     </div>
@@ -44,8 +44,8 @@
         </ul>
       </div>
       <div class="spud_media_picker_buttons">
-        <%= link_to 'Use Selected', '#', :class => 'btn btn-mini btn-primary spud_media_picker_button_use_selected' %>
-        <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+        <%= link_to 'Use Selected', '#', :class => 'btn btn-xs btn-primary spud_media_picker_button_use_selected' %>
+        <%= link_to 'Cancel', '#', :class => 'btn btn-xs btn-default spud_media_picker_button_cancel' %>
       </div>
     </div>
 
@@ -86,8 +86,8 @@
         <input name="spud_media_picker_option_dimension_w" type="text" placeholder="auto" /> px by <input name="spud_media_picker_option_dimension_h" type="text" placeholder="auto" /> px
       </div>
       <div class="spud_media_picker_buttons">
-        <%= link_to 'Insert', '#', :class => 'btn btn-mini btn-primary spud_media_picker_button_insert' %>
-        <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+        <%= link_to 'Insert', '#', :class => 'btn btn-xs btn-primary spud_media_picker_button_insert' %>
+        <%= link_to 'Cancel', '#', :class => 'btn btn-xs btn-default spud_media_picker_button_cancel' %>
       </div>
     </div>
 

data/config/locales/en.yml

@@ -0,0 +1,9 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  activerecord:
+    attributes:
+      spud_media:
+        attachment: 'File Upload'
+        is_protected: 'Protected File'

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.0.8"
+		VERSION = "1.2.0.beta1"
 	end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'rspec/autorun'
 require 'database_cleaner'
 require 'shoulda'
 require 'factory_girl'
-require 'mocha'
+#require 'mocha'
 require 'capybara/rspec'
 require 'capybara/rails'
 
@@ -23,7 +23,7 @@ ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 Dir[File.join(ENGINE_RAILS_ROOT,"spec/support/**/*.rb"), File.join(ENGINE_RAILS_ROOT,"factories/*")].each {|f| require f}
 
 RSpec.configure do |config|
-  config.mock_with :mocha
+  #config.mock_with :mocha
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
 - !ruby/object:Gem::Dependency
@@ -192,8 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Spud Media allows you to upload files to your site and manage them in
-  the spud administrative panel. It also uses paperclip and supports s3 storage
+description: Twice Baked Media allows you to upload files to your site and manage
+  them in the spud administrative panel. It also uses paperclip and supports s3 storage
 email:
 - greg@westlakedesign.com
 executables: []
@@ -248,6 +248,7 @@ files:
 - app/views/admin/media_picker/create.html.erb
 - app/views/admin/media_picker/create.js.erb
 - app/views/admin/media_picker/index.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120101194256_create_spud_media.rb
 - db/migrate/20120501203325_add_protected_to_spud_media.rb
@@ -295,12 +296,16 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/spud_media/1/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/1/original/test_img1.png
 - spec/dummy/public/system/spud_media/1/small/test_img1.png
+- spec/dummy/public/system/spud_media/2/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/2/original/test_img1.png
 - spec/dummy/public/system/spud_media/2/small/test_img1.png
+- spec/dummy/public/system/spud_media/3/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/3/original/test_img1.png
 - spec/dummy/public/system/spud_media/3/small/test_img1.png
+- spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/4/original/test_img1.png
 - spec/dummy/public/system/spud_media/4/small/test_img1.png
 - spec/dummy/public/system/spud_media/5/original/test_img1.png
@@ -328,15 +333,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: Spud File upload/management module
+summary: TB File upload/management module
 test_files:
 - spec/controllers/media_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -373,12 +378,16 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/spud_media/1/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/1/original/test_img1.png
 - spec/dummy/public/system/spud_media/1/small/test_img1.png
+- spec/dummy/public/system/spud_media/2/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/2/original/test_img1.png
 - spec/dummy/public/system/spud_media/2/small/test_img1.png
+- spec/dummy/public/system/spud_media/3/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/3/original/test_img1.png
 - spec/dummy/public/system/spud_media/3/small/test_img1.png
+- spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/4/original/test_img1.png
 - spec/dummy/public/system/spud_media/4/small/test_img1.png
 - spec/dummy/public/system/spud_media/5/original/test_img1.png