sufia 6.0.0.rc2 → 6.0.0.rc3

data/app/views/generic_files/upload/_alerts.html.erb

@@ -1,7 +1,7 @@
 <div class="alert alert-info hide" id="success">
   You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
   <p>
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), class: 'btn' %>
+  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_id), class: 'btn' %>
   </p>
 </div>
 
@@ -11,7 +11,7 @@
 
 <div class="alert hide" id="partial_fail">
   One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), class: 'btn' %>
+  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_id), class: 'btn' %>
 </div>
 
 <div class="alert hide" id="errmsg"> </div>

data/app/views/generic_files/upload/_form_fields.html.erb

@@ -1,7 +1,7 @@
     <!-- The file upload form used as target for the file upload widget -->
       <%= hidden_field_tag(:total_upload_size, 0) %>
       <%= hidden_field_tag(:relative_path) %>
-      <%= hidden_field_tag(:batch_id, @batch_noid) %>
+      <%= hidden_field_tag(:batch_id, @batch_id) %>
       <%= hidden_field_tag "file_coming_from", "local" %>
       <%= render partial: 'generic_files/upload/tos_checkbox' %>
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->

data/app/views/generic_files/upload/_local_file_import_chooser.html.erb

@@ -17,7 +17,7 @@
         <%end%>
         </tbody>
       </table>
-      <%= hidden_field_tag(:batch_id, @batch_noid) %>
+      <%= hidden_field_tag(:batch_id, @batch_id) %>
       <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
         <i class="glyphicon glyphicon-upload"></i>
         <span>Deposit Selected Files</span>

data/app/views/generic_files/upload/_script_templates.html.erb

@@ -1,6 +1,6 @@
 <div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
-  <%-# Script redirects here once the uploads are complete %>
-  <%=GenericFilesController.upload_complete_path(@batch_noid)%>
+  <%# Script redirects here once the uploads are complete %>
+  <%= GenericFilesController.upload_complete_path(@batch_id) %>
 </div>
 
 <!-- The template to display files available for upload -->

data/app/views/homepage/_featured.html.erb

@@ -1,10 +1,8 @@
 <% solr_document = featured.generic_file_solr_document %>
-<li class="featured-item" data-id="<%= solr_document.noid %>">
+<li class="featured-item" data-id="<%= solr_document.id %>">
   <div class="main row">
     <div class="col-sm-3">
-      <%= link_to sufia.generic_file_path(solr_document), "aria-hidden" => true do %>
-        <%= render_thumbnail_tag solr_document, {width: 90} %>
-      <% end %>
+      <%= render_thumbnail_tag solr_document, { width: 90 } %>
     </div>
     <div class="col-sm-9">
       <%= render partial: 'homepage/featured_fields', locals: {featured: solr_document} %>

data/app/views/homepage/_featured_researcher.html.erb

@@ -1,2 +1,2 @@
 <h2>Featured Researcher</h2>
-<%= editable_content_block @featured_researcher %>
+<%= editable_content_block @featured_researcher, true %>

data/app/views/homepage/_featured_works.html.erb

@@ -1,5 +1,7 @@
-<h2>Featured Works</h2>
-<% if can? :update, FeaturedWork %>
+<h2><%= t('sufia.homepage.featured_works.title') %></h2>
+<% if @featured_work_list.empty? %>
+  <p><%= t('sufia.homepage.featured_works.no_works') %></p>
+<% elsif can? :update, FeaturedWork %>
   <%= form_for [sufia, @featured_work_list] do |f| %>
     <div class="panel-group dd" id="dd">
       <ol id="featured_works">
@@ -8,7 +10,7 @@
         <% end %>
       </ol>
     </div>
-    <%= f.submit "Save order", class: 'btn btn-default' %>
+    <%= f.submit("Save order", class: 'btn btn-default') %>
   <% end %>
 <% else %>
   <ol id="featured_works">

data/app/views/homepage/_home_content.html.erb

@@ -1,6 +1,6 @@
 <div class="col-xs-12 col-sm-6">
   <ul id="homeTabs" class="nav nav-tabs">
-    <li><a href="#featured_container" data-toggle="tab" role="tab" id="featureTab"><%= t('sufia.homepage.featured_works') %></a></li>
+    <li><a href="#featured_container" data-toggle="tab" role="tab" id="featureTab"><%= t('sufia.homepage.featured_works.tab_label') %></a></li>
     <li><a href="#recently_uploaded" data-toggle="tab" role="tab" id="recentTab"><%= t('sufia.homepage.recently_uploaded') %></a></li>
   </ul>
   <div class="tab-content">

