worthwhile 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99fe1f3999559e6ebe5f243a20805860f628bd43
-  data.tar.gz: ead1fe02d3000867e4e0fb14d9dee96e6ec22b0f
+  metadata.gz: c4c58026a32aa117482c5e835c44345fe584aab5
+  data.tar.gz: 4f92bd0400af9f3ba865912f05cd449296879683
 SHA512:
-  metadata.gz: 2a5985f9051d774cf571c3ea6b91528ac138cf0301ef15240f95114fff5f73c7de9b730474365c01d554bb7d2ffe111d141b865e77de59450b2418ea2f52f0c4
-  data.tar.gz: 68ca47870dd430304eb046f9cd400f157b5d39a60ccf1954ac3d638004a0d8e82d17db2c6d1f397628c7b5cdb9719acc229aaeb25ad5b977e23cb49ac4b50b84
+  metadata.gz: 35ff3444a2217820c5c0e8809b47d6679d18ad985cf132a5ce1580ba15906aed9cec2fa5a49a9673c736e46fde8e1c2a6126ae6473a2f1c0506cfeb0d5c94b31
+  data.tar.gz: d14bf772ef5c92cf1c37b8434d17ca5d26fe9cddc3adf2fc5e33fe4906b1813ca7dbc124f8329b2d717c630c4816279d4651d09c4925e94fe55eb2125a22ad54

data/Gemfile

@@ -7,9 +7,8 @@ gem 'byebug' unless ENV['TRAVIS']
 gem 'sass-rails', '~> 4.0.3'
 
 group :test do
-  # Peg simplecov to < 0.8 until this is resolved:
-  # https://github.com/colszowka/simplecov/issues/281
-  gem 'simplecov', '~> 0.7.1', require: false
+  gem 'simplecov', '~> 0.9', require: false
+  gem 'coveralls', require: false
   gem 'poltergeist'
 end
 

data/README.md

@@ -1,4 +1,6 @@
 # Worthwhile
