sufia 7.2.0 → 7.3.0.rc1

data/app/views/curation_concerns/base/_form_relationships.html.erb

@@ -1,13 +1,13 @@
 <% if Flipflop.assign_admin_set? %>
   <%= f.input :admin_set_id, as: :select,
-      collection: CurationConcerns::AdminSetService.new(controller).select_options,
+      collection: Sufia::AdminSetService.new(controller).select_options(:deposit),
       include_blank: true,
       input_html: { class: 'form-control' } %>
 <% end %>
 
 <%= render 'form_in_works', f: f %>
 
-<h2><%= t("sufia.works.#{action_name}.in_collections") %></h2>
+<h2><%= t("sufia.works.form.in_collections") %></h2>
 <div id="collection-widget">
   <%= f.input :collection_ids, as: :select,
               collection: available_collections(nil),
@@ -15,9 +15,9 @@
 </div>
 
 <% if params[:id] %>
-  <h3><%= t("sufia.works.#{action_name}.in_this_work") %></h3>
-  <%= render 'form_child_work_relationships', f: f %>
+  <h3><%= t("sufia.works.form.in_this_work") %></h3>
+   <%= render 'form_child_work_relationships', f: f, id_name: 'work_child_members_ids', id_type: 'ordered_member_ids' %>
 
-  <h3><%= t("sufia.works.#{action_name}.in_other_works") %></h3>
-  <%= render_edit_field_partial(:in_works_ids, f: f) %>
+  <h3><%= t("sufia.works.form.in_other_works") %></h3>
+  <%= render 'form_parent_work_relationships', f: f, id_name: 'work_parent_members_ids', id_type: 'in_works_ids' %>
 <% end %>

data/app/views/curation_concerns/base/_form_share.html.erb

@@ -25,7 +25,7 @@
     <tr>
       <td>
 	<%= permission_fields.select :access, Sufia.config.permission_levels, {}, class: 'form-control select_perm' %>
-        
+
       </td>
       <td>
 	<%= permission_fields.label :agent_name, class: "control-label" do %>
@@ -37,7 +37,6 @@
   <% end %>
 </table>
 
-
 <h2>Share work with other users</h2>
 <p class="sr-only">Use the add button to give access to one <%=t('sufia.account_label') %> at a time (it will be added to the list below).
   Select the user, by name or <%= t('sufia.account_label') %>. Then select the access level you wish to grant and click on Add this

data/app/views/curation_concerns/base/_guts4form.html.erb

@@ -12,7 +12,7 @@
           <li role="presentation">
         <% end %>
             <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-              <i class="fa icon-<%= tab %>"></i> <%= t("sufia.works.edit.tab.#{tab}") %>
+              <i class="fa icon-<%= tab %>"></i> <%= t("sufia.works.form.tab.#{tab}") %>
             </a>
           </li>
       <% end %>

data/app/views/curation_concerns/base/_social_media.html.erb

@@ -39,7 +39,7 @@
   <% end %>
 
   <!-- Sharingbutton Tumblr -->
-  <%= link_to "https://www.tumblr.com/widgets/share/tool?#{{posttype: 'link', content: share_url, shareSource: 'tumblr_share_button'}.to_param}", class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('curation_concerns.base.social_media.tumblr') do %>
+  <%= link_to "https://www.tumblr.com/widgets/share/tool?#{{posttype: 'link', canonicalUrl: share_url, shareSource: 'tumblr_share_button'}.to_param}", class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('curation_concerns.base.social_media.tumblr') do %>
     <div class="resp-sharing-button resp-sharing-button--tumblr resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <g>

data/app/views/curation_concerns/base/_workflow_actions_widget.erb

@@ -0,0 +1,3 @@
+<div class="workflow-actions">
+  <%= render 'workflow_actions', presenter: @presenter if @presenter.workflow.actions.present? %>
+</div>

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

@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.update.header") %></h1>
 <% end %>
 
 <%= render 'form' %>

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

@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.create.header", type: curation_concern.human_readable_type) %></h1>
 <% end %>
 
 <%= render 'form' %>

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

@@ -4,6 +4,8 @@
     <header>
       <%= render 'work_title', presenter: @presenter %>
     </header>
+
+    <span class="state state-<%= @presenter.workflow.state %>"><%= @presenter.workflow.state_label %></span>
   </div>
   <div class="col-sm-8">
     <%= render 'work_description', presenter: @presenter %>
@@ -12,7 +14,7 @@
   </div>
   <div class="col-sm-4">
     <%= render "show_actions", presenter: @presenter %>
-    Last modified: <%= @presenter.date_modified %>
+    <%= t('.last_modified', value: @presenter.date_modified) %>
     <%= render 'representative_media', presenter: @presenter %>
     <%= render 'social_media' %>
     <%= render 'citations', presenter: @presenter %>
@@ -22,6 +24,7 @@
 <div class="row">
   <div class="col-sm-12">
     <%= render 'items', presenter: @presenter %>
+    <%= render 'workflow_actions_widget', presenter: @presenter %>
     <%# TODO: we may consider adding these partials in the future %>
     <%#= render 'sharing_with', presenter: @presenter %>
     <%#= render 'user_activity', presenter: @presenter %>

