fcrepo_admin 0.3.3 → 0.3.4

data/HISTORY.rdoc

@@ -1,7 +1,25 @@
+=== 0.3.4
+
+* Moved FcrepoAdmin::BlacklightHelperBehavior to FcrepoAdmin::Helpers::BlacklightHelperBehavior.
+* FcrepoAdmin::ObjectsHelper methods can now be easily overridden.
+* DatastreamsHelper module added.
+* Shared helper methods in new module FcrepoAdmin::Helpers::FcrepoAdminHelperBehavior.
+* Objects and datastreams controller behaviors are now easily overrideable.
+* Refactored object and datastream context navs for greater reusability.
+
+=== 0.3.3
+
+* Audit trail functionality fails gracefully (i.e., if object does not implement ActiveFedora::Auditable)
+
+=== 0.3.2
+
+* Separated datastream and object context navigation menus.
+* Added object helpers.
+
 === 0.3.1
 
 * Object and datastream context nav menus added.
-* Audit trail moved into objects controller
+* Audit trail moved into objects controller.
 
 == 0.3.0
 

data/README.rdoc

@@ -46,12 +46,51 @@ See https://github.com/projecthydra/hydra-head/wiki/Installation-Prerequisites.
 
 * Customize catalog search results (optional)
 
-  If you would like catalog search results items to link to the object admin view
+  If you would like catalog search results items to link to the fcrepo_admin object show view
   instead of the catalog show view, create app/helpers/blacklight_helper.rb with this content:
 
     module BlacklightHelper
       include Blacklight::BlacklightHelperBehavior  # Default Blacklight behaviors
-      include FcrepoAdmin::BlacklightHelperBehavior # fcrepo_admin overrides
+      include FcrepoAdmin::Helpers::BlacklightHelperBehavior # fcrepo_admin overrides
+    end
+
+* Add audit trail support (optional)
+
+  To enable access to the Fedora audit trail data through the fcrepo_admin UI, add your ActiveFedora models:
+
+    include ActiveFedora::Auditable
+
+=== Overriding fcrepo_admin behaviors
+
+* Object view helpers
+
+  Create app/helpers/fcrepo_admin/objects_helper.rb with this content:
+
+    module FcrepoAdmin::ObjectsHelper
+      include FcrepoAdmin::Helpers::ObjectsHelperBehavior
+      # override and/or add methods here
+    end
+
+  In particular you may want to override #object_title.
+
+* Controllers
+
+  To override/extend the objects controller, create app/controllers/fcrepo_admin/objects_controller.rb:
+
+    module FcrepoAdmin
+      class ObjectsController < ApplicationController
+        include FcrepoAdmin::Controller::ObjectsControllerBehavior
+        # add your customizations
+      end
+    end
+
+  To override/extend the datastreams controller, create app/controllers/fcrepo_admin/datastreams_controller.rb:
+
+    module FcrepoAdmin
+      class DatastreamsController < ApplicationController
+        include FcrepoAdmin::Controller::DatastreamsControllerBehavior
+        # add your customizations
+      end
     end
 
 === License

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -1,79 +1,6 @@
-require 'mime/types'
-
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
-
-    include FcrepoAdmin::ControllerBehavior
-
-    layout 'fcrepo_admin/datastreams'
-
-    # Additional types of content that should be displayed inline
-    TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
-    MAX_INLINE_SIZE = 1024 * 64
-
-    before_filter :load_and_authorize_datastream
-    before_filter :inline_filter, :only => [:show, :edit]
-
-    def show
-    end
-
-    def download
-      mimetypes = MIME::Types[@datastream.mimeType]
-      send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
-    end
-
-    def edit
-    end
-
-    def upload
-    end
-
-    def update
-      if params[:file] # file uploaded
-        @datastream.content = params[:file].read
-      else # content submitted
-        @datastream.content = params[:content]
-      end
-      @object.save
-      flash[:notice] = "Datastream content updated." # i18n
-      redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
-    end
-
-    private
-
-    def load_and_authorize_datastream
-      load_object
-      load_datastream
-      authorize_datastream
-    end
-    
-    def load_object
-      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
-    end
-
-    def load_datastream
-      @datastream = @object.datastreams[params[:id]]
-    end
-
-    def authorize_datastream
-      action = case params[:action]
-               when 'upload'
-                 :edit
-               when 'download'
-                 :read
-               else
-                 params[:action].to_sym
-               end
-      # Datastream permissions are solely based on object permissions
-      authorize! action, @object
-    end
-
-    protected
-
-    def inline_filter
-      @inline = (@datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)) && @datastream.dsSize <= MAX_INLINE_SIZE
-    end
-
+    include FcrepoAdmin::Controller::DatastreamsControllerBehavior
   end
 end
 

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -1,67 +1,5 @@
 module FcrepoAdmin
   class ObjectsController < ApplicationController
