tb_media 1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZjMTJmNTgwYzNkZWM0OWVmMzAwMGU5NGYwM2IxNjk2ZWIzYTRlOA==
+    NjQxMzBlNGVlYTQ2YTA0Y2JhZGRkOGNkOWFkNDU1YTM4MGFmNzU3Mw==
   data.tar.gz: !binary |-
-    N2Q1NTRmNjhmYTVkN2I3MWQ4M2RhNmEzZGY5MTNjNzM2NmRhYWE3YQ==
+    YmM2ZWMyMGNiNmQ3MjIyYTRkOWM4NDRmNjcyYTgxNzVmNTBkMTgyYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGNjYTE0MmU1OTU1NzRiZDMwY2IxZWUyZGJhYTliZDk5Y2ZhYmVjMzUwZTdl
-    YmRiNzFhMDhlM2I4MjgxMGVmNDVjMWNhNzEzZmY4ZTE0YmI5YmExMjUzNTZk
-    MTE2ZjcwOGRlOTFlNDVhYTU3ZDBhYmQ1ZjY1ZGEzNDc5ZmIzNjg=
+    ZDg1Yjk0YTJlOWE4NGE2YzMyNDkwOTE4OTJlM2RjNWZhZGE4YmUxMWUxYzk5
+    Zjg5YWQ0N2E3N2FjOGY3NGFiOGFiM2M1Njg2OTVkZmViNDVhNTVjNDMwNGVk
+    ZDY5NWVmMmI5NTkzZjlhZGY1ZDZlZmYwZmY1Nzg2YzYwNTk1NTQ=
   data.tar.gz: !binary |-
-    OGNhOTM1ZWNmYzgzM2RhOTNkZjRmOGVjMTVhMjM4MTI1ZmU3YTk2MmNkMWIx
-    YmNmMmRmOTA3YjAzYWIxYjAxYzQwZTQxNzdiODJiODEzMjYxNGNkOGYwMWY3
-    YWJhYjMzMjM4N2I3YWMyOTdiYjc0ZDZiODg0MTU4ZTZjOTU0MDQ=
+    Nzc5M2ZhZmIyZTA2MGNlMGMyNDBmNjNkNmZjYjIyNzQ5ZjRjNTc5Y2FjNzk5
+    ODk1ODdmOWIxZDRhMWI1NzUxMmQyZTI1OWQwODI5Y2I4OWZmYzQyNTEzYWFl
+    YTYzZWU5MzhmNGI0N2RmODE4ZDA3YTA1ZmYxMDJkMjU0NzFmMTc=

data/Rakefile

@@ -26,3 +26,12 @@ load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
 
 require 'rake'
+
+begin
+  require 'jasmine'
+  load 'jasmine/tasks/jasmine.rake'
+rescue LoadError
+  task :jasmine do
+    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+  end
+end

data/Readme.markdown

@@ -1,24 +1,24 @@
-# Spud Media
+# TB Media
 
-Spud Media is an engine for managing documents and other miscellaneous media files, designed for use with [Spud][1].
+TB Media is an engine for managing documents and other miscellaneous media files, designed for use with [Twice Baked][1].
 
 ## Installation/Usage
 
 1. In your Gemfile add the following
 
-    gem 'spud_media'
+    gem 'tb_media'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project
 
-    bundle exec rake railties:install:migrations
-    rake db:migrate
+        bundle exec rake railties:install:migrations
+        rake db:migrate
 
-4. Run a rails server instance and point your browser to /spud/admin
+4. Run a rails server instance and point your browser to `/admin`
 
 ## Configuration
 
-Spud Photos accepts the following configuration options:
+TB Media accepts the following configuration options:
 
     Spud::Media.configure do |config|
   
@@ -26,7 +26,7 @@ Spud Photos accepts the following configuration options:
         config.paperclip_storage = :s3
         config.s3_credentials = "#{Rails.root}/config/s3.yml"
 
-    # see below for notes on 'storage_path_protected'
+        # see below for notes on 'storage_path_protected'
         config.storage_path = "public/system/spud_media/:id/:style/:basename.:extension"
         config.storage_path_protected = "public/system/spud_media_protected/:id/:style/:basename.:extension"
         config.storage_url = "/system/spud_media/:id/:style/:basename.:extension"