data/app/views/homepage/_recent_document.html.erb

@@ -9,7 +9,7 @@
       <% end %>
       <td>
         <h3>
-          <span class="sr-only">Title</span><%= link_to truncate(recent_document.title_or_label, length: 28, separator: ' '), sufia.generic_file_path(recent_document.noid)  %>
+          <span class="sr-only">Title</span><%= link_to truncate(recent_document.title_or_label, length: 28, separator: ' '), sufia.generic_file_path(recent_document)  %>
           <% if display_access %>
               <% if recent_document.registered? %>
                  <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span>
@@ -22,7 +22,7 @@
         </h3>
         <p>
           <span class="sr-only">Filename</span><%= link_to truncate(recent_document.label, length: 25),
-              sufia.generic_file_path(recent_document.noid), title: recent_document.label %><br />
+              sufia.generic_file_path(recent_document), title: recent_document.label %><br />
           <span class="sr-only">Keywords</span><%= link_to_facet_list(recent_document.tags, 'tag', 'no keywords specified').html_safe %>
         </p>
       </td>

data/app/views/homepage/_sortable_featured.html.erb

@@ -1,5 +1,5 @@
 <% featured = f.object.generic_file_solr_document %>
-<li class="dd-item dd3-item featured-item" data-id="<%= featured.noid %>">
+<li class="dd-item dd3-item featured-item" data-id="<%= featured.id %>">
   <div class="dd-handle dd3-handle"><%= t :drag %></div>
   <div class="dd3-content panel panel-default">
     <%= f.hidden_field :id %>
@@ -25,4 +25,3 @@
     </div>
   </div>
 </li>
-

data/app/views/my/_action_menu.html.erb

@@ -1,34 +1,34 @@
 <div class="btn-group">
-  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%=noid%>" aria-haspopup="true">
+  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
     <span class="sr-only">Press to </span>
     Select an action
     <span class="caret" aria-hidden="true"></span>
   </button>
-  <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%=noid%>">
+  <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
     <li role="menuitem" tabindex="-1">
     <%= link_to raw('<i class="glyphicon glyphicon-link over" aria-hidden="true"></i> Single-Use Link to File'), '#',
-      class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
+      class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{id}" %>
     </li>
     <li role="menuitem" tabindex="-1">
-    <%= link_to raw('<i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> Edit File'), sufia.edit_generic_file_path(noid),
+    <%= link_to raw('<i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> Edit File'), sufia.edit_generic_file_path(id),
       class: 'itemicon itemedit', title: 'Edit File' %>
     </li>
     <li role="menuitem" tabindex="-1">
-    <%= link_to raw('<i class="glyphicon glyphicon-download-alt" aria-hidden="true"></i> Download File'), sufia.download_path(noid),
+    <%= link_to raw('<i class="glyphicon glyphicon-download-alt" aria-hidden="true"></i> Download File'), sufia.download_path(id),
       class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
     </li>
     <li role="menuitem" tabindex="-1">
-    <%= link_to raw('<i class="glyphicon glyphicon-trash" aria-hidden="true"></i> Delete File'), sufia.generic_file_path(noid),
+    <%= link_to raw('<i class="glyphicon glyphicon-trash" aria-hidden="true"></i> Delete File'), sufia.generic_file_path(id),
       class: 'itemicon itemtrash', title: 'Delete File', method: :delete, 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" } %>
     </li>
     <li role="menuitem" tabindex="-1">
-      <%= display_trophy_link(@user, noid) do |text| %>
+      <%= display_trophy_link(@user, id) do |text| %>
         <i aria-hidden="true" class='glyphicon glyphicon-star'></i> <%= text %>
       <% end %>
     </li>
     <li>
-      <%= link_to raw('<i class="glyphicon glyphicon-transfer" aria-hidden="true"></i> Transfer Ownership of File'), sufia.new_generic_file_transfer_path(noid), class: 'itemicon itemtransfer', title: 'Transfer Ownership of File' if gf.depositor == @user.user_key %>
+      <%= link_to raw('<i class="glyphicon glyphicon-transfer" aria-hidden="true"></i> Transfer Ownership of File'), sufia.new_generic_file_transfer_path(id), class: 'itemicon itemtransfer', title: 'Transfer Ownership of File' if gf.depositor == @user.user_key %>
     </li>
   </ul>
 </div>