-
-    include FcrepoAdmin::ControllerBehavior
-
-    layout 'fcrepo_admin/objects'
-    
-    PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
-
-    helper_method :object_properties
-
-    before_filter :load_and_authorize_object
-    before_filter :load_apo_info, :only => :show
-
-    def show
-    end
-
-    def audit_trail
-      if object_is_auditable?
-        if params[:download]
-          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
-        end
-      else
-        render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404
-      end
-    end
-
-    private
-
-    def load_and_authorize_object
-      load_object
-      authorize_object
-    end
-
-    def load_object
-      @object = ActiveFedora::Base.find(params[:id], :cast => true)
-    end
-
-    def authorize_object
-      action = params[:action] == 'audit_trail' ? :read : params[:action].to_sym
-      authorize! action, @object
-    end
-
-    protected
-
-    def object_properties
-      @object_properties ||= PROPERTIES.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
-    end
-
-    def apo_relationship_name
-      @object.reflections.each_value do |reflection|
-        # XXX This test should also check that reflection class is identical to admin policy class
-        return reflection.name if reflection.options[:property] == :is_governed_by && reflection.macro == :belongs_to
-      end
-      nil
-    end
-
-    def load_apo_info
-      @apo_relationship_name ||= apo_relationship_name
-      @object_admin_policy ||= @apo_relationship_name ? @object.send(@apo_relationship_name) : nil
-      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
-      # appears to be the only way that APO access control enforcement can be enabled.
-      @apo_enforcement_enabled ||= self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
-    end
-
+    include FcrepoAdmin::Controller::ObjectsControllerBehavior
   end
 end

data/app/helpers/fcrepo_admin/datastreams_helper.rb

@@ -0,0 +1,3 @@
+module FcrepoAdmin::DatastreamsHelper
+  include FcrepoAdmin::Helpers::DatastreamsHelperBehavior
+end

data/app/helpers/fcrepo_admin/objects_helper.rb

@@ -1,49 +1,3 @@
-module FcrepoAdmin
-  module ObjectsHelper
-
-    def object_title
-      "#{object_type} #{@object.pid}"
-    end
-
-    def object_type
-      @object.class.to_s
-    end
-
-    def object_has_permissions?
-      @object.is_a?(Hydra::ModelMixins::RightsMetadata)
-    end
-
-    def object_model_belongs_to_apo?
-      !@apo_relationship_name.nil?
-    end
-
-    def object_admin_policy
-      @object_admin_policy
-    end
-
-    def object_has_admin_policy?
-      !object_admin_policy.nil?
-    end
-
-    def object_has_inherited_permissions?
-      object_has_admin_policy?
-    end
-
-    def object_inherited_permissions
-      object_admin_policy && object_admin_policy.default_permissions
-    end
-
-    def admin_policy_enforcement_enabled?
-      @apo_enforcement_enabled
-    end
-
-    def admin_policy_object?
-      # XXX Ideally we would use Hydra::PolicyAwareAccessControlsEnforcement#policy_class,
-      # but it's only available if it's been included in the application controller, i.e.,
-      # if APO access control enforcement is enabled.  We want to know the name of the
-      # relationship regardless of whether policy enforcement is enabled.
-      @object.is_a?(Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy))
-    end
-
-  end
+module FcrepoAdmin::ObjectsHelper
+  include FcrepoAdmin::Helpers::ObjectsHelperBehavior
 end

data/app/views/fcrepo_admin/shared/_context_nav.html.erb

@@ -0,0 +1,12 @@
+<div class="well">
+  <ul class="nav nav-list">
+	<li class="nav-header">
+	  <%= header %>
+	</li>
+	<% items.each do |label, path| %>
+	<li>
+	  <%= link_to_unless_current label, path %>
+	</li>
+	<% end %>
+  </ul>
+</div>

data/app/views/layouts/fcrepo_admin/datastreams.html.erb