+[![Build Status](https://travis-ci.org/curationexperts/worthwhile.svg?branch=master)](https://travis-ci.org/curationexperts/worthwhile)
+[![Coverage Status](https://img.shields.io/coveralls/curationexperts/worthwhile.svg)](https://coveralls.io/r/curationexperts/worthwhile?branch=master)
 
 A very simple extensible IR platform for Hydra
 

data/app/assets/stylesheets/worthwhile/_worthwhile.css.scss

@@ -1,3 +1,5 @@
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
 @import "bootstrap/variables";
 @import 'worthwhile/variables_bootstrap';
 @import "worthwhile/global-variables";

data/app/helpers/curate/collections_helper.rb

@@ -1,133 +1,33 @@
-#require Hydra::Collections::Engine.root + '/app/helpers/collections_helper.rb'
 # View Helpers for Hydra Collections functionality
-module Curate::CollectionsHelper 
-  
-  # Displays the Collections create collection button.
-  def button_for_create_new_collection(label = 'Create Collection')
-    render partial: 'button_create_collection', locals:{label:label}
-  end
+module Curate::CollectionsHelper
 
   def button_for_remove_item_from_collection(document, collection, label = 'Remove From Collection')
-    render partial:'/curate/collections/button_remove_from_collection', locals:{collection:collection, label:label, document:document}
-  end
-
-  def hidden_collection_members
-    _erbout = ''
-    if params[:batch_document_ids].present?
-      params[:batch_document_ids].each do |batch_item|
-        _erbout.concat hidden_field_tag("batch_document_ids[]", batch_item)
-      end
-    end
-    _erbout.html_safe
-  end
-
-  def has_any_collections?
-    current_user.collections.count > 0 if current_user
-  end
-
-  # 'terminate' indicates whether to drill down and display the content of collections within the given collection
-  # (i.e. recurse by calling list_items_in_collection on collections within the given collection).
-  #
-  # 'options' hash may include the following:
-  #   :display_contributors - boolean - Indicates whether to display a list of contributors next to the work/collection title.
-  #     Default is true.  When omitted from options hash or present and set to true, the contributors will be listed.
-  #     When set to false, the contributors are not listed.
-  def list_items_in_collection(collection, terminate=false, options={})
-    content_tag :ul, class: 'collection-listing' do
-      collection.members.inject('') do |output, member|
-        output << member_line_item(collection, member, terminate, options)
-      end.html_safe
-    end
+    render partial: '/curate/collections/button_remove_from_collection', locals: {
+      collection: collection, label: label, document: document
+    }
   end
 
-  def member_line_item(collection, member, terminate, options={})
-    if can? :read, member
-      content_tag :li, class: line_item_class(collection), data: { noid: member.noid }do
-        markup = member.respond_to?(:members) ? collection_line_item(member, terminate, options) : work_line_item(member, options)
-
-        if can? :edit, collection
-          markup << collection_member_actions(collection, member)
-        end
-
-        markup
-      end
+  def available_collections(item = nil)
+    if item.present?
+      collection_options.reject {|n| n == item}
     else
-      ""
+      collection_options
     end
   end
 
-  def line_item_class(collection)
-    css_class = 'collection-member'
-    css_class << ' with-controls' if can? :edit, collection
-    css_class
-  end
-
-  def work_line_item(work, options={})
-    link = link_to work.to_s, polymorphic_path_for_asset(work)
-    link = link + ' ' + contributors(work) if options.fetch(:display_contributors, true)
-    link
-  end
+  private
 
-  def collection_line_item(collection, terminate, options={})
-    # A collection listed as a terminal (terminate is true) member of another collection gets a
-    # normal-sized (<p>) font versus a collection heading-sized (<h3>) font.
-    headertag = terminate ? :p : :h3
-    list_item = content_tag headertag, class: 'collection-section-heading' do
-      link_to collection.to_s, collection_path(collection)
-    end
-    if collection.description.present?
-      list_item << content_tag( :div, collection.description, class: 'collection-section-description')
+    def collection_options
+      @collection_options ||= current_users_collections
     end
-    list_item << list_items_in_collection(collection, true, options) unless terminate  # limit nesting
-    list_item
-  end
 
-  def contributors(work)
-    if work.respond_to?(:contributor)
-      "(#{work.contributor.to_a.join(', ')})"
-    else
-      ''
-    end
-  end
-
-  def collection_member_actions(collection, member)
-    content_tag :span, class: 'collection-member-actions' do
-      if member.respond_to?(:members)
-        markup = actions_for_member(collection, member)
+    # Defaults to returning a list of all collections.
+    # If you have implement User.collections, the results of that will be used.
+    def current_users_collections
+      if current_user.respond_to?(:collections)
+        current_user.collections.to_a
       else
-        actions_for_member(collection, member)
+        Collection.all
       end
     end
-  end
-
-  def actions_for_member(collection, member)
-    button_to remove_member_collections_path(id: collection.to_param, item_id: member.pid), data: { confirm: 'Are you sure you want to remove this item from the collection?' }, method: :put, id: "remove-#{member.noid}", class: 'btn', form_class: 'remove-member', remote: true do
-      raw('<i class="icon-minus"></i> Remove')
-    end
-  end
-
-  def collection_options
-    @collection_options ||= current_users_collections
-  end
-
-  # Defaults to returning a list of all collections.
-  # If you have implement User.collections, the results of that will be used.
-  def current_users_collections
-    if current_user.respond_to?(:collections)
-      current_user.collections.to_a
-    else
-      Collection.all
-    end
-  end
-
-  def available_collections(item = nil)
-    if item.present?
-      collection_options.reject {|n| n == item}
-    else
-      collection_options
-    end
-  end
-
-
 end
-

data/app/helpers/worthwhile/collections_helper.rb

@@ -7,13 +7,24 @@ module Worthwhile::CollectionsHelper
     "#{collectible.to_param.gsub(/:/, '-')}-modal"
   end
 
-  def link_to_select_collection(collectible, opts={}) 
+  def link_to_select_collection(collectible, opts={})
     html_class = opts[:class]
-    link_to add_member_form_collections_path(collectible_id: collectible.id),
-      data: { toggle: "modal", target: '#' + collection_modal_id(collectible) },
+    link_to '#', data: { toggle: "modal", target: '#' + collection_modal_id(collectible) },
       class: "add-to-collection #{html_class}", title: "Add #{collectible.human_readable_type} to Collection" do
-      raw('<span class="glyphicon glyphicon-folder-open"></span> Add to a Collection')
+      icon('plus-sign') + ' Add to a Collection'
     end
   end
 
+  # override hydra-collections
+  def link_to_remove_from_collection(document, label = 'Remove From Collection')
+    link_to collections.collection_path(@collection.id, collection: { members: 'remove'},
+                batch_document_ids: [ document.id ]), method: :put do
+      icon('minus-sign') + ' ' + label
+    end
+  end
+
+  def icon(type)
+    content_tag :span, '', class: "glyphicon glyphicon-#{type}"
+  end
+
 end

data/app/views/catalog/_action_menu_partials/_default.html.erb

@@ -8,7 +8,7 @@
       </li>
       <li>
         <% if @collection # We're on the view page for @collection. -%>
-          <%= button_for_remove_from_collection(document) %>
+          <%= link_to_remove_from_collection(document) %>
         <% else %>
           <%= link_to [:curation_concern, document], class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
                           confirm: "Deleting a collection from #{t('sufia.product_name')} is permanent. Click OK to delete this collection from #{t('sufia.product_name')}, or Cancel to cancel this operation" } do %>

data/app/views/catalog/index.html.erb

@@ -1,12 +1,11 @@
-<% content_for :page_title, "#{application_name} Search Results" %>
-<% content_for :page_class, 'search' %>
-<% content_for :page_header do %>
+<% provide :page_title, "#{application_name} Search Results" %>
+<% provide :page_class, 'search' %>
+<% provide :page_header do %>
   <%= render 'navbar' %>
 <% end %>
-<% content_for :sidebar do %>
 
+<% provide :sidebar do %>
   <%= render 'search_sidebar' %>
-
 <% end %>
 
 <div id="content">
@@ -21,7 +20,7 @@
       <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
 
 
-      <% content_for(:head) do -%>
+      <% provide(:head) do -%>
         <%= render_opensearch_response_metadata %>
         <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
         <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>

data/app/views/collections/_form.html.erb

@@ -8,7 +8,7 @@
   <% end -%>
 
   <%= render 'form_descriptive_fields', curation_concern: @collection, f: f %>
-  <%= render partial: 'form_permission', locals: {f: f} %>
+  <%= render 'form_permission', f: f %>
 
   <%= render "form_representative_image", curation_concern: @collection, f: f %>
 

data/app/views/collections/_form_representative_image.html.erb

@@ -0,0 +1,13 @@
+<% if curation_concern.persisted? && curation_concern.members.present? %>
+  <div class="row">
+    <div class="col-md-12">
+      <fieldset id="representative-image">
+        <legend>
+          Assign a Thumbnail
+        </legend>
+        <p>Select the file whose thumbnail should represent this <%= curation_concern.human_readable_type %>.</p>
+        <%= f.select( :representative, Hash[ curation_concern.members.map { |m| m.generic_files}.flatten.map {|file| [file.title.first, file.pid] } ],{}, { class: 'form-control' } ) %>
+      </fieldset>
+    </div>
+  </div>
+<% end %>

data/app/views/collections/edit.html.erb

@@ -1,22 +1,17 @@
-<% content_for :page_title, curation_concern_page_title(@collection) %>
+<% provide :page_title, curation_concern_page_title(@collection) %>
 
 <h1>Edit <%= @collection %> <span class="human_readable_type">(<%= @collection.human_readable_type %>)</span></h1>
 
 
 <% unless has_collection_search_parameters? %>
-  <%= render partial: 'collections/edit_actions' %>
-  <%= render partial: 'collections/form', locals: { record: @collection } %>
+  <%= render 'collections/edit_actions' %>
+  <%= render 'collections/form', record: @collection %>
 <% end %>
 <br />
 
 <h2>Manage Items in this Collection</h2>
-<%= render partial: 'search_collection_dashboard_form'%>
-<%= render partial: 'catalog/did_you_mean' %>
-<%#= render partial: 'catalog/facet_selected' %>
-
+<%= render 'search_collection_dashboard_form'%>
+<%= render 'catalog/did_you_mean' %>
 <%= render 'catalog/constraints', localized_params: params %>
-
-<%#= render 'catalog/sort_and_per_page' %>
-<%= render partial:'document_list', locals: { documents: @member_docs, document_list_format: "dashboard" } %>
-
-<%= render partial:'paginate' %>
+<%= render 'document_list', documents: @member_docs, document_list_format: "dashboard" %>
+<%= render 'paginate' %>

data/app/views/collections/new.html.erb

@@ -1,15 +1,13 @@
 <% curation_concern ||= @collection %>
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
-
-<h2>Describe Your <%= curation_concern.human_readable_type %></h2>
-<p>
-  The more descriptive information you provide the better we can serve your needs.
-</p>
-<p>
-  Please consider releasing your <%= curation_concern.human_readable_type.downcase %> as an <span class="label label-success">Open Access</span> work.
-</p>
-
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
+  <h2>Describe Your <%= curation_concern.human_readable_type %></h2>
+  <p>
+    The more descriptive information you provide the better we can serve your needs.
+  </p>
+  <p>
+    Please consider releasing your <%= curation_concern.human_readable_type.downcase %> as an <span class="label label-success">Open Access</span> work.
+  </p>
 <% end %>
 
 <%= render 'form' %>

data/app/views/curate/collections/_add_to_collection_modal.html.erb

@@ -5,10 +5,10 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 id="<% modal_title_id %>" class="modal-title">Add <%= "#{collectible}" %> to one of your collections:</h4>
+        <h4 id="<% modal_title_id %>" class="modal-title">Add <%= collectible %> to one of your collections:</h4>
       </div>
       <div class="unpadded modal-body">
-        <%= render partial: 'curate/collections/form_to_add_member', locals: { collectible: collectible, fieldset_class: 'with-side-padding with-top-padding', select_label_id: modal_title_id } %>
+        <%= render 'curate/collections/form_to_add_member', collectible: collectible, fieldset_class: 'with-side-padding with-top-padding', select_label_id: modal_title_id %>
       </div>
     </div>
   </div>

data/app/views/curation_concern/base/_form_descriptive_fields.erb

@@ -3,19 +3,7 @@
     <%= render "form_required_information", curation_concern: curation_concern, f: f %>
   </div>
 
-  <fieldset id="content-editor">
-    <legend>
-      <%=t('sufia.work.editor.legend') %>
-      <small><%=t('sufia.work.editor.caption') %></small>
-    </legend>
-    <div class="col-md-6" id="required-information">
-      <%#= render "linked_editors", curation_concern: curation_concern, f: f %>
-    </div>
-
-    <div class="col-md-6" id="additional-information">
-      <%#= render "linked_groups", curation_concern: curation_concern, f: f %>
-    </div>
-  </fieldset>
+  <%# render 'form_editors', f: f %>
 
   <div class="col-md-6" id="additional-information">
     <%= render "form_additional_information", curation_concern: curation_concern, f: f %>

data/app/views/curation_concern/base/_form_editors.html.erb

@@ -0,0 +1,15 @@
+  <fieldset id="content-editor">
+    <legend>
+      <%=t('sufia.work.editor.legend') %>
+      <small><%=t('sufia.work.editor.caption') %></small>
+    </legend>
+    <div class="col-md-6" id="required-information">
+      <%#= render "linked_editors", curation_concern: curation_concern, f: f %>
+    </div>
+
+    <div class="col-md-6" id="additional-information">
+      <%#= render "linked_groups", curation_concern: curation_concern, f: f %>
+    </div>
+  </fieldset>
+
+

data/app/views/curation_concern/base/edit.html.erb

@@ -1,15 +1,13 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
-
-<h2>Manage Your Work</h2>
-<p>
-  You can enrich the metadata describing your work at any time.
-  The more complete the description the easier it will be to find by yourself and others.
-</p>
-<p>
-  Please consider releasing your <%=curation_concern.human_readable_type.downcase %> as an Open Access work.
-</p>
-
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
+  <h2>Manage Your Work</h2>
+  <p>
+    You can enrich the metadata describing your work at any time.
+    The more complete the description the easier it will be to find by yourself and others.
+  </p>
+  <p>
+    Please consider releasing your <%=curation_concern.human_readable_type.downcase %> as an Open Access work.
+  </p>
 <% end %>
 
 <%= render 'form' %>

data/app/views/curation_concern/base/new.html.erb

@@ -1,14 +1,12 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
-
-<h2>Describe Your <%= curation_concern.human_readable_type %></h2>
-<p>
-  The more descriptive information you provide the better we can serve your needs.
-</p>
-<p>
-  Please consider releasing your <%= curation_concern.human_readable_type.downcase %> as an <span class="label label-success">Open Access</span> work.
-</p>
-
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
+  <h2>Describe Your <%= curation_concern.human_readable_type %></h2>
+  <p>
+    The more descriptive information you provide the better we can serve your needs.
+  </p>
+  <p>
+    Please consider releasing your <%= curation_concern.human_readable_type.downcase %> as an <span class="label label-success">Open Access</span> work.
+  </p>
 <% end %>
 
 <%= render 'form' %>

data/app/views/curation_concern/base/show.html.erb

@@ -1,11 +1,10 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
   <h1><%= curation_concern %> <span class="human_readable_type">(<%= curation_concern.human_readable_type %>)</span></h1>
 <% end %>
-<%= render partial: 'representative_media', locals: {work: curation_concern} %>
 
+<%= render 'representative_media', work: curation_concern %>
 <%= render 'attributes', curation_concern: curation_concern %>
-
 <%= render 'related_files', curation_concern: curation_concern %>
 <%= render 'related_resources', curation_concern: curation_concern %>
 <%= render 'collections', curation_concern: curation_concern %>
@@ -14,19 +13,16 @@
 <% editor    = can?(:edit,    curation_concern) %>
 
 <% if collector || editor %>
-  <% content_for :second_row do %>
-    <div class="form-actions">
-      <% if editor %>
-        <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concern, curation_concern]), class: 'btn btn-primary' %>
-        <%= link_to "Delete This #{curation_concern.human_readable_type}", [:curation_concern, curation_concern], class: 'btn btn-primary', data: { confirm: "Delete this #{curation_concern.human_readable_type}?" }, method: :delete %>
-        <%= link_to "Attach a File", new_curation_concern_generic_file_path(curation_concern), class: 'btn btn-primary' %>
-        <%= link_to "Add an External Link", new_curation_concern_linked_resource_path(curation_concern), class: 'btn btn-primary' %>
-      <% end %>
-      <% if collector %>
-        <%= render 'curate/collections/add_to_collection_modal', collectible: curation_concern %>
-        <%= link_to_select_collection curation_concern, class: 'btn btn-primary' %>
-      <% end %>
-    </div>
-  <% end %>
+  <div class="form-actions">
+    <% if editor %>
+      <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concern, curation_concern]), class: 'btn btn-primary' %>
+      <%= link_to "Delete This #{curation_concern.human_readable_type}", [:curation_concern, curation_concern], class: 'btn btn-primary', data: { confirm: "Delete this #{curation_concern.human_readable_type}?" }, method: :delete %>
+      <%= link_to "Attach a File", new_curation_concern_generic_file_path(curation_concern), class: 'btn btn-primary' %>
+      <%= link_to "Add an External Link", new_curation_concern_linked_resource_path(curation_concern), class: 'btn btn-primary' %>
+    <% end %>
+    <% if collector %>
+      <%= render 'curate/collections/add_to_collection_modal', collectible: curation_concern %>
+      <%= link_to_select_collection curation_concern, class: 'btn btn-primary' %>
+    <% end %>
+  </div>
 <% end %>
