RubyGems - sufia - Versions diffs - 7.1.0 → 7.2.0 - Mend

sufia 7.1.0 → 7.2.0

Files changed (393) hide show

data/app/views/curation_concerns/file_sets/_groups_description.html.erb CHANGED Viewed

@@ -1,6 +1,2 @@
-<p>The list of groups in the drop-down marked &quot;Select a group&quot; is a list of User Managed Groups that
-  you are a member of, and are managed by <%=institution_name %>'s ITS department.  You may select
-  a specific group and assign an access level for a file within <%=application_name %>, similarly to
-  adding user access levels.  However, management of these groups and their membership is handled centrally
-  at <a href='http://umg.its.psu.edu' target='_blank'>umg.its.psu.edu</a>.</p>
+<p><%= t('.description_html', institution_name: institution_name, application_name: application_name) %></p>

data/app/views/curation_concerns/file_sets/media_display/_default.html.erb CHANGED Viewed

@@ -1,3 +1,6 @@
 <div class="no-preview">
   <%= t('sufia.works.show.no_preview') %>
+  <% if CurationConcerns.config.display_media_download_link %>
+    <p/><%= link_to t('sufia.file_set.show.download'), main_app.download_path(file_set), target: "_new" %>
+  <% end %>
 </div>

data/app/views/curation_concerns/permissions/confirm_access.html.erb ADDED Viewed

@@ -0,0 +1,12 @@
+<div class="panel panel-default permissions-confirm">
+  <div class="panel-heading">
+    <h4>Apply changes to contents?<h4>
+  </div>
+  <div class="panel-body">
+      <%= I18n.t("sufia.upload.change_access_message_html", curation_concern: curation_concern).html_safe %>
+  </div>
+  <div class="form-actions panel-footer">
+    <%= button_to I18n.t("sufia.upload.change_access_yes_message"), sufia.copy_access_curation_concerns_permission_path(curation_concern), class: 'btn btn-primary' %>
+    <%= link_to I18n.t("sufia.upload.change_access_no_message"), [main_app, curation_concern], class: 'btn' %>
+  </div>
+</div>

data/app/views/dashboard/_index_partials/_heading_greetings.html.erb CHANGED Viewed

@@ -1,3 +1,3 @@
 <div class="col-md-12">
-  <h1 class="page-header"><%= t("sufia.dashboard.title") %></h1>
+  <h1><%= t("sufia.dashboard.title") %></h1>
 </div>

data/app/views/layouts/admin.html.erb ADDED Viewed

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <!-- META SECTION -->
+        <title><%= content_for?(:page_title) ? yield(:page_title) : default_page_title %></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <%= render "layouts/head_tag_content"%>
+        <!-- END META SECTION -->
+        <!-- CSS INCLUDE -->
+        <%= stylesheet_link_tag 'sufia/admin', data: { turbolinks_track: 'reload' } %>
+        <!-- EOF CSS INCLUDE -->
+    </head>
+    <body>
+        <!-- START PAGE CONTAINER -->
+        <div class="page-container">
+            <!-- START PAGE SIDEBAR -->
+            <div class="page-sidebar">
+              <%= render 'sufia/admin/sidebar' %>
+            </div>
+            <!-- END PAGE SIDEBAR -->
+            <!-- PAGE CONTENT -->
+            <div class="page-content">
+                <ul class="x-navigation x-navigation-horizontal x-navigation-panel">
+                  <li class="dropdown pull-right">
+                    <%= link_to sufia.profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
+                      <span class="sr-only">View</span>
+                      <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+                      <span class="sr-only"> profile</span>
+                      <span class="fa fa-user"></span>
+                      <span class="caret" ></span>
+                    <% end %>
+                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                      <li><%= link_to 'View Profile', sufia.profile_path(current_user) %></li>
+                      <li><%= link_to 'Edit Profile', sufia.edit_profile_path(current_user) %></li>
+                      <li class="divider"></li>
+                      <li><%= link_to 'Logout', main_app.destroy_user_session_path %></li>
+                    </ul>
+                  </li><!-- /.btn-group -->
+                  <li class="pull-right">
+                    <%= link_to sufia.notifications_path do %>
+                      Notifications
+                      <%= render partial: 'users/notify_number' %>
+                    <% end %>
+                  </li>
+                </ul>
+                <!-- START BREADCRUMB -->
+                <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
+                <!-- END BREADCRUMB -->
+                <% if content_for?(:page_header) %>
+                  <div class="page-title">
+                    <%= yield(:page_header) %>
+                  </div>
+                <% end %>
+                <!-- PAGE CONTENT WRAPPER -->
+                <div class="page-content-wrap">
+                  <%= yield %>
+                </div>
+                <!-- END PAGE CONTENT WRAPPER -->
+            </div>
+            <!-- END PAGE CONTENT -->
+        </div>
+        <!-- END PAGE CONTAINER -->
+    </body>
+</html>