@@ -4,7 +4,7 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
-  <%= render :partial => 'fcrepo_admin/datastreams/context_nav_items', :locals => {:datastream => @datastream, :object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
+  <%= render_object_context_nav %>
+  <%= render_datastream_context_nav %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

data/app/views/layouts/fcrepo_admin/objects.html.erb

@@ -3,6 +3,6 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
+  <%= render_object_context_nav %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

data/lib/fcrepo_admin.rb

@@ -4,7 +4,16 @@ require 'hydra/head'
 
 module FcrepoAdmin
   autoload :SolrDocumentExtension, 'fcrepo_admin/solr_document_extension'
-  autoload :ControllerBehavior, 'fcrepo_admin/controller_behavior'
   autoload :DatastreamAbility, 'fcrepo_admin/datastream_ability'
-  autoload :BlacklightHelperBehavior, 'fcrepo_admin/blacklight_helper_behavior'
+  module Helpers
+    autoload :BlacklightHelperBehavior, 'fcrepo_admin/helpers/blacklight_helper_behavior'
+    autoload :ObjectsHelperBehavior, 'fcrepo_admin/helpers/objects_helper_behavior'
+    autoload :DatastreamsHelperBehavior, 'fcrepo_admin/helpers/datastreams_helper_behavior'
+    autoload :FcrepoAdminHelperBehavior, 'fcrepo_admin/helpers/fcrepo_admin_helper_behavior'
+  end
+  module Controller
+    autoload :ControllerBehavior, 'fcrepo_admin/controller/controller_behavior'
+    autoload :ObjectsControllerBehavior, 'fcrepo_admin/controller/objects_controller_behavior'
+    autoload :DatastreamsControllerBehavior, 'fcrepo_admin/controller/datastreams_controller_behavior'
+  end
 end

data/lib/fcrepo_admin/{controller_behavior.rb → controller/controller_behavior.rb}

@@ -1,4 +1,4 @@
-module FcrepoAdmin
+module FcrepoAdmin::Controller
   module ControllerBehavior
     extend ActiveSupport::Concern
 

data/lib/fcrepo_admin/controller/datastreams_controller_behavior.rb

@@ -0,0 +1,80 @@
+require 'mime/types'
+
+module FcrepoAdmin::Controller
+  module DatastreamsControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      layout 'fcrepo_admin/datastreams'
+      include FcrepoAdmin::Controller::ControllerBehavior
+      before_filter :load_and_authorize_datastream
+      before_filter :inline_filter, :only => [:show, :edit]
+    end
+
+    # Additional types of content that should be displayed inline
+    TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
+    MAX_INLINE_SIZE = 1024 * 64
+
+    def show
+    end
+
+    def download
+      mimetypes = MIME::Types[@datastream.mimeType]
+      send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
+    end
+
+    def edit
+    end
+
+    def upload
+    end
+
+    def update
+      if params[:file] # file uploaded
+        @datastream.content = params[:file].read
+      else # content submitted
+        @datastream.content = params[:content]
+      end
+      @object.save
+      flash[:notice] = "Datastream content updated." # i18n
+      redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
+    end
+
+    private
+
+    def load_and_authorize_datastream
+      load_object
+      load_datastream
+      authorize_datastream
+    end
+    
+    def load_object
+      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
+    end
+
+    def load_datastream
+      @datastream = @object.datastreams[params[:id]]
+    end
+
+    def authorize_datastream
+      action = case params[:action]
+               when 'upload'
+                 :edit
+               when 'download'
+                 :read
+               else
+                 params[:action].to_sym
+               end
+      # Datastream permissions are solely based on object permissions
+      authorize! action, @object
+    end
+
+    protected
+
+    def inline_filter
+      @inline = (@datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)) && @datastream.dsSize <= MAX_INLINE_SIZE
+    end
+
+  end
+end
+

data/lib/fcrepo_admin/controller/objects_controller_behavior.rb

@@ -0,0 +1,67 @@
+module FcrepoAdmin::Controller
+  module ObjectsControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      layout 'fcrepo_admin/objects'
+      include FcrepoAdmin::Controller::ControllerBehavior
+      helper_method :object_properties
+      before_filter :load_and_authorize_object
+      before_filter :load_apo_info, :only => :show
+    end
+    
+    PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
+
+    def show
+    end
+
+    def audit_trail
+      if object_is_auditable?
+        if params[:download]
+          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+        end
+      else
+        render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404
+      end
+    end
+
+    private
+
+    def load_and_authorize_object
+      load_object
+      authorize_object
+    end
+
+    def load_object
+      @object = ActiveFedora::Base.find(params[:id], :cast => true)
+    end
+
+    def authorize_object
+      action = params[:action] == 'audit_trail' ? :read : params[:action].to_sym
+      authorize! action, @object
+    end
+
+    protected
+
+    def object_properties
+      @object_properties ||= PROPERTIES.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
+    end
+
+    def apo_relationship_name
+      @object.reflections.each_value do |reflection|
+        # XXX This test should also check that reflection class is identical to admin policy class
+        return reflection.name if reflection.options[:property] == :is_governed_by && reflection.macro == :belongs_to
+      end
+      nil
+    end
+
+    def load_apo_info
+      @apo_relationship_name ||= apo_relationship_name
+      @object_admin_policy ||= @apo_relationship_name ? @object.send(@apo_relationship_name) : nil
+      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
+      # appears to be the only way that APO access control enforcement can be enabled.
+      @apo_enforcement_enabled ||= self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
+    end
+
+  end
+end

