sufia 0.0.5 → 0.0.6

data/Gemfile

@@ -16,7 +16,8 @@ group :development, :test do
   gem 'ruby-prof'
   gem 'cucumber-rails', '~> 1.0', :require => false
   gem 'database_cleaner'
-  gem 'capybara'
+  gem 'devise'
+  gem 'capybara', '~>1.1.3'
   gem 'bcrypt-ruby'
   gem "jettywrapper"
   gem "factory_girl_rails", "~> 4.1.0"

data/README.md

@@ -8,6 +8,7 @@ gem 'blacklight'
 gem 'hydra-head'
 gem 'sufia'
 gem 'jettywrapper'
+gem 'font-awesome-sass-rails'
 ```
 Then `bundle install`
 
@@ -46,13 +47,16 @@ COUNT=4 QUEUE=* rake environment resque:work
 ```
 See https://github.com/defunkt/resque for more options
 
-### If you want to enable transcoding of video
-#### Installing ffmpeg on a mac
+### If you want to enable transcoding of video, instal ffmpeg version 1.0+
+#### On a mac
 Use homebrew:
 ```
 brew install ffmpeg --with-libvpx --with-libvorbis
 ```
 
+#### On Ubuntu Linux
+See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
+
 ## Developers:
 This information is for people who want to modify the engine itself, not an application that uses the engine:
 ### Create fixtures

data/app/assets/javascripts/sufia.js

@@ -40,6 +40,7 @@ limitations under the License.
 //= require fileupload
 //= require sufia/permissions
 //= require sufia/tabs
+//= require sufia/trophy
 
 //over ride the blacklight default to submit
 //form when sort by or show per page change

data/app/assets/javascripts/sufia/trophy.js

@@ -0,0 +1,26 @@
+// short hand for $(document).ready();
+$(function() {
+
+   $('.trophy-class').click(function(){
+      var uid=$("#current_user").html();
+      $.ajax({
+         url:"/users/"+uid+"/trophy",
+         type:"post",
+         data: "file_id="+this.id,
+         success:function(data) {
+           var oldclass = $('#'+data.trophy.generic_file_id).find('i').attr("class");
+           if (oldclass.indexOf("trophy-on") != -1){
+             $('#'+data.trophy.generic_file_id).find('i').attr("title", "Highlight work");
+           } else {
+             $('#'+data.trophy.generic_file_id).find('i').attr("title", "Unhighlight work");
+           }
+
+           $('#'+data.trophy.generic_file_id).find('i').toggleClass("trophy-on");
+           $('#'+data.trophy.generic_file_id).find('i').toggleClass("trophy-off");
+         }
+      })
+    });
+
+}); //closing function at the top of the page
+
+

data/app/assets/stylesheets/sufia.css.scss

@@ -2,6 +2,7 @@
  *= require_self
  *= require bootstrap.min
  *= require scholarsphere-bootstrap
+ *= require trophy
  *= require blacklight_more_facets
  *= require batch_edit
  *= require generic_files

data/app/assets/stylesheets/trophy.css

@@ -0,0 +1,7 @@
+.trophy-off:hover,.trophy-off {
+     color: black;
+}
+
+.trophy-on:hover,.trophy-on {
+     color: goldenrod;
+}

data/app/controllers/batch_controller.rb

@@ -38,7 +38,7 @@ class BatchController < ApplicationController
     @batch.status="processing"
     @batch.save
     Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params))
