hydra-head 3.1.4 → 3.1.5

data/app/controllers/generic_content_objects_controller.rb

@@ -1,37 +0,0 @@
-class GenericContentObjectsController < ApplicationController
-  
-  include Hydra::AssetsControllerHelper
-  include Hydra::FileAssetsHelper  
-  include Hydra::RepositoryController  
-  include MediaShelf::ActiveFedoraHelper
-  include Blacklight::SolrHelper
-  
-  before_filter :require_solr
-
-
-  def create 
-    unless params.has_key?(:Filedata)
-      raise "No file to process"
-    end
-    if !params[:container_id].nil? && params[:Filedata]
-      af_base =  ActiveFedora::Base.find(params[:container_id])
-      af_model = retrieve_af_model( af_base.relationships[:self][:has_model].first.split(":")[-1] )
-      logger.debug "#########: af_model = #{af_model.to_s}"
-      generic_content_object = af_model.load_instance(params[:container_id])
-      generic_content_object.content={:file => params[:Filedata], :file_name => params[:Filename]}
-      logger.debug "#########: set the content"
-      generic_content_object.save
-      logger.debug "#########: saved #{generic_content_object.pid} with new content #{params[:Filename]}"
-      if af_model == GenericImage
-        logger.debug "#########: deriving images"
-        generic_content_object.derive_all
-        logger.debug "#########: finished deriving images"
-      end   
-    end
-    render :nothing => true
-  end
-  
-  private
-  
-  
-end

data/app/views/fluid_infusion/_uploader.html.erb

@@ -1,79 +0,0 @@
-<%- stylesheet_links << ['../infusion/framework/fss/css/fss-layout.css'] %>
-<%- field_tag_options = defined?(uploader_options) ? uploader_options : {} %>
-<%- container_content_type_param = defined?(container_content_type) ? "?container_content_type=#{container_content_type}" : "" %>
-<div id="uploader-contents">
-    
-    <!-- This form will be progressively enhanced by the Fluid Uploader component. -->   
-    <%= form_tag upload_url, :enctype=>"multipart/form-data", :class=>"fl-uploader fl-progEnhance-basic" do %>     
-        <input type="hidden" name="container_id" value="<%=h container_id %>"/>
-        <%= hidden_field_tag("container_content_type", container_content_type) if defined?(container_content_type) %>
-        <p>Browse to upload a file.</p>
-        <!-- <input name="Filedata-orig" type="file" /> -->
-        <%= file_field_tag "Filedata", field_tag_options %>
-        <div><input type="submit" value="Upload File"/></div>
-    <% end %>
-    
-    <!-- This is the markup for the Fluid Uploader component itself. -->
-    <%= form_tag upload_url, :enctype=>"multipart/form-data", :class=>"flc-uploader fl-uploader fl-progEnhance-enhanced", :method=>:get do %>                   
-        <!-- The file queue -->
-        <div class="fl-uploader-queue-wrapper">
-            
-            <!-- Scrollable view -->
-            <div class="flc-scroller fl-scroller">
-                <div class="fl-scroller-inner">
-                    <table class="flc-uploader-queue fl-uploader-queue" >
-                        <tbody>
-                            <!-- Rows will be rendered in here. -->
-                            
-                            <!-- Template markup for the file queue rows -->
-                            <tr class="flc-uploader-file-tmplt flc-uploader-file fl-uploader-hidden-templates">
-                                <th class="flc-uploader-file-name fl-uploader-file-name" scope="row">File Name Placeholder</th>
-
-
-                                <td class="flc-uploader-file-size fl-uploader-file-size">0 KB</td>
-                                <td class="fl-uploader-file-actions">
-                                    <button type="button" class="flc-uploader-file-action fl-uploader-file-action" title="Remove File" tabindex="-1">
-                                        <span class="fl-uploader-button-text fl-uploader-hidden">Remove file from queue</span>
-                                    </button>
-                                </td>
-                            </tr>
-                            
-                            <!-- Template for the file error info rows -->
-                            <tr class="flc-uploader-file-error-tmplt fl-uploader-file-error fl-uploader-hidden-templates">
-                                <td colspan="3" class="flc-uploader-file-error"></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="flc-uploader-file-progressor-tmplt fl-uploader-file-progress"><span class="fl-uploader-file-progress-text fl-uploader-hidden">76%</span></div>
-                </div>
-            </div>
-            
-            <div class="flc-uploader-browse-instructions fl-uploader-browse-instructions"></div>
-
-            <!-- Foot of the queue -->
-            <div class="flc-uploader-queue-footer fl-uploader-queue-footer">
-                <table>
-                        <tr>
-                            <td class="flc-uploader-total-progress-text">
-                                <!-- Total: <span class="fl-uploader-totalFiles">0</span> files 
-                                (<span class="fl-uploader-totalBytes">0 KB</span>) -->
-                            </td>
-                            <td class=".fl-uploader-footer-buttons" >
-                                <a href="#" class="flc-uploader-button-browse fl-uploader-browse">Add Files</a>
-                            </td>
-                        </tr>
-
-                </table>
-                <div class="flc-uploader-total-progress fl-uploader-total-progress-okay">&nbsp;</div>
-            </div>
-
-        </div>
-        
-        <!-- Action buttons -->
-        <div class="fl-uploader-btns">
-            <button type="button" class="flc-uploader-button-pause fl-uploader-pause fl-uploader-hidden">Stop Upload</button><button type="button" class="flc-uploader-button-upload fl-uploader-upload fl-uploader-button-default fl-uploader-dim ui-button ui-widget ui-state-default" disabled="disabled">Upload</button>
-        </div>
-    <% end %>
-	
-</div>
-<div style="clear:both;"></div>