data/lib/fcrepo_admin/{blacklight_helper_behavior.rb → helpers/blacklight_helper_behavior.rb}

@@ -1,10 +1,10 @@
-module FcrepoAdmin
+module FcrepoAdmin::Helpers
   module BlacklightHelperBehavior
 
     def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
       opts[:label] ||= blacklight_config.index.show_link.to_sym
       label = render_document_index_label doc, opts
-      link_to label, fcrepo_admin.object_path(doc.id), { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter, :results_view].include? k  })
+      link_to label, fcrepo_admin.object_path(doc.id)
     end
 
   end

data/lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb

@@ -0,0 +1,25 @@
+module FcrepoAdmin::Helpers
+  module DatastreamsHelperBehavior
+    include FcrepoAdmin::Helpers::FcrepoAdminHelperBehavior
+
+    def datastream_context_nav_header
+      t("fcrepo_admin.datastream.nav.header")
+    end
+
+    def datastream_context_nav_items
+      items = []
+      items << [t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(@object, @datastream.dsid)]
+      if can? :edit, @object
+        items << [t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(@object, @datastream.dsid)]
+      end
+      items << [t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(@object, @datastream.dsid)]
+      items << [t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(@object, @datastream.dsid)]
+      items
+    end
+
+    def render_datastream_context_nav
+      render :partial => 'fcrepo_admin/shared/context_nav', :locals => {:header => datastream_context_nav_header, :items => datastream_context_nav_items}
+    end
+
+  end
+end

data/lib/fcrepo_admin/helpers/fcrepo_admin_helper_behavior.rb

@@ -0,0 +1,22 @@
+module FcrepoAdmin::Helpers
+  module FcrepoAdminHelperBehavior
+
+    def object_context_nav_items
+      items = []
+      items << [t("fcrepo_admin.object.nav.items.summary"), fcrepo_admin.object_path(@object)]
+      if object_is_auditable?
+        items << [t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(@object)]
+      end
+      items
+    end
+
+    def object_context_nav_header
+      t("fcrepo_admin.object.nav.header")
+    end
+
+    def render_object_context_nav
+      render :partial => 'fcrepo_admin/shared/context_nav', :locals => {:header => object_context_nav_header, :items => object_context_nav_items}
+    end
+
+  end
+end

data/lib/fcrepo_admin/helpers/objects_helper_behavior.rb

@@ -0,0 +1,50 @@
+module FcrepoAdmin::Helpers
+  module ObjectsHelperBehavior
+    include FcrepoAdmin::Helpers::FcrepoAdminHelperBehavior
+
+    def object_title
+      "#{object_type} #{@object.pid}"
+    end
+
+    def object_type
+      @object.class.to_s
+    end
+
+    def object_has_permissions?
+      @object.is_a?(Hydra::ModelMixins::RightsMetadata)
+    end
+
+    def object_model_belongs_to_apo?
+      !@apo_relationship_name.nil?
+    end
+
+    def object_admin_policy
+      @object_admin_policy
+    end
+
+    def object_has_admin_policy?
+      !object_admin_policy.nil?
+    end
+
+    def object_has_inherited_permissions?
+      object_has_admin_policy?
+    end
+
+    def object_inherited_permissions
+      object_admin_policy && object_admin_policy.default_permissions
+    end
+
+    def admin_policy_enforcement_enabled?
+      @apo_enforcement_enabled
+    end
+
+    def admin_policy_object?
+      # XXX Ideally we would use Hydra::PolicyAwareAccessControlsEnforcement#policy_class,
+      # but it's only available if it's been included in the application controller, i.e.,
+      # if APO access control enforcement is enabled.  We want to know the name of the
+      # relationship regardless of whether policy enforcement is enabled.
+      @object.is_a?(Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy))
+    end
+    
+  end
+end

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/internal/app/helpers/blacklight_helper.rb