-

data/app/views/curation_concern/generic_files/edit.html.erb

@@ -1,5 +1,5 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
   <h1>Updating Attached File to <span class="parent_container">"<%= parent %>"<span></h1>
 <% end %>
 <%= render 'form' %>

data/app/views/curation_concern/generic_files/show.html.erb

@@ -1,8 +1,8 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
   <h1>File Details</h1>
 <% end %>
-<%= render partial: 'media_display', locals: {generic_file: curation_concern, dom_class_name: 'representative_image'} %>
+<%= render 'media_display', generic_file: curation_concern, dom_class_name: 'representative_image' %>
 <%= render "attributes", curation_concern: curation_concern %>
 
   <div class="form-actions">

data/app/views/curation_concern/linked_resources/edit.html.erb

@@ -1,5 +1,5 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
   <h1>Editing an External Link to <span class="parent_container">"<%= parent %>"<span></h1>
 <% end %>
 <%= render 'form' %>

data/app/views/curation_concern/linked_resources/new.html.erb

@@ -1,5 +1,5 @@
-<% content_for :page_title, curation_concern_page_title(curation_concern) %>
-<% content_for :page_header do %>
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
   <h1>Adding an External Link to <span class="parent_container">"<%= parent %>"<span></h1>
 <% end %>
 <%= render 'form' %>