@@ -50,12 +50,10 @@ Files marked as unprotected will be uploaded to Amazon using the `public_read` A
 
 Files marked as protected are uploaded using the `private` ACL. In this case, calling `@media.attachment_url` will return a local URL that hits the show action of our `ProtectedMedia` controller. Once we have verified the user is logged in we generate a secure URL and redirect the user to it. The generated URL is good for 10 minutes. 
 
-[1]:https://github.com/davydotcom/spud_core_admin
-
 Testing
 -----------------
 
-Spud uses RSpec for testing. Get the tests running with a few short commands:
+TB uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
    
@@ -70,4 +68,6 @@ Spud uses RSpec for testing. Get the tests running with a few short commands:
 
 		rspec spec
 
-After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+
+[1]:https://bitbucket.org/westlakedesign/tb_core

data/app/assets/javascripts/{spud/admin → admin}/media/application.js

@@ -1,6 +1,6 @@
 //= require jcrop/js/jquery.Jcrop
-//= require spud/admin/media/plugin
-//= require spud/admin/media/picker
+//= require admin/media/plugin
+//= require admin/media/picker
 //= require_self
 
 spud.admin.media = new function(){
@@ -19,15 +19,7 @@ spud.admin.media = new function(){
 
   this.edit = function(){
     cropimage = $('#spud_media_cropper_image');
-    // IE8 isn't handling the image load event properly, so...
-    setTimeout(function(){
-      if(cropimage[0].complete){
-        self.initializeEditor();
-      }
-      else{
-        self.edit();
-      }
-    }, 50);
+    self.initializeEditor();
   };
 
   this.initializeEditor = function(){
@@ -172,4 +164,22 @@ spud.admin.media = new function(){
       return false;
     }
   };
+  /* parseIntOrDefault
+   * @params
+   * val {required} = value to be parsed
+   * defVal {required} = default return value if parsing fails
+   * radix {optional} = base
+  */
+  this.parseIntOrDefault = function(params) {
+    var radix = params.radix || 10;
+    var val = params.val;
+    var result = parseInt(val, radix);
+    if(isNaN(result)) {
+      result = 0;
+      if(params.hasOwnProperty('defVal')) {
+        result = params.defVal;
+      }
+    }
+    return result;
+  };
 };

data/app/assets/javascripts/{spud/admin → admin}/media/picker.js

@@ -116,7 +116,7 @@ spud.admin.mediapicker = new function(){
     $('.spud_media_picker_list').prepend(html);
     $('.spud_media_picker_item').first().click();
     self.goToTab('#spud_media_picker_tab_choose');
-    self.resetUplaodForm();
+    self.resetUploadForm();
   };
 
   this.resetUploadForm = function(){
@@ -190,8 +190,8 @@ spud.admin.mediapicker = new function(){
     e.preventDefault();
     if(selectedFile.type == 'img'){
       selectedFile.title = $('input[name="spud_media_picker_option_title"]').val();
-      selectedFile.width = parseInt($('input[name="spud_media_picker_option_dimension_w"]').val(), 10);
-      selectedFile.height = parseInt($('input[name="spud_media_picker_option_dimension_h"]').val(), 10);
+      selectedFile.width = spud.admin.media.parseIntOrDefault({value: $('input[name="spud_media_picker_option_dimension_w"]').val(), defVal: ""});
+      selectedFile.height = spud.admin.media.parseIntOrDefault({value: $('input[name="spud_media_picker_option_dimension_h"]').val(), defVal: ""});
       var float = $('select[name="spud_media_picker_option_float"]').val();
       var style = "";
       if(float){

data/app/assets/javascripts/{spud/admin → admin}/media/plugin.js

@@ -28,7 +28,7 @@
       ed.addCommand('spudMediaShowPicker', function(){
         ed.windowManager.open({
           title: 'Spud Media Picker',
-          file: '/spud/admin/media_picker',
+          file: '/admin/media_picker',
           width: 450 + parseInt(ed.getLang('example.delta_width', 0), 10),
           height: 300 + parseInt(ed.getLang('example.delta_height', 0), 10),
           inline: 1,
@@ -43,7 +43,7 @@
       ed.addButton('spud_media_picker', {
         title: 'Insert Spud Media',
         cmd: 'spudMediaShowPicker',
-        image: '/assets/spud/admin/media_tiny.png'
+        image: '/assets/admin/media_tiny.png'
       });
 
       ed.addCommand('spudMediaInsertSelected', function(ui, data){

data/app/assets/libs/jcrop/css/jquery.Jcrop.css

@@ -15,7 +15,7 @@
 /* Selection Border */
 .jcrop-vline,
 .jcrop-hline {
-  background: #ffffff url("Jcrop.gif");
+  background: #ffffff url("/assets/jcrop/css/Jcrop.gif");
   font-size: 0;
   position: absolute;
 }

data/app/assets/stylesheets/{spud/admin/media/application.css → admin/media/application.css.scss}

@@ -1,7 +1,5 @@
-/*
-*= require jcrop/css/jquery.Jcrop
-*= require spud/admin/media/plugin
-*/
+//= require jcrop/css/jquery.Jcrop
+//= require admin/media/plugin
 
 img.size-50-thumb {
   width:50px;
@@ -24,24 +22,25 @@ img.size-50-thumb {
   border-top: none;
 }
 #spud_media_cropper{
-  position: relative;
-  overflow: hidden;
-  width: 900px;
   /*height: 800px;*/
-  background:url('/assets/spud/admin/media/checkers.jpg');
-  margin:auto;
+  background: image-url('admin/media/checkers.jpg');
 }
 #spud_media_cropper_container{
 
 }
 #spud_media_cropper_jcrop_container{
-  position: absolute;
+  position: relative;
 }
 #spud_media_cropper_target{
   position: absolute;
 }
 #spud_media_cropper_image{
   position: absolute;
+  max-width: none;
+  display:none;
+}
+#spud_media_cropper img {
+  max-width: none !important;
 }
 
 /* Crop toolbar

data/app/controllers/{spud/admin → admin}/media_controller.rb

@@ -1,6 +1,6 @@
-class Spud::Admin::MediaController < Spud::Admin::ApplicationController
-	layout 'layouts/spud/admin/detail'
-	add_breadcrumb "Media", :spud_admin_media_path
+class Admin::MediaController < Admin::ApplicationController
+	layout 'admin/detail'
+	add_breadcrumb "Media", :admin_media_path
 	belongs_to_spud_app :media
 	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access]
 	
@@ -11,35 +11,29 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 
 	def new
 		@page_name = "New Media"
-		add_breadcrumb "New", :new_spud_admin_medium_path
+		add_breadcrumb "New", :new_admin_medium_path
 		@media = SpudMedia.new
 		respond_with @media
 	end
 
 	def create
 		@page_name = "New Media"
-		add_breadcrumb "New", :new_spud_admin_medium_path
+		add_breadcrumb "New", :new_admin_medium_path
 		@media = SpudMedia.new(params[:spud_media])
-		location = spud_admin_media_path
+		location = admin_media_path
 		if @media.save
 			flash[:notice] = "File uploaded successfully" 
 			if @media.is_image?
-				location = edit_spud_admin_medium_path(@media.id)
+				location = edit_admin_medium_path(@media.id)
 			end
 		end
 		respond_with @media, :location => location
 	end
 
-	def show
-		@page_name = "Media: #{@media.attachment_file_name}"
-		add_breadcrumb @media.attachment_file_name, :new_spud_admin_media_path
-		respond_with @media
-	end
-
 	def edit
 		if !@media.is_image?
 			flash[:error] = "Unable to edit #{@media.attachment_file_name}"
-			redirect_to spud_admin_media_url
+			redirect_to admin_media_path
 		end
 	end
 
@@ -47,18 +41,18 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 		if @media.update_attributes(params[:spud_media])
 			@media.attachment.reprocess!
 		end
-		respond_with @media, :location => spud_admin_media_url
+		respond_with @media, :location => admin_media_path
 	end
 
 	def destroy
 		flash[:notice] = "File successfully destroyed" if @media.destroy
-		respond_with @media, :location => spud_admin_media_url
+		respond_with @media, :location => admin_media_path
 	end
 
 	def set_access
 		is_protected = params[:protected] || false
 		@media.update_attribute(:is_protected, is_protected)
-		respond_with @media, :location => spud_admin_media_url
+		respond_with @media, :location => admin_media_path
 	end
 
 private
@@ -66,7 +60,7 @@ private
 		@media = SpudMedia.where(:id => params[:id]).first
 		if @media.blank?
 			flash[:error] = "Media Asset not found!"
-			redirect_to spud_admin_media_url() and return
+			redirect_to admin_media_path() and return
 		end
 		
 	end

data/app/controllers/{spud/admin → admin}/media_picker_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Admin::MediaPickerController < Spud::Admin::ApplicationController
+class Admin::MediaPickerController < Admin::ApplicationController
 
   include RespondsToParent
 

data/app/models/spud_media.rb

@@ -16,6 +16,8 @@ class SpudMedia < ActiveRecord::Base
 
   validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
 
+  validates_attachment :attachment, :presence => true
+
   before_create :rename_file
   #after_create :validate_permissions
   before_update :validate_permissions
@@ -29,41 +31,41 @@ class SpudMedia < ActiveRecord::Base
 
   def image_from_type
 
-    if self.is_image? || self.is_pdf?
+    if self.is_image?
       return self.attachment_url(:small)
 
     elsif self.attachment_content_type.blank?
-    	return "spud/admin/files_thumbs/dat_thumb.png"
+    	return "admin/files_thumbs/dat_thumb.png"
     
     elsif self.attachment_content_type.match(/jpeg|jpg/)
-    	return "spud/admin/files_thumbs/jpg_thumb.png"
+    	return "admin/files_thumbs/jpg_thumb.png"
     
     elsif self.attachment_content_type.match(/png/)
-    	return "spud/admin/files_thumbs/png_thumb.png"
+    	return "admin/files_thumbs/png_thumb.png"
     
     elsif self.attachment_content_type.match(/zip|tar|tar\.gz|gz/)
-    	return "spud/admin/files_thumbs/zip_thumb.png"
+    	return "admin/files_thumbs/zip_thumb.png"
     
     elsif self.attachment_content_type.match(/xls|xlsx/)
-    	return "spud/admin/files_thumbs/xls_thumb.png"
+    	return "admin/files_thumbs/xls_thumb.png"
     
     elsif self.attachment_content_type.match(/doc|docx/)
-    	return "spud/admin/files_thumbs/doc_thumb.png"
+    	return "admin/files_thumbs/doc_thumb.png"
     
     elsif self.attachment_content_type.match(/ppt|pptx/)
-    	return "spud/admin/files_thumbs/ppt_thumb.png"
+    	return "admin/files_thumbs/ppt_thumb.png"
     
     elsif self.attachment_content_type.match(/txt|text/)
-    	return "spud/admin/files_thumbs/txt_thumb.png"
+    	return "admin/files_thumbs/txt_thumb.png"
     
     elsif self.attachment_content_type.match(/pdf|ps/)
-    	return "spud/admin/files_thumbs/pdf_thumb.png"
+    	return "admin/files_thumbs/pdf_thumb.png"
     
     elsif self.attachment_content_type.match(/mp3|wav|aac/)
-    	return "spud/admin/files_thumbs/mp3_thumb.png"
+    	return "admin/files_thumbs/mp3_thumb.png"
     end
     
-    return "spud/admin/files_thumbs/dat_thumb.png"
+    return "admin/files_thumbs/dat_thumb.png"
   end
 
   def is_image?
@@ -88,7 +90,7 @@ class SpudMedia < ActiveRecord::Base
 
   def dynamic_styles
     styles = {}
-    if is_image? || is_pdf?
+    if is_image? #|| is_pdf?
       styles[:small] = '50'
       if has_custom_crop?
         styles[:cropped] = {:geometry => '', :convert_options => "-resize #{crop_s}% -crop #{crop_w}x#{crop_h}+#{crop_x}+#{crop_y}"}

data/app/views/{spud/admin → admin}/media/edit.html.erb

@@ -1,7 +1,7 @@
 <%= error_messages_for(@media) %>
 
 <div id="spud_media_cropper_toolbar">
-  <%= form_for @media, :url => spud_admin_medium_path(@media) do |f| %>
+  <%= form_for @media, :url => admin_medium_path(@media) do |f| %>
 
     <div class="spud_media_cropper_toolbar_item">
       <%= label_tag :x %>
@@ -32,16 +32,14 @@
 
     <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", spud_admin_media_path, :class => 'btn btn-mini' %>
+      <%= link_to "Don't Crop", admin_media_path, :class => 'btn btn-mini' %>
     </div>
   <% end %>
 </div>
 
 <div id="spud_media_cropper_outer">
-  <div id="spud_media_cropper">
-    <div id="spud_media_cropper_jcrop_container">
+  <div id="spud_media_cropper" align="center">
       <img src="<%= @media.attachment_url(:original) %>" id="spud_media_cropper_image" />
-    </div>
   </div>
 </div>
 

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

@@ -0,0 +1,37 @@
+<%=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>
+
+				<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',:confirm => "Are you sure you want to remove this file?"%>
+				</span>
+				
+				<br style="clear:both;"/>
+			</div>
+			<%end%>
+			<%=will_paginate @media%>
+
+	</div>
+
+<%end%>

data/app/views/{spud/admin → admin}/media/new.html.erb

@@ -1,7 +1,8 @@
 
   
 
-  <%=form_for @media,:url => spud_admin_media_path(),:html=>{:class=>"form-horizontal", :multipart => true} do |f|%>
+  <%=form_for @media,:url => admin_media_path(),:html=>{:class=>"form-horizontal", :multipart => true} do |f|%>
+  <%= tb_form_errors(@media) %>
   <fieldset>
 	  <legend>Upload Media</legend>
 	  
@@ -20,7 +21,7 @@
     </div>
 
   <div class="form-actions">
-      <%=f.submit "Upload", :class=>"btn btn-primary","data-loading-text"=>"Uploading..."%> or <%=link_to "cancel",spud_admin_media_path,:class => "btn"%>
+      <%=f.submit "Upload", :class=>"btn btn-primary","data-loading-text"=>"Uploading..."%> or <%=link_to "cancel",admin_media_path,:class => "btn"%>
     </div>
   <%end%>
 

data/app/views/{spud/admin → admin}/media_picker/_media.html.erb

@@ -7,7 +7,7 @@
   'data-lastmod' => media.attachment_updated_at.blank? == false ? media.attachment_updated_at.strftime("%l:%M %p, %D") : '',
   'data-protected' => (media.is_protected ? 'Yes' : 'No') do %>
   <span class="spud_media_picker_item_thumb">
-    <% if media.is_protected && (media.is_image? || media.is_pdf?) %>
+    <% if media.is_protected && media.is_image? %>
       <img src="<%= media.image_from_type %>"/>
     <% else %>
       <%= image_tag(media.image_from_type) %>

data/config/routes.rb

@@ -1,11 +1,10 @@
 Rails.application.routes.draw do
-	namespace :spud do
-		namespace :admin do
-			resources :media do
-        put 'set_access', :on => :member
-      end
-      resources :media_picker, :only => [:index, :create]
-		end
+
+	namespace :admin do
+		resources :media do
+      put 'set_access', :on => :member
+    end
+    resources :media_picker, :only => [:index, :create]
 	end
 
   #get '/media/protected/:id/:style/:filename' => 'ProtectedMedia#show', :as => 'protected_media'

data/lib/spud_media/engine.rb

@@ -1,14 +1,15 @@
 require 'tb_core'
 require 'paperclip'
+
 module Spud
 	module Media
 		 class Engine < Rails::Engine
 			engine_name :tb_media
 			initializer :admin do
-				Spud::Core.append_admin_javascripts('spud/admin/media/application')
-  			Spud::Core.append_admin_stylesheets('spud/admin/media/application')
+				Spud::Core.append_admin_javascripts('admin/media/application')
+  			Spud::Core.append_admin_stylesheets('admin/media/application')
 				Spud::Core.configure do |config|
-				  config.admin_applications += [{:name => "Media",:thumbnail => "spud/admin/media_thumb.png",:url => "/spud/admin/media",:order => 3,:retina => true}]
+				  config.admin_applications += [{:name => "Media", :thumbnail => "admin/media_thumb.png", :url => "/admin/media", :order => 3, :retina => true}]
 				end
 			end
 		 end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.0"
+		VERSION = "1.0.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: jasmine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !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
 email:
@@ -172,23 +200,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/spud/admin/files_thumbs/dat_thumb.png
-- app/assets/images/spud/admin/files_thumbs/doc_thumb.png
-- app/assets/images/spud/admin/files_thumbs/jpg_thumb.png
-- app/assets/images/spud/admin/files_thumbs/mp3_thumb.png
-- app/assets/images/spud/admin/files_thumbs/pdf_thumb.png
-- app/assets/images/spud/admin/files_thumbs/png_thumb.png
-- app/assets/images/spud/admin/files_thumbs/ppt_thumb.png
-- app/assets/images/spud/admin/files_thumbs/txt_thumb.png
-- app/assets/images/spud/admin/files_thumbs/xls_thumb.png
-- app/assets/images/spud/admin/files_thumbs/zip_thumb.png
-- app/assets/images/spud/admin/media/checkers.jpg
-- app/assets/images/spud/admin/media_thumb.png
-- app/assets/images/spud/admin/media_thumb@2x.png
-- app/assets/images/spud/admin/media_tiny.png
-- app/assets/javascripts/spud/admin/media/application.js
-- app/assets/javascripts/spud/admin/media/picker.js
-- app/assets/javascripts/spud/admin/media/plugin.js
+- app/assets/images/admin/files_thumbs/dat_thumb.png
+- app/assets/images/admin/files_thumbs/doc_thumb.png
+- app/assets/images/admin/files_thumbs/jpg_thumb.png
+- app/assets/images/admin/files_thumbs/mp3_thumb.png
+- app/assets/images/admin/files_thumbs/pdf_thumb.png
+- app/assets/images/admin/files_thumbs/png_thumb.png
+- app/assets/images/admin/files_thumbs/ppt_thumb.png
+- app/assets/images/admin/files_thumbs/txt_thumb.png
+- app/assets/images/admin/files_thumbs/xls_thumb.png
+- app/assets/images/admin/files_thumbs/zip_thumb.png
+- app/assets/images/admin/media/checkers.jpg
+- app/assets/images/admin/media_thumb.png
+- app/assets/images/admin/media_thumb@2x.png
+- app/assets/images/admin/media_tiny.png
+- app/assets/javascripts/admin/media/application.js
+- app/assets/javascripts/admin/media/picker.js
+- app/assets/javascripts/admin/media/plugin.js
 - app/assets/libs/jcrop/css/Jcrop.gif
 - app/assets/libs/jcrop/css/jquery.Jcrop.css
 - app/assets/libs/jcrop/css/jquery.Jcrop.min.css
@@ -203,22 +231,20 @@ files:
 - app/assets/libs/tiny_mce/plugins/spud_media/js/template.js
 - app/assets/libs/tiny_mce/plugins/spud_media/langs/en_dlg.js
 - app/assets/libs/tiny_mce/plugins/spud_media/template.htm
-- app/assets/stylesheets/spud/admin/media/application.css
-- app/assets/stylesheets/spud/admin/media/plugin.css
+- app/assets/stylesheets/admin/media/application.css.scss
+- app/assets/stylesheets/admin/media/plugin.css
+- app/controllers/admin/media_controller.rb
+- app/controllers/admin/media_picker_controller.rb
 - app/controllers/protected_media_controller.rb
-- app/controllers/spud/admin/media_controller.rb
-- app/controllers/spud/admin/media_picker_controller.rb
 - app/helpers/protected_media_helper.rb
-- app/helpers/spud/admin/users_helper.rb
-- app/helpers/spud/user_sessions_helper.rb
 - app/models/spud_media.rb
-- app/views/spud/admin/media/edit.html.erb
-- app/views/spud/admin/media/index.html.erb
-- app/views/spud/admin/media/new.html.erb
-- app/views/spud/admin/media_picker/_media.html.erb
-- app/views/spud/admin/media_picker/create.html.erb
-- app/views/spud/admin/media_picker/create.js.erb
-- app/views/spud/admin/media_picker/index.html.erb
+- app/views/admin/media/edit.html.erb
+- app/views/admin/media/index.html.erb
+- app/views/admin/media/new.html.erb
+- app/views/admin/media_picker/_media.html.erb
+- 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/routes.rb
 - db/migrate/20120101194256_create_spud_media.rb
 - db/migrate/20120501203325_add_protected_to_spud_media.rb
@@ -250,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Spud File upload/management module

data/app/helpers/spud/admin/users_helper.rb

@@ -1,2 +0,0 @@
-module Spud::Admin::UsersHelper
-end

data/app/helpers/spud/user_sessions_helper.rb

@@ -1,2 +0,0 @@
-module Spud::UserSessionsHelper
-end

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

@@ -1,37 +0,0 @@
-<%=content_for :data_controls do%>
-<%=link_to "Upload File",new_spud_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? || media.is_pdf?) %>
-						<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.url.split("/").last, media.attachment_url %>					
-				</span>
-
-				<span class="edit_controls">
-					<% if media.is_image? %>
-						<%= link_to 'Crop', edit_spud_admin_medium_path(media.id), :class => 'btn' %>
-					<% end %>
-					<% if media.is_protected %>
-						<%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_spud_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn' %>
-					<% else %>
-						<%= link_to 'Public', set_access_spud_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn' %>
-					<% end %>
-					<%=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?"%>
-				</span>
-				
-				<br style="clear:both;"/>
-			</div>
-			<%end%>
-			<%=will_paginate @media%>
-
-	</div>
-
-<%end%>