From 5d48741019ff31a373ef0a8d8fe234d8d215c81e Mon Sep 17 00:00:00 2001
From: braydonjustice <braydonjustice@gmail.com>
Date: Wed, 27 Nov 2024 23:27:08 -0800
Subject: [PATCH 1/3] Changed pages save button to 'submit' type to stop
 simpleform from injecting classes into the button. Fixes button color being
 white instead fo blue.

---
 app/views/hyrax/pages/_form.html.erb | 96 ++++++++++++++++++++++++++++
 config/locales/hyrax.en.yml          |  1 +
 2 files changed, 97 insertions(+)
 create mode 100644 app/views/hyrax/pages/_form.html.erb

diff --git a/app/views/hyrax/pages/_form.html.erb b/app/views/hyrax/pages/_form.html.erb
new file mode 100644
index 000000000..1044dd37c
--- /dev/null
+++ b/app/views/hyrax/pages/_form.html.erb
@@ -0,0 +1,96 @@
+<%# Copied from Hyrax v5.0.1 to correct button coloring since simpleform overrides hyku classes. %>
+<%= render "shared/nav_safety_modal" %>
+<div class="card tabs">
+
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="nav-item" role="presentation">
+      <a href="#about" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.about_page') %>
+      </a>
+    </li>
+    <li class="nav-item" role="presentation">
+      <a href="#help" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.help_page') %>
+      </a>
+    </li>
+    <li class="nav-item" role="presentation">
+      <a href="#agreement" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.agreement_page') %>
+      </a>
+    </li>
+    <li class="nav-item" role="presentation">
+      <a href="#terms" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.terms_page') %>
+      </a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div id="about" class="tab-pane show active">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+              <%= f.label :about %><br />
+              <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div id="help" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+              <%= f.label :help %><br />
+              <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div id="agreement" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+              <%= f.label :agreement %><br />
+              <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div id="terms" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+              <%= f.label :terms %><br />
+              <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+</div>
+<%= tinymce :content_block %>
\ No newline at end of file
diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml
index c18a64c8f..8def5a040 100644
--- a/config/locales/hyrax.en.yml
+++ b/config/locales/hyrax.en.yml
@@ -942,6 +942,7 @@ en:
       change_tab_message: Are you sure you want to leave this tab?  Any unsaved data will be lost.
     pages:
       cancel: Cancel
+      update: Save changes
       tabs:
         about_page: About Page
         agreement_page: Deposit Agreement

From 7a50d1bdd85ae8ff0ed7e0961ac813eb2b2afeb3 Mon Sep 17 00:00:00 2001
From: Braydon Justice <sephirothkod@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:43:54 -0800
Subject: [PATCH 2/3] Add OVERRIDE comments

Co-authored-by: Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com>
---
 app/views/hyrax/pages/_form.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/hyrax/pages/_form.html.erb b/app/views/hyrax/pages/_form.html.erb
index 1044dd37c..76b6b3d1a 100644
--- a/app/views/hyrax/pages/_form.html.erb
+++ b/app/views/hyrax/pages/_form.html.erb
@@ -1,4 +1,4 @@
-<%# Copied from Hyrax v5.0.1 to correct button coloring since simpleform overrides hyku classes. %>
+<%# OVERRIDE from Hyrax v5.0.1 to correct button coloring since simpleform overrides hyku classes. %>
 <%= render "shared/nav_safety_modal" %>
 <div class="card tabs">
 
@@ -52,7 +52,7 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
@@ -68,7 +68,7 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
@@ -84,7 +84,7 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>

From eb21c2eec88f92fb9d80f58f472ee0709eb6e520 Mon Sep 17 00:00:00 2001
From: Braydon Justice <sephirothkod@users.noreply.github.com>
Date: Fri, 6 Dec 2024 16:42:13 -0800
Subject: [PATCH 3/3] seperated override comments

---
 app/views/hyrax/pages/_form.html.erb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/hyrax/pages/_form.html.erb b/app/views/hyrax/pages/_form.html.erb
index 76b6b3d1a..065afa96a 100644
--- a/app/views/hyrax/pages/_form.html.erb
+++ b/app/views/hyrax/pages/_form.html.erb
@@ -36,6 +36,7 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
+            <%# OVERRIDE change button to submit %>
             <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
@@ -52,7 +53,8 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
+            <%# OVERRIDE change button to submit %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
@@ -68,7 +70,8 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
+            <%# OVERRIDE change button to submit %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
@@ -84,7 +87,8 @@
             </div>
           </div>
           <div class="card-footer d-flex justify-content-end">
-            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' # OVERRIDE button to submit %>
+            <%# OVERRIDE change button to submit %>
+            <%= f.submit t(:'hyrax.pages.update'), class: 'btn btn-primary text-white mr-2' %>
             <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
@@ -93,4 +97,4 @@
   </div>
 
 </div>
-<%= tinymce :content_block %>
\ No newline at end of file
+<%= tinymce :content_block %>