data/app/views/embargoes/edit.html.erb

@@ -1,4 +1,4 @@
-<% content_for :page_header do %>
+<% provide :page_header do %>
   <h1>Manage Embargoes for  <%= curation_concern %><span class="human_readable_type">(<%= curation_concern.human_readable_type %>)</span></h1>
 <% end %>
 

data/app/views/layouts/curate_nd/1_column.html.erb

@@ -1,5 +1,4 @@
-<% content_for :layout_name, 'one_column, ' %>
-<% content_for :main do %>
+<% provide :main do %>
 
   <div class="row">
     <div class="<%= content_for?(:main_column_class) ? yield(:main_column_class) : "col-md-12" %>">
@@ -7,16 +6,6 @@
     </div>
   </div>
 
-  <% if content_for?(:second_row) %>
-
-    <div class="row">
-      <div class="col-md-12">
-        <%= yield(:second_row) %>
-      </div>
-    </div>
-
-  <% end %>
-
 <% end %>
 
 <%= render template: "layouts/#{theme}" %>

data/app/views/layouts/curate_nd/catalog.html.erb

@@ -1,5 +1,4 @@
-<% content_for :layout_name, 'catalog, ' %>
-<% content_for :main do %>
+<% provide :main do %>
 
   <div class="row">
   <% if content_for?(:sidebar) %>