data/app/views/my/_collection_action_menu.html.erb

@@ -1,15 +1,15 @@
 <div class="btn-group">
-  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%=noid%>" aria-haspopup="true">
+  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
     <span class="sr-only">Press to </span>
     Select an action <span class="caret" aria-hidden="true"></span>
   </button>
-  <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%=noid%>">
+  <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
    <li role="menuitem" tabindex="-1">
-   <%= link_to raw('<i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> Edit Collection'), collections.edit_collection_path(noid),
+   <%= link_to raw('<i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> Edit Collection'), collections.edit_collection_path(id),
      class: 'itemicon itemedit', title: 'Edit Collection' %>
    </li>
    <li role="menuitem" tabindex="-1">
-   <%= link_to raw('<i class="glyphicon glyphicon-trash" aria-hidden="true"></i> Delete Collection'), collections.collection_path(noid),
+   <%= link_to raw('<i class="glyphicon glyphicon-trash" aria-hidden="true"></i> Delete Collection'), collections.collection_path(id),
      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" } %>
    </li>

data/app/views/my/_index_partials/_list_collections.html.erb

@@ -1,9 +1,6 @@
-
-<!-- scholarsphere over ride -->
-<!-- the sub on ':' is b.c. jQuery has trouble with '.' or ':'
-on element ids -->
-<% noid = document.noid %>
-<tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
+<!-- scholarsphere override -->
+<% id = document.id %>
+<tr id="document_<%= id %>" class="<%= cycle("","zebra") %>">
   <td width="3%"></td>
   <td width="41%">
     <div class="media">
@@ -12,12 +9,12 @@ on element ids -->
       <% end %>
       <div class="media-body">
         <div class="media-heading">
-          <%= link_to  collections.collection_path(noid), id: "src_copy_link#{noid}" do %>
+          <%= link_to  collections.collection_path(id), id: "src_copy_link#{id}" do %>
               <span class="sr-only"><%= t("sufia.dashboard.my.sr.show_label") %> </span>
               <%= document.title_or_label %>
           <% end %>
           <a href="#" class="small" title="Click for more details">
-            <i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+            <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
             <span class="sr-only"> <%= "#{t("sufia.dashboard.my.sr.detail_label")} #{document.title_or_label}" %></span>
           </a>
         </div>
@@ -27,19 +24,19 @@ on element ids -->
   <td width="17%"><%= document.date_uploaded %> </td>
   <td width="5%" class="text-center">
       <% if document.registered? %>
-     <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a> 
+     <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
     <% elsif document.public? %>
       <span class="label label-success" title="Open Access">Open Access</span></a>
     <% else %>
       <span class="label label-danger" title="Private">Private</span></a>
     <% end %>
-  
+
   </td>
   <td class="text-center">
-    <%= render partial:'collection_action_menu', locals:{noid:noid} %>
+    <%= render partial:'collection_action_menu', locals: { id: id } %>
    </td>
 </tr>
-<tr id="detail_<%= noid.gsub(":", "_") %>"> <!--  collection detail"> -->
+<tr id="detail_<%= id %>"> <!--  collection detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
       <dt class="col-xs-3 col-lg-2">Description:</dt>

data/app/views/my/_index_partials/_list_files.html.erb

