Misc. edits ahead of may release

app/assets/stylesheets/scholarspace/components/_collection.scss

@@ -246,3 +246,8 @@
     }
   }
 }
+
+// collections in main search
+.search-result-wrapper .collection-counts-wrapper .collection-counts-item {
+  font-weight: inherit;
+}

app/assets/stylesheets/scholarspace/components/_header.scss

@@ -423,25 +423,25 @@ header {
 
         .input-group {
           margin-bottom: 0;
+          width: 32vw;
+
+          @media (max-width: 870px) {
+            width: 22vw;
+          }
+
+          @media (max-width: $mobile-breakpoint) {
+            width: 50vw;
+          }
         }
       }
 
       #search-field-header {
         height: unset;
-        width: 25vw;
         border-top-left-radius: 4px;
         border-bottom-left-radius: 4px;
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
         padding: calc(0.3rem + 4px) 0.75rem;
-
-        @media (max-width: 870px) {
-          width: 15vw;
-        }
-
-        @media (max-width: $mobile-breakpoint) {
-          width: 45vw;
-        }
       }
 
       #search-submit-header {

app/assets/stylesheets/scholarspace/components/_static-page.scss

@@ -78,3 +78,43 @@
       width: 10em;
     }
   }
+
+  //login page
+  .login-container {
+    &.main-login {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .login-box-container {
+        width: min-content;
+        margin-bottom: 1rem;
+        padding: 1rem;
+
+        #user_email,
+        #user_password {
+            color: $gw-dark-blue;
+        }
+    }
+
+    p.or {
+        margin: 1rem 0;
+    }
+
+    .reset-actions {
+        margin-bottom: 1rem;
+    }
+
+    .login-return a {
+        text-decoration: underline;
+    }
+
+    @media (max-width: $mobile-max) {
+
+        .login-box-container {
+            margin-bottom: 2rem;
+        }
+    }
+  }

app/views/advanced/index.html.erb

@@ -1,9 +1,10 @@
+<% provide :page_title, "More Search Options" %>
+
 <% content_for(:body_attributes) do %>
   data-turbolinks="false"
 <% end %>
 
 <div class="section-advanced">
-  <% @page_title = "More Search Options - #{application_name}" %>
 
   <div class="advanced-search-form content-container">
     <div class="header-container">

app/views/catalog/_search_form.html.erb

@@ -10,7 +10,7 @@
           <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
-            <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
+            <span aria-hidden="true" data-search-element="label"><%= t("hyrax.search.form.option.all.label_short") %></span>
             <span class="caret"></span>
           </button>
 

app/views/catalog/index.html.erb

@@ -1,3 +1,4 @@
+<% provide :page_title, "Search Results" %>
 <div class="container">
   <div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
       <%= render 'search_results' %>

app/views/devise/passwords/new.html.erb

@@ -1,5 +1,6 @@
+<% provide :page_title, "Forgot your password?" %>
 <div class="login-container">
-    <h2>Forgot your password?</h2>
+    <h1>Forgot your password?</h1>
 
     <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
     <%= render "devise/shared/error_messages", resource: resource %>
@@ -9,10 +10,14 @@
         <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
     </div>
 
-    <div class="actions">
+    <div class="actions reset-actions">
         <%= f.submit "Send me password reset instructions" %>
     </div>
     <% end %>
 
-    <%= render "devise/shared/links" %>
+    <div class="login-return">
+        <%= link_to main_app.new_user_session_path, aria: current_page?(main_app.new_user_session_path) ? {current: 'page'} : nil do %>
+            <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> Return to staff login page
+        <% end %>
+    </div>
 </div>

app/views/devise/sessions/new.html.erb

@@ -1,28 +1,35 @@
-<div class="login-container">
-    <h2>Log in</h2>
-
-    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-    <div class="field">
-        <p><%= f.label :email %></p>
-        <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-    </div>
+<% provide :page_title, "Staff Login" %>
+<div class="login-container main-login">
+    <h1>Staff Login</h1>
+    <%= render "devise/shared/links" %>
+    <p class="or">or:</p>
 
-    <div class="field">
-        <p><%= f.label :password %></p>
-        <p><%= f.password_field :password, autocomplete: "current-password" %></p>
-    </div>
+    <div class="login-box-container section-gw-darkblue">
+        <h2 class="h2-section-header">Log In</h2>
+        <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+        <div class="field">
+            <p><%= f.label :email %></p>
+            <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+        </div>
 
-    <% if devise_mapping.rememberable? %>
-        <div class="field" id="remember-me">
-        <p><%= f.check_box :remember_me %></p>
-        <p><%= f.label :remember_me %></p>
+        <div class="field">
+            <p><%= f.label :password %></p>
+            <p><%= f.password_field :password, autocomplete: "current-password" %></p>
         </div>
-    <% end %>
 
-    <div class="actions">
-        <%= f.submit "Log in" %>
+        <% if devise_mapping.rememberable? %>
+            <div class="field" id="remember-me">
+            <p><%= f.check_box :remember_me %></p>
+            <p><%= f.label :remember_me %></p>
+            </div>
+        <% end %>
+
+        <div class="actions">
+            <%= f.submit "Log in" %>
+            <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+                <p><%= link_to "Forgot your password?", new_password_path(resource_name) %></p>
+            <% end %>
+        </div>
     </div>
     <% end %>
-
-    <%= render "devise/shared/links" %>
 </div>

app/views/devise/shared/_links.html.erb

@@ -0,0 +1,21 @@
+<%- if controller_name != 'sessions' %>
+  <p><%= link_to "Log in", new_session_path(resource_name), class: "btn-base gw-btn" %></p>
+<% end %>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <p><%= link_to "Sign up", new_registration_path(resource_name) %></p>
+<% end %>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <p><%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %></p>
+<% end %>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <p><%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %></p>
+<% end %>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <p><%= button_to "Sign in with SSO", omniauth_authorize_path(resource_name, provider), data: { turbo: false }, class: "btn-base gw-btn" %></p>
+  <% end %>
+<% end %>

app/views/hyrax/contact_form/new.html.erb

@@ -1,3 +1,5 @@
+<% provide :page_title, "Contact Form" %>
+
 <div class="container text-center">
   <h1 class="share-header-text">
       <%= t('hyrax.contact_form.header') %>

app/views/hyrax/my/_constraints.html.erb

@@ -3,7 +3,6 @@
     <div class="pull-right">
       <%= link_to start_over_path,
           class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" do %>
-          <span class="btn btn-sm btn-danger start-over"><span class="glyphicon glyphicon-remove"></span></span>
           <%= t('blacklight.search.start_over') %>
       <% end %>
     </div>

spec/fixtures/content_blocks/share_page.html

@@ -13,9 +13,9 @@ <h2 class="h2-section-header">Deposit an Electronic Thesis or Dissertation</h2>
             </div>
         </div>
         <div class="deposit-etc">
-            <h2 class="h2-section-header">Deposit any other scholarship or research</h2>
+            <h2 class="h2-section-header">Deposit Your Work</h2>
             <div class="text-center">
-                <p>To deposit any other type of work, please use:</p>
+                <p>To deposit your work, please use:</p>
                 <p><a class="btn-base gw-btn" href="https://docs.google.com/forms/d/e/1FAIpQLSfasnzb2NjLsw7YRBvEJcw1GCfSsY6DVqvF3sdKlWs2uvEP2w/viewform">The GW ScholarSpace Deposit Form</a></p>
             </div>
         </div>