data/app/views/layouts/curate_nd.html.erb

@@ -1,25 +1,14 @@
-<% content_for :layout_name, 'curate_nd, ' %>
-<% content_for :body do %>
-
-  <%= render 'shared/header' %>
+<% provide :body do %>
 
+<%= render 'shared/header' %>
 <%= render 'shared/flash_message' %>
 
   <div id="main" role="main" class="container <%= yield(:page_class) if content_for?(:page_class)%>">
   <% if content_for?(:page_header) %>
     <div class="row">
-    <% if content_for?(:page_actions) %>
-      <div class="col-md-10 main-header ">
-        <%= yield(:page_header) %>
-      </div>
-      <div class="col-md-2 page-actions">
-        <%= yield(:page_actions) %>
-      </div>
-    <% else %>
       <div class="col-md-12 main-header ">
         <%= yield(:page_header) %>
       </div>
-    <% end %>
     </div>
   <% end %>
 

data/app/views/leases/edit.html.erb

@@ -1,4 +1,4 @@
-<% content_for :page_header do %>
+<% provide :page_header do %>
   <h1>Manage Leases for  <%= curation_concern %><span class="human_readable_type">(<%= curation_concern.human_readable_type %>)</span></h1>
 <% end %>
 

data/app/views/worthwhile/classify_concerns/new.html.erb

@@ -1,8 +1,6 @@
-<% content_for :page_header do %>
-
-<h2>What are you uploading?</h2>
-<p>Before we can begin we need to know a little about what you're uploading.</p>
-
+<% provide :page_header do %>
+  <h2>What are you uploading?</h2>
+  <p>Before we can begin we need to know a little about what you're uploading.</p>
 <% end %>