rewrite css and restricted login message

Author: anarchivist

app/assets/stylesheets/includes/main.scss

@@ -226,7 +226,7 @@ section {
       }
     }
 
-    a, button.calnet_login {
+    a {
       &:hover {
         box-shadow: inset 0 -4px 0 $color-anchor-highlight;
       }
@@ -257,23 +257,26 @@ section {
   }
 
   &.restricted {
-    form {
-      button.calnet_login {
-        box-shadow: inset 0 -4pxq 0 $color-anchor-highlight;
+    form.auth {
+      margin-right: auto;
+      margin-bottom: 0.25rem;
 
-        &:hover {
-          background: $color-anchor-highlight;
-          border: 1px solid $color-anchor-highlight;
+      div.access_methods {
+        button.calnet_login {
+          box-shadow: inset 0 -4px 0 $color-anchor-highlight;
+
+          &:hover {
+            background: $color-anchor-highlight;
+            border: 1px solid $color-anchor-highlight;
+          }
         }
-      }
-    }
-    p {
-      a {
-        box-shadow: inset 0 -4px 0 $color-anchor-highlight;
+        a {
+          box-shadow: inset 0 -4px 0 $color-anchor-highlight;
 
-        &:hover {
-          background: $color-anchor-highlight;
-          border: 1px solid $color-anchor-highlight;
+          &:hover {
+            background: $color-anchor-highlight;
+            border: 1px solid $color-anchor-highlight;
+          }
         }
       }
     }
@@ -412,9 +415,8 @@ span {
 button.calnet_login {
   background: inherit;
   margin: inherit;
-  border: none;
-  line-height: inherit;
-  font-family: inherit;
-  font-size: inherit;
-  text-decoration: inherit;
+  padding: inherit;
+  border: inherit;
+  font: inherit;
+  display: inline;
 }

app/helpers/application_helper.rb

@@ -9,10 +9,14 @@ def logout_link(text = 'CalNet Logout')
 
   def login_link(text = 'CalNet Login')
     form_tag('/auth/calnet', url: request.original_url, method: 'post', data: { turbo: false }) do
-      button_tag text, class: 'calnet_login'
+      login_button text
     end
   end
 
+  def login_button(text = 'CalNet Login')
+    button_tag text, class: 'calnet_login', role: 'link'
+  end
+
   def vpn_link
     link_to('use the bSecure VPN', 'https://www.lib.berkeley.edu/using-the-libraries/vpn')
   end

app/views/player/access_restricted.erb

@@ -2,19 +2,21 @@
 <%
   calnet_only = record&.calnet_only?
   access_methods = [].tap do |mm|
-    mm << login_link('Log in with CalNet') unless authenticated?
+    mm << login_button('log in with CalNet') unless authenticated?
     mm << vpn_link unless calnet_only || ucb_request?
   end
 %>
 <section class="record restricted">
   <h1>Access to this record is restricted</h1>
 
-  <p>
+  <%= form_tag('/auth/calnet', url: request.original_url, method: 'post', data: { turbo: false }, class: 'auth') do %>
+  <div class="access_methods">
     The specified record is available to UC Berkeley users only.
     <% unless access_methods.empty? # should never happen %>
       For full access, <%= access_methods.join(', or ').html_safe %>.
     <% end %>
-  </p>
+  </div>
+  <% end %>
 
   <table>
     <thead>

config/routes.rb

@@ -3,7 +3,6 @@
 
   # Omniauth automatically handles requests to /auth/:provider. We need only
   # implement the callback.
-  get '/login', to: 'sessions#new', as: :login
   get '/logout', to: 'sessions#destroy', as: :logout
   get '/auth/:provider/callback', to: 'sessions#callback', as: :omniauth_callback
   get '/auth/failure', to: 'sessions#failure'

spec/support/authz_shared_examples.rb

@@ -27,7 +27,7 @@
     expect(page).to have_content(collection)
     expect(page).to have_content(record_id)
 
-    show_url = player_url(collection:, record_id:)
+    # show_url = player_url(collection:, record_id:)
     expect(page).to have_css('button.calnet_login')
   end
 end