-    flash[:notice] = 'Your files are being processed by ScholarSphere in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-important" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
+    flash[:notice] = 'Your files are being processed by ' + t('sufia.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-important" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
     redirect_to sufia.dashboard_index_path
   end
 end

data/app/controllers/batch_edits_controller.rb

@@ -5,13 +5,13 @@ class BatchEditsController < ApplicationController
    def edit
        super 
        @generic_file = GenericFile.new
-       @generic_file.depositor = current_user.login
+       @generic_file.depositor = current_user.user_key
        @groups = current_user.groups       
-       @terms = @generic_file.get_terms.reject{|k,v| (k=='generic_file__title')|| (k == 'generic_file__part_of')|| (k == 'generic_file__date_uploaded') || (k == 'generic_file__date_modified')}
+       @terms = @generic_file.editable_terms - [:title] # +:format, :resource_type 
 
        # do we want to show the original values for anything...
        @show_file = GenericFile.new
-       @show_file.depositor = current_user.login
+       @show_file.depositor = current_user.user_key
        h  = {}
        @names = []
        permissions = []

data/app/controllers/single_use_link_controller.rb

@@ -4,10 +4,10 @@ class SingleUseLinkController < DownloadsController
   prepend_before_filter :normalize_identifier, :except => [:download, :show]
   
   def generate_download
-    id  = check_single_use_link
-    @su =  SingleUseLink.create_download(id)
+    @generic_file = GenericFile.find(params[:id])
+    authorize! :read, @generic_file   
+    @su =  SingleUseLink.create_download(params[:id])
     @link =  sufia.download_single_use_link_path(@su.downloadKey)
-    @generic_file = GenericFile.find(id)
     respond_to do |format|
       format.html
       format.js  {render :js => @link}
@@ -16,10 +16,10 @@ class SingleUseLinkController < DownloadsController
   end
 
   def generate_show
-    id  = check_single_use_link
-    @su = SingleUseLink.create_show(id)
+    @generic_file = GenericFile.find(params[:id])
+    authorize! :read, @generic_file   
+    @su = SingleUseLink.create_show(params[:id])
     @link = sufia.show_single_use_link_path(@su.downloadKey)
-    @generic_file = GenericFile.find(id)
     respond_to do |format|
       format.html
       format.js  {render :js => @link}
@@ -38,7 +38,8 @@ class SingleUseLinkController < DownloadsController
     not_found if link.path != sufia.download_path(id)
     
     # send the data content
-    send_content(id)
+    asset = ActiveFedora::Base.find(id, :cast=>true)
+    send_content(asset)
   end
 
   def show
@@ -52,8 +53,7 @@ class SingleUseLinkController < DownloadsController
     
     #show the file
     @generic_file = GenericFile.find(id)
-    @terms = @generic_file.get_terms
-    #render 'generic_files/show'
+    @terms = @generic_file.terms_for_display
     
     # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
     @su =  SingleUseLink.create_download(id)
@@ -62,14 +62,6 @@ class SingleUseLinkController < DownloadsController
   
   protected
   
-  def check_single_use_link
-    id = params[:id]
-    # make sure the user is allowed to read the document before they generate the link
-    perms = permissions_solr_doc_for_id(id)
-    @can_read =  can? :read, perms    
-    return id
-  end
-  
   def lookup_hash  
     id = params[:id]
     # invalid hash send not found

data/app/controllers/users_controller.rb

@@ -14,8 +14,9 @@
 
 class UsersController < ApplicationController
   prepend_before_filter :find_user, :except => [:index, :search, :notifications_number]
-  before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow]
-  before_filter :user_is_current_user, only: [:edit, :update]
+  before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
+  before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
+
   before_filter :user_not_current_user, only: [:follow, :unfollow]
 
   def index
@@ -35,6 +36,7 @@ class UsersController < ApplicationController
     else 
       @events = []
     end
+    @trophies = @user.trophy_ids
     @followers = @user.followers
     @following = @user.all_following
   end
@@ -43,6 +45,7 @@ class UsersController < ApplicationController
   def edit
     @user = current_user
     @groups = @user.groups
+    @trophies = @user.trophy_ids
   end
 
   # Process changes from profile form
@@ -57,7 +60,33 @@ class UsersController < ApplicationController
     end
     Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
     redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
+    delete_trophy = params.keys.reject{|k,v|k.slice(0,'remove_trophy'.length)!='remove_trophy'}
+    delete_trophy = delete_trophy.map{|v| v.slice('remove_trophy_'.length..-1)}
+    delete_trophy.each do | smash_trophy |
+      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
+      #Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
+    end
   end
