Merge pull request #99 from MITLibraries/91_wording_and_minor_tweaks

91 wording and minor tweaks

app/models/submission.rb

@@ -123,6 +123,6 @@ def submittable_funders
 
   # Funders we want to display in the UI, but not include in {Mets}
   def ui_only_funders
-    ['None / Other']
+    ['Other']
   end
 end

app/views/layouts/application.html.erb

@@ -37,7 +37,11 @@
             <ul class="nav navbar-nav">
               <li><%= link_to "New Submission", new_submission_path %></li>
               <% if user_signed_in? %>
-                <li><%= link_to "Submissions", submissions_path %></li>
+                <% if current_user.admin? %>
+                  <li><%= link_to "Submissions", submissions_path %></li>
+                <% else %>
+                  <li><%= link_to "My Submissions", submissions_path %></li>
+                <% end %>
                 <li><%= link_to("Sign out", destroy_user_session_path, method: :delete, id: "sign_in") %></li>
               <% else %>
                 <% if ENV['FAKE_AUTH_ENABLED'] == 'true' %>

app/views/static/home.html.erb

@@ -1,4 +1,11 @@
-<h1>Hi!</h1>
-<p>This is a Quick Submission form for MIT's Open Access Collection.</p>
+<p><%= link_to('Federal research funders require', 'http://libraries.mit.edu/scholarly/publishing/research-funders/research-funder-open-access-requirements/') %>
+articles they sponsor to be made openly accessible. Use this form to deposit
+papers to MIT's Open Access Collection in relation to these requirements. You
+will receive a persistent URL to give to your research funder(s), and your
+article will be embargoed if required.</p>
+
 <p>Get started with a <%= link_to('new submission', new_submission_path) %>.</p>
-<p>DSpace submission forms remain available if you prefer.</p>
+
+<p>If you're submitting an article under the MIT Open Access Policy instead of
+in relation to funder requirements, there is a
+<%= link_to('shorter form available', 'https://dspace.mit.edu/handle/1721.1/49433/submit') %>.</p>

test/models/submission_test.rb

@@ -69,16 +69,15 @@ class SubmissionTest < ActiveSupport::TestCase
 
   test 'valid with a ui only funder' do
     sub = submissions(:sub_one)
-    sub.funders = ['None / Other']
+    sub.funders = ['Other']
     assert sub.valid?
   end
 
   test 'funders_minus_ui_only_funders' do
     sub = submissions(:sub_one)
-    sub.funders << 'None / Other'
-    assert_equal(sub.funders.include?('None / Other'), true)
-    assert_equal(sub.funders_minus_ui_only_funders.include?('None / Other'),
-                 false)
+    sub.funders << 'Other'
+    assert_equal(sub.funders.include?('Other'), true)
+    assert_equal(sub.funders_minus_ui_only_funders.include?('Other'), false)
   end
 
   test 'valid with uri handle' do