Merge branch 'main' into fix-Links-on-New-User-Collection-page-to-not-meet-WCAG-AA-minimum-color-contrast-requirements

Author: rodyoukai

app/assets/javascripts/hyrax/collapse.js

@@ -40,10 +40,10 @@ function getStatusActivity(){
     }
     else if(isCollapsed){
         resultDiv.classList.remove("in");
-        resultDiv.setAttribute("aria-expanded", "false");
+        // resultDiv.setAttribute("aria-expanded", "false");
     }else{
         resultDiv.classList.add("in");
-        resultDiv.setAttribute("aria-expanded", "true");
+        // resultDiv.setAttribute("aria-expanded", "true");
     }
 }
 
@@ -55,10 +55,10 @@ function getStatusSettings(){
     }
     else if(isCollapsed){
         resultDiv.classList.remove("in");
-        resultDiv.setAttribute("aria-expanded", "false");
+        // resultDiv.setAttribute("aria-expanded", "false");
     }else{
         resultDiv.classList.add("in");
-        resultDiv.setAttribute("aria-expanded", "true");
+        // resultDiv.setAttribute("aria-expanded", "true");
     }
 }
 

app/assets/stylesheets/hyrax/_styles.scss

@@ -72,3 +72,7 @@ label.disabled {
     margin-bottom: 1rem;
   }
 }
+
+#content_block_page {
+  display: block;
+}

app/views/hyrax/admin/features/index.html.erb

@@ -9,7 +9,7 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th></th>
+                <th>Status</th>
                 <th class="name"><%= t('.feature') %></th>
                 <th class="description"><%= t('.description') %></th>
                 <th class="action"><%= t('.action') %></th>

app/views/hyrax/content_blocks/_form.html.erb

@@ -29,7 +29,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -45,7 +45,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -61,7 +61,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>

app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

app/views/hyrax/pages/_form.html.erb

@@ -36,7 +36,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -52,7 +52,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -68,7 +68,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -84,7 +84,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>