@@ -1,4 +1,4 @@
 module BlacklightHelper
   include Blacklight::BlacklightHelperBehavior
-  include FcrepoAdmin::BlacklightHelperBehavior
+  include FcrepoAdmin::Helpers::BlacklightHelperBehavior
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -258,11 +258,11 @@ files:
 - Rakefile
 - app/controllers/fcrepo_admin/datastreams_controller.rb
 - app/controllers/fcrepo_admin/objects_controller.rb
+- app/helpers/fcrepo_admin/datastreams_helper.rb
 - app/helpers/fcrepo_admin/objects_helper.rb
 - app/mailers/.gitkeep
 - app/models/.gitkeep
 - app/views/fcrepo_admin/datastreams/_content.html.erb
-- app/views/fcrepo_admin/datastreams/_context_nav_items.html.erb
 - app/views/fcrepo_admin/datastreams/_datastream_nav.html.erb
 - app/views/fcrepo_admin/datastreams/_datastreams.html
 - app/views/fcrepo_admin/datastreams/_profile.html.erb
@@ -270,7 +270,6 @@ files:
 - app/views/fcrepo_admin/datastreams/index.html.erb
 - app/views/fcrepo_admin/datastreams/show.html.erb
 - app/views/fcrepo_admin/datastreams/upload.html.erb
-- app/views/fcrepo_admin/objects/_context_nav_items.html.erb
 - app/views/fcrepo_admin/objects/_more_info.html.erb
 - app/views/fcrepo_admin/objects/_permissions.html.erb
 - app/views/fcrepo_admin/objects/_permissions_header.html.erb
@@ -278,7 +277,7 @@ files:
 - app/views/fcrepo_admin/objects/_properties.html.erb
 - app/views/fcrepo_admin/objects/audit_trail.html.erb
 - app/views/fcrepo_admin/objects/show.html.erb
-- app/views/fcrepo_admin/shared/_context_nav_list.html.erb
+- app/views/fcrepo_admin/shared/_context_nav.html.erb
 - app/views/layouts/fcrepo_admin/datastreams.html.erb
 - app/views/layouts/fcrepo_admin/default.html.erb
 - app/views/layouts/fcrepo_admin/objects.html.erb
@@ -288,10 +287,15 @@ files:
 - fcrepo_admin.gemspec
 - lib/assets/.gitkeep
 - lib/fcrepo_admin.rb
-- lib/fcrepo_admin/blacklight_helper_behavior.rb
-- lib/fcrepo_admin/controller_behavior.rb
+- lib/fcrepo_admin/controller/controller_behavior.rb
+- lib/fcrepo_admin/controller/datastreams_controller_behavior.rb
+- lib/fcrepo_admin/controller/objects_controller_behavior.rb
 - lib/fcrepo_admin/datastream_ability.rb
 - lib/fcrepo_admin/engine.rb
+- lib/fcrepo_admin/helpers/blacklight_helper_behavior.rb
+- lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb
+- lib/fcrepo_admin/helpers/fcrepo_admin_helper_behavior.rb
+- lib/fcrepo_admin/helpers/objects_helper_behavior.rb
 - lib/fcrepo_admin/solr_document_extension.rb
 - lib/fcrepo_admin/version.rb
 - lib/tasks/.gitkeep
@@ -377,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -492490096386514261
+      hash: 4077346936896984845
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/app/views/fcrepo_admin/datastreams/_context_nav_items.html.erb

@@ -1,17 +0,0 @@
-<li class="nav-header">
-  <%= t("fcrepo_admin.datastream.nav.header") %>
-</li>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(object, datastream.dsid) %>
-</li>
-<% if can? :edit, object %>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(object, datastream.dsid) %>
-</li>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(object, datastream.dsid) %>
-</li>
-<% end %>
-<li>
-  <%= link_to t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(object, datastream.dsid) %>
-</li>

data/app/views/fcrepo_admin/objects/_context_nav_items.html.erb

@@ -1,11 +0,0 @@
-<li class="nav-header">
-  <%= t("fcrepo_admin.object.nav.header") %>
-</li>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.object.nav.items.summary"), fcrepo_admin.object_path(object) %>
-</li>
-<% if object_is_auditable? %>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(object) %>
-</li>
-<% end %>

data/app/views/fcrepo_admin/shared/_context_nav_list.html.erb

@@ -1,5 +0,0 @@
-<div class="well">
-  <ul class="nav nav-list">
-	<%= yield %>
-  </ul>
-</div>