+  def toggle_trophy    
+     id = params[:file_id]
+     id = "#{Sufia::Engine.config.id_namespace}:#{id}" unless id.include?(":")
+     unless current_user.can? :edit, permissions_solr_doc_for_id(id)
+       redirect_to root_path, alert: "You do not have permissions to the file"
+       return false
+     end
+     # TO DO  make sure current user has access to file
+     t = Trophy.where(:generic_file_id => params[:file_id], :user_id => current_user.id).first
+     if t.blank? 
+       t = Trophy.create(:generic_file_id => params[:file_id], :user_id => current_user.id)
+       return false unless t.persisted?
+     else
+       t.delete  
+       #TODO do this better says Mike
+       return false if t.persisted?  
+     end
+     render :json => t
+  end 
+
 
   # Follow a user
   def follow
@@ -79,12 +108,12 @@ class UsersController < ApplicationController
 
   private
   def find_user
-    @user = User.find_by_user_key(params[:uid])
+    @user = User.from_url_component(params[:uid])
     redirect_to root_path, alert: "User '#{params[:uid]}' does not exist" if @user.nil?
   end
 
   def user_is_current_user
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "You cannot edit #{@user.to_s}\'s profile" unless @user == current_user
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "Permission denied: cannot access this page." unless @user == current_user
   end
 
   def user_not_current_user

data/app/helpers/generic_file_helper.rb

@@ -14,10 +14,62 @@
 # limitations under the License.
 
 module GenericFileHelper
- def display_title(gf)
-   title =  gf.title.join(' | ')
-   title = gf.label if title.blank?
-   title = 'No Title' if title.blank?
-   return title
+  def display_title(gf)
+    title =  gf.title.join(' | ')
+    title = gf.label if title.blank?
+    title = 'No Title' if title.blank?
+    title
+  end
+
+  def add_field (key)
+    more_or_less_button(key, 'adder', '+')
+  end
+
+  def subtract_field (key)
+   more_or_less_button(key, 'remover', '-')
+  end
+
+  def help_icon(key)
+    link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover', 
+      'data-content' => metadata_help(key),
+      'data-original-title' => get_label(key) do
+        content_tag 'i', '', class: "icon-question-sign icon-large"
+    end
+  end
+
+  def metadata_help(key)
+    I18n.t("sufia.metadata_help.#{key}", default: key.to_s.humanize)
+  end
+
+  def get_label(key)
+    I18n.t("sufia.field_label.#{key}", default: key.to_s.humanize)
+  end
+
+  def required?(key)
+    [:title, :creator, :tag, :rights].include?(key)
+  end
+
+  def render_edit_field_partial(key, locals)
+    ["generic_files/edit_fields/#{key}", "generic_files/edit_fields/default"].each do |str|
+      # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
+      # for determining if a partial template exists..
+      begin
+        return render :partial => str, :locals=>locals.merge({key: key})
+      rescue ActionView::MissingTemplate
+        nil
+      end
+    end
+  end
+
+ private 
+
+ def more_or_less_button(key, html_class, symbol)
+   # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
+   content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
+     (symbol + 
+     content_tag('span', class: 'accessible-hidden') do
+       "add another #{key.to_s}"
+     end).html_safe
+   end
  end
 end