@@ -1,12 +1,12 @@
-<% noid = document.noid %>
-<tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
+<% id = document.id %>
+<tr id="document_<%= id %>" class="<%= cycle("", "zebra") %>">
   <% gf = document.to_model %>
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("sufia.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= id %>" class="sr-only"><%=t("sufia.dashboard.my.sr.batch_checkbox")%></label>
     <%= batch_edit_select(document) %>&nbsp;
     <%# This block is for adding/removing the magic wand while batch updates are processing %>
     <% if gf.processing? %>
-        <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.noid %>"/>
+        <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.id %>"/>
     <% elsif gf.depositor != @user.user_key %>
         <i class="glyphicon glyphicon-share-alt"/>
     <% end %>
@@ -18,12 +18,12 @@
       <% end %>
       <div class="media-body">
         <div class="media-heading">
-          <%= link_to  sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" do %>
+          <%= link_to sufia.generic_file_path(document), id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" do %>
               <span class="sr-only"><%= t("sufia.dashboard.my.sr.show_label") %> </span>
               <%= document.title_or_label %>
           <% end %>
           <a href="#" class="small" title="Click for more details">
-            <i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right"  aria-hidden="true"></i>
+            <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"  aria-hidden="true"></i>
             <span class="sr-only"> <%= "#{t("sufia.dashboard.my.sr.detail_label")} #{document.title_or_label}" %></span>
           </a>
         </div>
@@ -36,14 +36,14 @@
     <%= render_visibility_link document %>
   </td>
   <td class="text-center">
-    <%= render partial: 'action_menu', locals: { noid: noid, gf: gf } %>
+    <%= render partial: 'action_menu', locals: { id: id, gf: gf } %>
   </td>
 </tr>
-<tr id="detail_<%= noid %>"> <!--  document detail"> -->
+<tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
       <dt class="col-xs-3 col-lg-2">File Name:</dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to document.label, sufia.generic_file_path(noid) %></dd>
+      <dd class="col-xs-9 col-lg-4"><%= link_to document.label, sufia.generic_file_path(id) %></dd>
       <dt class="col-xs-3 col-lg-2">File Format:</dt>
       <dd class="col-xs-9 col-lg-4"><%= document.file_format %>JPG</dd>
       <dt class="col-xs-3 col-lg-2">Creator:</dt>

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

@@ -10,7 +10,6 @@
 
 <% @page_title = "#{current_tab.capitalize} listing" %>
 
-
 <ul class="nav nav-tabs" id="my_nav">
   <h1 class="sr-only">Listing Navigation Bar</h1>
   <span class="sr-only">You are currently listing your <%= current_tab.pluralize %> .  You have <%= @response.docs.count %> <%= current_tab.pluralize(@response.docs.count)%> </span>

data/app/views/records/_rights_modal.html.erb

@@ -0,0 +1 @@
+<%= render partial: "generic_files/rights_modal" %>

data/app/views/users/_contributions.html.erb

@@ -3,7 +3,7 @@
   <% if @trophies.count > 0 %>
     <table>
       <% @trophies.each do |t| %>
-        <tr id="trophyrow_<%= t.noid %>">
+        <tr id="trophyrow_<%= t.id %>">
           <td>
             <%= link_to sufia.generic_file_path(t) do %>
               <%= render_thumbnail_tag t, { width: 90 } %>
@@ -12,7 +12,7 @@
           <td>
             <%= link_to display_title(t), sufia.generic_file_path(t) %>
             <% if current_user == @user %>
-              <%= display_trophy_link current_user, t.noid, class: 'glyphicon glyphicon-star', data: {removerow: true} do %>
+              <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: {removerow: true} do %>
                 <i class='trophy-on glyphicon glyphicon-remove'></i>
               <% end %>
             <% end %>
@@ -24,4 +24,3 @@
     <%= @user.name %> has no highlighted files.
   <% end %>
 </div>
-

data/app/views/users/_edit_primary.html.erb

@@ -0,0 +1,68 @@
+<div class="well">
+<%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
+  <div class="form-group">
+    <%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, class: "col-xs-4 control-label" %>
+    <div class="col-xs-8">
+      <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
+      <%= f.file_field :avatar %>
+      <%= f.hidden_field :avatar_cache %>
+      <span class="help-block">JPG, GIF, or PNG (less than 2MB)</span>
+    </div>
+  </div><!-- .form-group -->
+
+  <div class="col-xs-offset-4 col-xs-8">
+    <div class="checkbox">
+      <%= f.label :remove_avatar do %>
+        <%= f.check_box :remove_avatar %>
+        Delete picture
+        <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign"></i></a>
+      <% end %>
+    </div>
+    <div class="checkbox">
+      <%= f.label :update_directory do %>
+        <%= f.check_box :update_directory %>
+        Refresh directory info
+        <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign"></i></a>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
+      <%= orcid_label %>
+    <% end %>
+    <div class="col-xs-8">
+       <%= f.text_field :orcid, class: "form-control" %>
+    </div>
+  </div><!-- .form-group -->
+
+  <div class="form-group">
+    <%= f.label :twitter_handle, '<i class="fa fa-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
+    <div class="col-xs-8">
+       <%= f.text_field :twitter_handle, class: "form-control" %>
+    </div>
+  </div><!-- .form-group -->
+
+  <div class="form-group">
+    <%= f.label :facebook_handle, '<i class="fa fa-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
+    <div class="col-xs-8">
+       <%= f.text_field :facebook_handle, class: "form-control" %>
+    </div>
+  </div><!-- .form-group -->
+
+  <div class="form-group">
+    <%= f.label :googleplus_handle, '<i class="fa fa-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
+    <div class="col-xs-8">
+       <%= f.text_field :googleplus_handle, class: "form-control" %>
+    </div>
+  </div><!-- .form-group -->
+
+  <%= render partial: 'trophy_edit', locals: {trophies: @trophies} %>
+
+  <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
+<% end %>
+</div>
+<div class="well">
+  <%= render 'dashboard/_index_partials/proxy_rights' %>
+</div>
+

data/app/views/users/_edit_secondary.html.erb

@@ -0,0 +1 @@
+<% # override this view to show group membership %>

data/app/views/users/_trophy_edit.html.erb

@@ -8,12 +8,10 @@
       <dd>
         <%= link_to t, sufia.generic_file_path(t) %>
         <label class="checkbox fleft">
-          <%= check_box_tag "remove_trophy_#{t.noid}" %> Yes &nbsp;
+          <%= check_box_tag "remove_trophy_#{t.id}" %> Yes &nbsp;
         </label>
       </dd>
       <br/>
     <% end %>
  </dl>
 </div>
-
-

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

@@ -1,82 +1,8 @@
-<h1>Edit Profile</h1>
+<h1 class="col-sm-12">Edit Profile</h1>
 <div class="col-xs-12 col-sm-5 profile">
-  <div class="well">
-  <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
-    <div class="form-group">
-      <%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, class: "col-xs-4 control-label" %>
-      <div class="col-xs-8">
-        <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
-        <%= f.file_field :avatar %>
-        <%= f.hidden_field :avatar_cache %>
-        <span class="help-block">JPG, GIF, or PNG (less than 2MB)</span>
-      </div>
-    </div><!-- .form-group -->
-
-    <div class="col-xs-offset-4 col-xs-8">
-      <div class="checkbox">
-        <%= f.label :remove_avatar do %>
-          <%= f.check_box :remove_avatar %>
-          Delete picture
-          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign"></i></a>
-        <% end %>
-      </div>
-      <div class="checkbox">
-        <%= f.label :update_directory do %>
-          <%= f.check_box :update_directory %>
-          Refresh directory info
-          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign"></i></a>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
-        <%= orcid_label %>
-      <% end %>
-      <div class="col-xs-8">
-         <%= f.text_field :orcid, class: "form-control" %>
-      </div>
-    </div><!-- .form-group -->
-
-    <div class="form-group">
-      <%= f.label :twitter_handle, '<i class="fa fa-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
-      <div class="col-xs-8">
-         <%= f.text_field :twitter_handle, class: "form-control" %>
-      </div>
-    </div><!-- .form-group -->
-
-    <div class="form-group">
-      <%= f.label :facebook_handle, '<i class="fa fa-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
-      <div class="col-xs-8">
-         <%= f.text_field :facebook_handle, class: "form-control" %>
-      </div>
-    </div><!-- .form-group -->
-
-    <div class="form-group">
-      <%= f.label :googleplus_handle, '<i class="fa fa-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
-      <div class="col-xs-8">
-         <%= f.text_field :googleplus_handle, class: "form-control" %>
-      </div>
-    </div><!-- .form-group -->
-
-    <%= render partial: 'trophy_edit', locals: {trophies: @trophies} %>
-
-    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
-  <% end %>
-  </div>
-  <div class="well">
-    <%= render partial: 'dashboard/_index_partials/proxy_rights' %>
-  </div>
-</div><!-- .col-xs-5 /well-->
+  <%= render 'edit_primary' %>
+</div>
 
 <div class="col-xs-12 col-sm-offset-1 col-sm-6 well profile">
-  <h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', class: 'btn btn-mini btn-primary' %></h3>
-  <%= render partial: 'user_info', locals: {user: @user} %>
-
-  <hr />
-
-  <h2><i class="glyphicon glyphicon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', class: 'btn btn-xs btn-primary' %> </h3>
-  <% current_user.groups.each do |g| %>
-    <i class="glyphicon glyphicon-asterisk"></i> <%= g %><br />
-  <% end %>
+  <%= render 'edit_secondary' %>
 </div>