data/app/views/layouts/{sufia-one-column.html.erb → curation_concerns/1_column.html.erb} RENAMED Viewed

@@ -9,7 +9,7 @@
 <%= render partial: '/masthead' %>
 <%= render partial: '/controls' %>
 <%= render partial: '/flash_msg' %>
-<div id="content-wrapper" class="container-fluid">
+<div id="content-wrapper" class="container">
   <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
   <% if content_for?(:page_header) %>

data/app/views/layouts/homepage.html.erb CHANGED Viewed

@@ -6,9 +6,42 @@
 <body>
 <%= render '/masthead' %>
-<%= render '/controls' %>
+<div class="image-masthead">
+  <div class="background-container" style="background-image: url('<%= Sufia.config.banner_image %>')"></div>
+  <span class="background-container-gradient"></span>
+  <div class="container site-title-container">
+    <div class="site-title h1" style="text-align: center;">
+      <%= render "sufia/homepage/marketing" if controller_name == 'homepage' %>
+    </div>
+  </div>
+  <nav class="navbar" role="navigation">
+    <div class="container">
+      <div class="row">
+        <ul class="nav navbar-nav">
+          <li <%= 'class=active' if current_page?(sufia.root_path) %>>
+            <%= link_to t(:'sufia.controls.home'), sufia.root_path, :'data-no-turbolink'=>"true" %></li>
+          <li <%= 'class=active' if current_page?(sufia.about_path) %>>
+            <%= link_to t(:'sufia.controls.about'), sufia.about_path, :'data-no-turbolink'=>"true" %></li>
+          <li <%= 'class=active' if action_name == "help" %>>
+            <%= link_to t(:'sufia.controls.help'), sufia.help_path %></li>
+          <li <%= 'class=active' if current_page?(sufia.contact_path) %>>
+            <%= link_to t(:'sufia.controls.contact'), sufia.contact_path %></li>
+        </ul><!-- /.nav -->
+        <div class="searchbar-right navbar-right col-sm-7 col-md-6">
+          <%= render partial: 'catalog/search_form' %>
+        </div>
+      </div>
+    </div>
+  </nav><!-- /.navbar -->
+</div>
 <%= render '/flash_msg' %>
-<div id="content-wrapper" class="container-fluid">
+<%= render 'sufia/homepage/announcement' if controller_name == 'homepage' %>
+<div id="content-wrapper" class="container">
   <%= yield %>
 </div><!-- /#content-wrapper -->
 <%= render 'shared/footer' %>

data/app/views/layouts/sufia-dashboard.html.erb CHANGED Viewed

@@ -7,7 +7,7 @@
 <%= render '/controls' %>
 <%= render '/flash_msg' %>
-<div id="content-wrapper" class="container-fluid dashboard" role="main">
+<div id="content-wrapper" class="container dashboard" role="main">
   <% if content_for?(:page_header) %>
     <div class="row">
       <div class="col-xs-12 main-header">

data/app/views/my/_facet_pagination.html.erb CHANGED Viewed

@@ -1,8 +1,8 @@
     <div class="prev_next_links btn-group pull-left">
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} do %>
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: sufia, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} do %>
        <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
      <% end %>
-      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} do %>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: sufia, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} do %>
        <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
       <% end %>
@@ -12,11 +12,11 @@
   <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
       <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
-        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(only_path: true)),
-        class: "sort_change numeric btn btn-default",
+        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', search_state.to_h).symbolize_keys.merge(only_path: true)),
+        class: "sort_change numeric btn btn-default",
         data: {ajax_modal: "preserve"}) %>
     <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to(t('blacklight.search.facets.sort.index'), Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(only_path: true)),
+      <%=  link_to(t('blacklight.search.facets.sort.index'), Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', search_state.to_h).symbolize_keys.merge(only_path: true)),
         class: "sort_change az btn btn-default",  data: {ajax_modal: "preserve"}) %><span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
     <% end -%>
   </div>

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

@@ -3,9 +3,7 @@
   <td></td>
   <td>
     <div class="media">