data/app/views/fluid_infusion/_uploader_generic_content_objects.js.erb

@@ -1,38 +0,0 @@
-<script type="text/javascript">
-
-
-    var myUploader = fluid.progressiveEnhanceableUploader(".flc-uploader", ".fl-progEnhance-basic", {
-                  uploadManager: {
-                 type: "fluid.swfUploadManager",
-      
-                 options: {
-                    // Set the uploadURL to the URL for posting files to your server.
-                    uploadURL: "<%= generic_content_object_path(:container_id => params[:id], :only_path => false) %>",
-      
-                    // This option points to the location of the SWFUpload Flash object that ships with Fluid Infusion.
-                    flashURL: "<%= image_path("../infusion/lib/swfupload/flash/swfupload.swf", :plugin=>"fluid-infusion") %>"
-               }
-             },
-      
-      listeners: {
-                  onFileSuccess: function (file, serverData){
-                  },
-      
-                  afterUploadComplete: function () {
-                      // first check to see if the file queue is empty and there haven't been any errors
-                      if (myUploader.uploadManager.queue.getReadyFiles().length === 0 && myUploader.uploadManager.queue.getErroredFiles().length === 0) {
-                          //async_load('<%= "/generic_content_objects/#{params[:container_id]}/content"%>', '#uploads'); 
-                         $("#file_assets  .editable-container").hydraTextField();
-                      }
-                  }
-              },
-      
-                  decorators: {
-                      type: "fluid.swfUploadSetupDecorator",
-                      options: {
-                          // This option points to the location of the Browse Files button used with Flash 10 clients.
-                          flashButtonImageURL: "<%= image_path("../infusion/components/uploader/images/browse.png", :plugin=>"fluid-infusion") %>"
-                      }
-                  }
-              });
-</script>

data/app/views/fluid_infusion/_uploader_js.erb

@@ -1,45 +0,0 @@
-<script type="text/javascript">
-          var myUploader = fluid.progressiveEnhanceableUploader(".flc-uploader", ".fl-progEnhance-basic", {
-                  uploadManager: {
-                 type: "fluid.swfUploadManager",
-      
-                 options: {
-                    // Set the uploadURL to the URL for posting files to your server.
-                    uploadURL: "<%= file_assets_path(:container_id=> params[:container_id], :only_path => false) %>",
-      
-                    // This option points to the location of the SWFUpload Flash object that ships with Fluid Infusion.
-                    flashURL: "<%= image_path("../infusion/lib/swfupload/flash/swfupload.swf", :plugin=>"fluid-infusion") %>"
-               }
-             },
-      
-      listeners: {
-	
-				onFileStart: function(file){	
-					myUploader.uploadManager.swfUploader.addPostParam("asset[descMetadata][type][0]", $('#asset_descMetadata_type').val());
-					myUploader.uploadManager.swfUploader.addPostParam("asset[descMetadata][description][0]", $('#asset_descMetadata_description').val());					
-		},
-
-                  onFileSuccess: function (file, serverData){},
-      			 
-                  afterUploadComplete: function () {
-                    
-                      // first check to see if the file queue is empty and there haven't been any errors
-                      if (myUploader.uploadManager.queue.getReadyFiles().length === 0 && myUploader.uploadManager.queue.getErroredFiles().length === 0) {
-                          // Custom for UVA Libra -- triggers update of File Uploaded indicator in progress box
-                          //$.fn.hydraProgressBox.checkUncheckProgress('pbFileUploaded', true);                          
-                          async_load('<%= "/assets/#{params[:container_id]}/file_assets"%>', '#uploads'); 
-                          $("#file_assets  .editable-container").hydraTextField();
-                      }
-  
-                  }
-              },
-      
-                  decorators: {
-                      type: "fluid.swfUploadSetupDecorator",
-                      options: {
-                          // This option points to the location of the Browse Files button used with Flash 10 clients.
-                          flashButtonImageURL: "<%= image_path("../infusion/components/uploader/images/browse.png", :plugin=>"fluid-infusion") %>"
-                      }
-                  }
-              });
-</script>

data/test_support/spec/views/uploader.html.erb_spec.rb

@@ -1,30 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe 'fluid_infusion/_uploader.html.erb' do
-  before do
-    view.stubs(:upload_url).returns("/assets/_PID_/file_assets")
-    view.stubs(:container_id).returns('111')
-  end
-
-  it "should permit locals for container_content_type" do
-    render :partial => "fluid_infusion/uploader", :locals => {:container_content_type=>"foo_bar"}
-    rendered.should have_selector "form.fl-uploader.fl-progEnhance-basic", :action => "/assets/_PID_/file_assets" do
-      with_tag "input#container_content_type", :value => "foo_bar"
-    end
-  end
-  
-  it "should permit locals for uploader html_options" do
-    render :partial => "fluid_infusion/uploader", :locals => {:html_options=>{:uploader_options => {:accept => "application/pdf"}}}
-    rendered.should have_selector "input#Filedata", :type => "file", :accept=>"application/pdf"
-  end
-
-  it "should work with no locals passed in" do
-    render
-    rendered.should have_selector  "form.fl-uploader.fl-progEnhance-basic", :action => "/assets/_PID_/file_assets" do
-      without_tag "input#container_content_type"
-      with_tag "input#Filedata", :type=>"file" do
-        without_tag "[accept=?]"
-      end
-    end
-  end
-end