data/{lib/devise/models/http_header_authenticatable.rb → app/helpers/trophy_helper.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright © 2012 The Pennsylvania State University
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'devise/strategies/http_header_authenticatable'
-module Devise
-  module Models
-    module HttpHeaderAuthenticatable
-      extend ActiveSupport::Concern
+module TrophyHelper
+ def display_trophy_link(user, noid)
+   trophyclass = "trophy-off"
+   trophytitle= "Highlight work "
+   if user.trophies.map(&:generic_file_id).include? noid
+     trophyclass = "trophy-on"
+     trophytitle= "Unhighlight work"
+   end
 
-      def after_database_authentication
-      end
-
-    protected
-
-
-    end
-  end
+   return link_to raw("<i class='#{trophyclass} icon-trophy icon-large'></i>"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
+ end
 end

data/app/models/datastreams/batch_rdf_datastream.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 class BatchRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  register_vocabularies RDF::DC
   map_predicates do |map|
     map.part(:to => "hasPart", :in => RDF::DC)
     map.creator(:to => "creator", :in => RDF::DC)

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  register_vocabularies RDF::DC, RDF::FOAF, RDF::RDFS
   map_predicates do |map|
     map.part_of(:to => "isPartOf", :in => RDF::DC)
     map.contributor(:in => RDF::DC) do |index|

data/app/models/trophy.rb

@@ -0,0 +1,12 @@
+class Trophy < ActiveRecord::Base
+  attr_accessible :generic_file_id, :user_id
+
+  validate :count_within_limit, :on => :create
+
+  def count_within_limit
+    if Trophy.where(user_id:self.user_id).count >= 5
+      errors.add(:base, "Exceeded trophy limit")
+    end
+  end
+end
+

data/app/views/_user_util_links.html.erb

@@ -15,7 +15,7 @@ limitations under the License.
 %>
 <% if current_user %>
    <%= render :partial => 'users/notify_link' %>
-  <a href="<%= sufia.profile_path(URI.escape(current_user.to_s, '@.')) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
+  <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
   <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
   <ul class="dropdown-menu">
       <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link'  %></li>

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

@@ -46,13 +46,13 @@ function confirmExit(){
 <h1>Apply Metadata</h1>
 <br />
 <div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other 
-  information you provide will be applied <em>to the entire batch of files</em> you have just deposited into ScholarSphere.  
+  information you provide will be applied <em>to the entire batch of files</em> you have just deposited into <%= t('sufia.product_name') %>.  
   You may edit individual files from <%= link_to '<i class="icon-dashboard"></i> my dashboard'.html_safe, sufia.dashboard_index_path %> once
   this step is finished.
 </div>
 <%= form_for([@batch, @generic_file], :url => sufia.batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
 
-<%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f, :gf => @generic_file} %>
+<%= render :partial => 'batch_edits/metadata', :formats => [:html], :locals => {:f => f, :gf => @generic_file} %>
 
 <%= render :partial => 'generic_files/permission', :formats => [:html], :locals => { :gf => @generic_file, :batch => @batch } %>
 

data/app/views/batch_edits/{_delete_selected → _delete_selected.html.erb}

@@ -1,5 +1,5 @@
 <%= form_tag(batch_edits_path, :method => :put, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>  
     <%= hidden_field_tag('update_type', 'delete_all') %>
-  <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary', :data => { :confirm => 'Deleting a file from ScholarSphere is permanent. Click OK to delete this file from ScholarSphere, or Cancel to cancel this operation'}) %>
+  <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary', :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"}) %>
 <% end %>
 

data/app/views/batch_edits/_metadata.html.erb

@@ -10,7 +10,7 @@
           <%= f.label :title, "<span class='error'>*</span> Title #{index+1}".html_safe, :class=>"control-label" %> 
           <div class="controls" id="additional_title_clone">
             <%= f.text_field :title, :name=>"title[#{gen_f.id}][]", :value=>gen_f.label, :required=> true %>  
-            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
+            <%= help_icon(:title) %>
           </div>
         </div>
       <% end %>
@@ -27,11 +27,12 @@
   <h2 class="non lower">Bulk Descriptions <small>(applied to all files just uploaded)</small>  <small class="pull-right"><span class="error">*</span> indicates required fields</small></h2>
   <div class="well">
     <div class="control-group" id="resources">
-        <%= f.label :resource_type, "Resource Types", :class=>"control-label", :for=>"resource_type" %>
+      <%# See if this works: render_edit_field_partial(:type, f:f) %>
+      <%= f.label :resource_type, "Resource Types", :class=>"control-label", :for=>"resource_type" %>
       <div class="controls">
           <p class="help-block">You may select multiple types to apply to all files<p>
           <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, {:multiple=>true, :size=>7} %>
-          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:resource_type) %>
       </div>
     </div>
 
@@ -41,7 +42,7 @@
           <%= f.text_field :tag, :name=>"generic_file[tag][]", :value=>"", :required=> true  %> 
           <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="accessible-hidden">add another Tag</span></button>
           &nbsp;
-          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:tag) %>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
@@ -52,7 +53,7 @@
         <%= f.text_field :creator, :name=>"generic_file[creator][]", :value=>"", :required=> true %>
           <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="accessible-hidden">add another Creator</span></button>
           &nbsp;
-          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:creator) %>
       </div>
       <div id="additional_creator_elements"></div>
     </div>
@@ -63,7 +64,7 @@
         <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
           <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="accessible-hidden">add another Rights</span></button>
         &nbsp;
-        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
+        <%= help_icon(:rights) %>
         <%= render :partial => "generic_files/rights_modal" %>
         
       </div>
@@ -82,7 +83,7 @@
           <%= f.text_field :related_url, :name=>"generic_file[related_url][]", :value=>""  %> 
           <button class="adder btn" name="additional_related_url" id="additional_related_url_submit">+<span class="accessible-hidden">add another Related URL</span></button>
           &nbsp;
-          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:related_url) %>
         </div>
         <div id="additional_related_url_elements"></div>
       </div>