data/app/views/curation_concerns/file_sets/_show_actions.html.erb

@@ -2,9 +2,6 @@
   <% if Sufia.config.analytics %>
     <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
   <% end %>
-  <% if Sufia.config.citations %>
-    <%= link_to "Citations", sufia.citations_work_path(@presenter), id: 'citations', class: 'btn btn-default' %>
-  <% end %>
   <% if @presenter.editor? %>
       <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]),
                   class: 'btn btn-default' %>

data/app/views/dashboard/_create_work_action.html.erb

@@ -0,0 +1,20 @@
+<% if create_work_presenter.many? %>
+  <div class="col-xs-6 col-sm-3 heading-tile">
+    <%= link_to('#', data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single' }) do %>
+      <span class="glyphicon glyphicon-upload"></span>
+      <%= t("sufia.dashboard.create_work") %>
+    <% end %>
+  </div>
+<% else %>
+  <div class="col-xs-6 col-sm-3 heading-tile">
+    <% create_work_presenter.first_model do |concern| %>
+      <%= link_to(new_polymorphic_path([main_app, concern]),
+                            class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
+                            role: 'menuitem'
+                    ) do %>
+                    <span class="glyphicon glyphicon-upload"></span>
+                    <%= I18n.t("sufia.dashboard.create_work", work_type: concern.human_readable_type) %>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/dashboard/_index_partials/_heading_actions.html.erb

@@ -1,38 +1,25 @@
 <div class="col-xs-12 heading-row">
   <div class="row">
-    <% if can?(:create, Sufia.primary_work_type) %>
-        <div class="col-xs-6 col-sm-2 heading-tile">
-          <% classification = CurationConcerns::QuickClassificationQuery.new(current_user) %>
-          <% classification.each do |concern| %>
-              <%= link_to(new_polymorphic_path([main_app, concern]),
-                          class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
-                          role: 'menuitem'
-                  ) do %>
-                  <span class="glyphicon glyphicon-upload"></span>
-                  <%= I18n.t("sufia.dashboard.create_work", work_type: concern.human_readable_type) %>
-              <% end %>
-          <% end %>
-        </div>
-    <% end %>
+    <%= render 'create_work_action' if can_ever_create_works? %>
     <% if can?(:create, Collection) %>
-        <div class="col-xs-6 col-sm-2 heading-tile">
+        <div class="col-xs-6 col-sm-3 heading-tile">
           <%= link_to new_collection_path, id: "hydra-collection-add" do %>
               <span class="glyphicon glyphicon-plus"></span>
               <%= t("sufia.dashboard.create_collection") %>
           <% end %>
         </div>
     <% end  %>
-    <div class="col-xs-6 col-sm-2 heading-tile">
-      <%= link_to sufia.dashboard_collections_path, id: "hydra-collection-view" do %>
-          <span class="glyphicon glyphicon-th"></span>
-          <%= t("sufia.dashboard.view_collections") %>
-      <% end %>
-    </div>
-    <div class="col-xs-6 col-sm-2 heading-tile">
+    <div class="col-xs-6 col-sm-3 heading-tile">
       <%= link_to sufia.dashboard_works_path  do %>
           <span class="glyphicon glyphicon-eye-open"></span>
           <%= t("sufia.dashboard.view_works") %>
       <% end %>
     </div>
+    <div class="col-xs-6 col-sm-3 heading-tile">
+      <%= link_to sufia.dashboard_collections_path, id: "hydra-collection-view" do %>
+          <span class="glyphicon glyphicon-th"></span>
+          <%= t("sufia.dashboard.view_collections") %>
+      <% end %>
+    </div>
   </div>
 </div>

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

@@ -1,71 +1,11 @@
-<!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" />
+<% content_for(:head) do %>
+  <%= stylesheet_link_tag 'sufia/admin', data: { turbolinks_track: 'reload' } %>
+<% end %>
 
-        <%= render "layouts/head_tag_content"%>
-        <!-- END META SECTION -->
+<% content_for(:sidebar) do %>
+  <%= render 'sufia/admin/sidebar' %>
+<% end %>
 
-        <!-- CSS INCLUDE -->
-        <%= stylesheet_link_tag 'sufia/admin', data: { turbolinks_track: 'reload' } %>
-        <!-- EOF CSS INCLUDE -->
-    </head>
-    <body>
-        <!-- START PAGE CONTAINER -->
-        <div class="page-container">
+<% content_for(:container_class, 'container-fluid') %>
 
-            <!-- 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>
+<%= render template: 'layouts/sufia' %>

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

@@ -1,32 +1,5 @@
-<!DOCTYPE html>
-<html lang="<%= t("sufia.document_language") %>" prefix="og:http://ogp.me/ns#">
-  <head>
-    <%= render partial: 'layouts/head_tag_content' %>
-  </head>
+<% content_for(:navbar) do %>
+  <%= render '/controls' %>
+<% end %>
 
-<body>
-<a href="#skip_to_content" class="sr-only">Skip to Content</a>
-<%= render partial: '/masthead' %>
-<%= render partial: '/controls' %>
-<%= render partial: '/flash_msg' %>
-<div id="content-wrapper" class="container">
-  <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
-
-  <% if content_for?(:page_header) %>
-    <div class="row">
-      <div class="col-xs-12 main-header">
-        <%= yield(:page_header) %>
-      </div>
-    </div>
-  <% end %>
-  <a name="skip_to_content"></a>
-  <div class="row">
-    <div class="col-xs-12">
-      <%= yield %>
-    </div>
-  </div><!-- /.row -->
-</div><!-- /#content-wrapper -->
-<%= render 'shared/footer' %>
-<%= render 'shared/ajax_modal' %>
-</body>
-</html>
+<%= render template: 'layouts/sufia' %>

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

@@ -1,50 +1,20 @@
-<!DOCTYPE html>
-<html lang="<%= t("sufia.document_language") %>">
-<head>
-  <%= render "layouts/head_tag_content"%>
-</head>
+<% content_for(:navbar) do %>
+  <div class="image-masthead">
+    <div class="background-container" style="background-image: url('<%= banner_image %>')"></div>
+    <span class="background-container-gradient"></span>
 
-<body>
-<%= render '/masthead' %>
-
-<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 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><!-- /.navbar -->
-</div>
 
-<%= render '/flash_msg' %>
-<%= render 'sufia/homepage/announcement' if controller_name == 'homepage' %>
+    <%= render '/controls' %>
+  </div>
+<% end %>
+
+<% content_for(:precontainer_content) do %>
+  <%= render 'sufia/homepage/announcement' if controller_name == 'homepage' %>
+<% end %>
 
-<div id="content-wrapper" class="container">
-  <%= yield %>
-</div><!-- /#content-wrapper -->
-<%= render 'shared/footer' %>
-<%= render 'shared/ajax_modal' %>
-</body>
-</html>
+<%= render template: 'layouts/sufia' %>

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

@@ -1,36 +1 @@
-<!DOCTYPE html>
-<html lang="<%= t("sufia.document_language") %>">
-<head><%= render 'layouts/head_tag_content' %></head>
-<body>
-<a href="#skip_to_content" class="sr-only">Skip to Content</a>
-<%= render '/masthead' %>
-<%= render '/controls' %>
-<%= render '/flash_msg' %>
-
-<div id="content-wrapper" class="container dashboard" role="main">
-  <% if content_for?(:page_header) %>
-    <div class="row">
-      <div class="col-xs-12 main-header">
-        <div class="row">
-          <%= yield(:page_header) %>
-        </div>
-      </div>
-    </div>
-  <% end %>
-  <a name="skip_to_content"></a>
-  <div class="row">
-  <% if content_for?(:sidebar) %>
-      <div class="col-xs-12 col-sm-9 col-sm-push-3"><%= yield %></div>
-      <div id="sidebar" class="col-xs-12 col-sm-3 col-sm-pull-9"><%= yield :sidebar %></div>
-    <% else %>
-      <div class="col-xs-12">
-        <%= yield %>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<%= render 'shared/footer' %>
-<%= render 'shared/ajax_modal' %>
-</body>
-</html>
+<%= render template: 'layouts/curation_concerns/1_column' %>

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

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="<%= t("sufia.document_language", default: '') %>" prefix="og:http://ogp.me/ns#">
+  <head>
+    <%= render partial: 'layouts/head_tag_content' %>
+    <%= content_for(:head) %>
+  </head>
+
+  <body>
+    <a href="#skip_to_content" class="sr-only">Skip to Content</a>
+    <%= render partial: '/masthead' %>
+    <%= content_for(:navbar) %>
+    <%= render partial: '/flash_msg' %>
+    <%= content_for(:precontainer_content) %>
+    <div id="content-wrapper" class="<%= content_for?(:container_class) ? yield(:container_class) : 'container' %>" role="main">
+      <a name="skip_to_content"></a>
+      
+      <% if content_for?(:sidebar) %>
+        <div class="col-xs-12 col-sm-9 col-sm-push-3 main-content">
+          <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
+          <% if content_for?(:page_header) %>
+            <div class="row">
+              <div class="col-xs-12 main-header">
+                <%= yield(:page_header) %>
+              </div>
+            </div>
+          <% end %>
+          
+          <%= content_for?(:content) ? yield(:content) : yield %>
+        </div>
+        <div id="sidebar" class="col-xs-12 col-sm-3 col-sm-pull-9 sidebar"><%= yield :sidebar %></div>
+      <% else %>
+        <div class="col-xs-12">
+          <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
+          <% if content_for?(:page_header) %>
+            <div class="row">
+              <div class="col-xs-12 main-header">
+                <%= yield(:page_header) %>
+              </div>
+            </div>
+          <% end %>
+          
+          <%= content_for?(:content) ? yield(:content) : yield %>
+        </div>
+      <% end %>
+    </div><!-- /#content-wrapper -->
+    <%= render 'shared/footer' %>
+    <%= render 'shared/ajax_modal' %>
+  </body>
+</html>