-      <%= link_to document, class: "pull-left", "aria-hidden" => true do %>
-          <span class="fa fa-cubes collection-icon-small"></span>
-      <% end %>
+      <span class="fa fa-cubes collection-icon-small pull-left"></span>
       <div class="media-body">
         <div class="media-heading">
           <%= link_to document, id: "src_copy_link#{id}" do %>

data/app/views/my/_scripts.js.erb CHANGED Viewed

@@ -1,9 +1,8 @@
 // hide or show the batch update buttons on page startup
 window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
-window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
 window.result_set_size = <%= @result_set_size %>;
 window.document_list_count = <%= @document_list.count %>;
 toggleButtons(<%= !@empty_batch %>);
 // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
-$('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
+$('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});

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

@@ -1,15 +1,15 @@
 <% provide :page_title, "#{@selected_tab.capitalize} listing" %>
 <% content_for :head do %>
-  <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
-  <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
+  <%= rss_feed_link_tag route_set: sufia %>
+  <%= atom_feed_link_tag route_set: sufia %>
 <% end %>
 <%= javascript_tag do %>
   <%= render partial: 'scripts', formats: [:js] %>
 <% end %>
-<h1 class="sr-only">My Works, Collections, Highlights, and Files Shared with Me</h1>
+<h1 class="sr-only">My Works, Collections, Highlights, and <%= t('sufia.dashboard.my.shares') %></h1>
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
   <span class="sr-only">You are currently listing your <%= @selected_tab.pluralize %> .  You have <%= @response.docs.count %> <%= @selected_tab.pluralize(@response.docs.count)%> </span>
   <li class="<%= "active" if @selected_tab == 'works' %>">

data/app/views/records/edit_fields/_description.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% if f.object.class.multiple? key %>
-  <%= f.input :description, as: :multi_value, input_html: { rows: '14', type: 'textarea'}, required: false %>
+  <%= f.input :description, as: :multi_value, input_html: { rows: '14', type: 'textarea'}, required: f.object.required?(key) %>
 <% else %>
-  <%= f.input :description, as: :text, input_html: { rows: '14' } %>
+  <%= f.input :description, as: :text, input_html: { rows: '14' }, required: f.object.required?(key) %>
 <% end %>

data/app/views/records/edit_fields/_rights.html.erb CHANGED Viewed

@@ -1,6 +1,7 @@
+<% license_service = CurationConcerns::LicenseService.new %>
 <%= f.input :rights, as: :multi_value_select,
-    collection: RightsService.select_active_options,
+    collection: license_service.select_active_options,
     include_blank: true,
-    item_helper: method(:include_current_value),
+    item_helper: license_service.method(:include_current_value),
     input_html: { class: 'form-control' } %>
 <%= render "curation_concerns/file_sets/rights_modal" %>

data/app/views/records/show_fields/_rights.html.erb CHANGED Viewed

@@ -1,3 +1,4 @@
+<% service = CurationConcerns::LicenseService.new %>
 <% record.rights.each do |r| %>
-  <%= link_to_field('rights', r, RightsService.label(r)) %> <%= iconify_auto_link(r, false) %><br />
+  <%= link_to_field('rights', r, service.label(r)) %> <%= iconify_auto_link(r, false) %><br />
 <% end %>

data/app/views/shared/_footer.html.erb CHANGED Viewed

@@ -7,7 +7,7 @@
     <div class="navbar-right">
       <div class="navbar-text text-right">
         <p><%= t('sufia.footer.copyright_html') %></p>
-        <p><%= t('sufia.background_attribution') %></p>
+        <p><%= t('sufia.background_attribution_html') %></p>
       </div>
     </div>
   </div>

data/app/views/sufia/admin/_menu.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<li>
+  <%= link_to sufia.admin_path do %>
+    <span class="fa fa-gear"></span> <%= t("sufia.toolbar.admin.menu") %>
+  <% end %>
+</li>

data/app/views/sufia/admin/_sidebar.html.erb ADDED Viewed

@@ -0,0 +1,23 @@
+                <!-- START X-NAVIGATION -->
+                <ul class="x-navigation">
+                    <li class="xn-logo">
+                        <%= link_to root_path do %>
+                          <span class="glyphicon glyphicon-globe"></span>
+                          <%= application_name %>
+                        <% end %>
+                        <a href="#" class="x-navigation-control"></a>
+                    </li>
+                    <li><%= link_to sufia.admin_stats_path do %>
+                          <span class="fa fa-bar-chart"></span> <%= t('sufia.admin.sidebar.statistics') %>
+                        <% end %>
+                    </li>
+                    <li><%= link_to sufia.admin_features_path do %>
+                          <span class="fa fa-cog"></span> <%= t('sufia.admin.sidebar.settings') %>
+                        <% end %>
+                    </li>
+                    <li><%= link_to sufia.admin_admin_sets_path do %>
+                      <span class="fa fa-sitemap"></span> <%= t('sufia.admin.sidebar.admin_sets') %>
+                        <% end %>
+                    </li>
+                </ul>

data/app/views/sufia/admin/admin_sets/_form.html.erb ADDED Viewed

@@ -0,0 +1,18 @@
+    <%= simple_form_for @form, url: [sufia, :admin, @form] do |f| %>
+      <div class="panel panel-default">
+        <div class="panel-body">
+          <%= f.input :title %>
+          <%= f.input :description, as: :text %>
+          <% if f.object.persisted? && f.object.member_ids.present? %>
+            <%= f.input :thumbnail_id, collection: @form.select_files %>
+          <% end %>
+        </div>
+        <div class="panel-footer">
+          <%= link_to 'Cancel', sufia.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
+          <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+        </div>
+      </div>
+    <% end %>

data/app/views/sufia/admin/admin_sets/_sort_and_per_page.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<% if show_pagination? %>
+  <div id="sortAndPerPage" class="sort-pagination" class="clearfix">
+    <%= render partial: "paginate_compact", object: @response %>
+  </div>
+<% end %>

data/app/views/sufia/admin/admin_sets/edit.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<% content_for :page_header do %>
+  <h1><span class="fa fa-edit"></span> <%= t('.header') %></h1>
+<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'form' %>
+  </div>
+</div>

data/app/views/sufia/admin/admin_sets/index.html.erb ADDED Viewed

@@ -0,0 +1,46 @@
+<% content_for :page_header do %>
+  <h1><span class="fa fa-sitemap"></span> Administrative Sets</h1>
+  <div class="pull-right">
+    <%= link_to sufia.new_admin_admin_set_path, class: 'btn btn-primary' do %>
+      <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
+    <% end %>
+  </div>
+<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-body">
+        <% if @admin_sets.present? %>
+          <div class="table-responsive">
+            <table class="table table-striped datatable">
+              <thead>
+                <tr>
+                  <th>Title</th>
+                  <th>Date created</th>
+                  <th>Creator</th>
+                  <th>Works</th>
+                </tr>
+              </thead>
+              <tbody>
+                <% @admin_sets.each do |admin_set| %>
+                  <tr>
+                    <td><%= link_to admin_set.title.first, [sufia, :admin, admin_set] %></td>
+                    <td><%= admin_set.create_date %></td>
+                    <td><%= safe_join(admin_set.creator) %></td>
+                    <td><%= controller.presenter_class.new(admin_set, current_ability).total_items %></td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          <% else %>
+            <p>No administrative sets have been created.</p>
+            <%= link_to sufia.new_admin_admin_set_path, class: 'btn btn-primary' do %>
+              <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/sufia/admin/admin_sets/new.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<% content_for :page_header do %>
+  <h1><span class="fa fa-edit"></span> <%= t('.header') %></h1>
+<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'form' %>
+  </div>
+</div>

data/app/views/sufia/admin/admin_sets/show.html.erb ADDED Viewed

@@ -0,0 +1,43 @@
+<% content_for :page_header do %>
+  <h1><span class="fa fa-sitemap"></span> <%= t('.header') %></h1>
+<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h2 class="panel-title display-page"><%= @presenter.to_s %></h2>
+        <div class="pull-right">
+          <%= link_to sufia.edit_admin_admin_set_path(@presenter), class: 'btn btn-primary' do %>
+            <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
+          <% end %>
+        </div>
+      </div>
+      <div class="panel-body admin-set row">
+        <div class="col-md-2">
+          <% if has_thumbnail? @presenter.solr_document %>
+            <div class="document-thumbnail">
+              <%= render_thumbnail_tag @presenter.solr_document, {}, suppress_link: true %>
+            </div>
+          <% else %>
+            <span class="fa fa-sitemap collection-icon-search"></span>
+          <% end %>
+        </div>
+        <div class="col-md-10">
+          <%= render 'collection_description', presenter: @presenter %>
+          <%= render 'show_descriptions' %>
+        </div>
+      </div>
+      <div class="panel-body admin-set-members">
+        <h3><%= t '.item_list_header' %></h3>
+        <%= render 'sort_and_per_page', collection: @presenter %>
+        <%= render_document_index @member_docs %>
+        <%= render 'paginate' %>
+      </div>
+    </div>
+  </div>
+</div>