@@ -93,7 +94,7 @@
         <%= f.text_field :based_near, :name=>"generic_file[based_near][]", :value=>""  %> 
         <button class="adder btn" name="additional_based_near" id="additional_based_near_submit">+<span class="accessible-hidden">add another Location</span></button>
         &nbsp;
-          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:based_near) %>
         </div>
         <div id="additional_based_near_elements"></div>
       </div>
@@ -104,7 +105,7 @@
           <%= f.text_field :contributor, :name=>"generic_file[contributor][]", :value=>gf.contributor[0]  %> 
           <button class="adder btn" name="additional_contributor" id="additional_contributor_submit">+<span class="accessible-hidden">add another Contributor</span></button>
             &nbsp;
-          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:contributor) %>
         </div>
         <div id="additional_contributor_elements"></div>
       </div>
@@ -115,7 +116,7 @@
           <%= f.text_field :date_created, :name=>"generic_file[date_created][]", :value=>""  %> 
           <button class="adder btn" name="additional_date_created" id="additional_date_created_submit">+<span class="accessible-hidden">add another Date Created</span></button>
             &nbsp;
-          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:date_created) %>
         </div>
         <div id="additional_date_created_elements"></div>
       </div>
@@ -126,7 +127,7 @@
           <%= f.text_area :description, :name=>"generic_file[description][]", :value=>""  %> 
           <button class="adder btn" name="additional_description" id="additional_description_submit">+<span class="accessible-hidden">add another Abstract or Summary</span></button>
             &nbsp;
-          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:description) %>
         </div>
         <div id="additional_description_elements"></div>
       </div>
@@ -137,7 +138,7 @@
           <%= f.text_field :identifier, :name=>"generic_file[identifier][]", :value=>""  %> 
           <button class="adder btn" name="additional_identifier" id="additional_identifier_submit">+<span class="accessible-hidden">add another Identifier</span></button>
             &nbsp;
-          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:identifier) %>
         </div>
         <div id="additional_identifier_elements"></div>
       </div>
@@ -148,7 +149,7 @@
           <%= f.text_field :language, :name=>"generic_file[language][]", :value=>""  %> 
           <button class="adder btn" name="additional_language" id="additional_language_submit">+<span class="accessible-hidden">add another Language</span></button>
             &nbsp;
-          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:language) %>
         </div>
         <div id="additional_language_elements"></div>
       </div>
@@ -159,7 +160,7 @@
           <%= f.text_field :publisher, :name=>"generic_file[publisher][]", :value=>""  %> 
           <button class="adder btn" name="additional_publisher" id="additional_publisher_submit">+<span class="accessible-hidden">add another Publisher</span></button>
             &nbsp;
-          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:publisher) %>
         </div>
         <div id="additional_publisher_elements"></div>
       </div>
@@ -170,7 +171,7 @@
           <%= f.text_field :subject, :name=>"generic_file[subject][]", :value=>"" %>  
           <button class="adder btn" name="additional_subject" id="additional_subject_submit">+<span class="accessible-hidden">add another Subject</span></button>
           &nbsp;
-          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
+          <%= help_icon(:subject) %>
         </div>
         <div id="additional_subject_elements"></div>
       </div>