Staging into main

Gemfile.lock

@@ -273,9 +273,9 @@ GEM
       net-protocol
     net-ssh (7.2.3)
     nio4r (2.7.3)
-    nokogiri (1.18.4-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     omniauth (2.1.3)
       hashie (>= 3.4.6)

app/mailers/application_mailer.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  prepend_view_path 'app/views/mailers'
-  default from: Rails.application.credentials.dig(:sendgrid, :mailer_sender),
-          reply_to: 'lsa-evaluate-support@umich.edu'
+  default from: "University of Michigan - LSA Evaluate <#{Rails.application.credentials.dig(:sendgrid, :mailer_sender)}>",
+          reply_to: 'LSA Evaluate Support <lsa-evaluate-support@umich.edu>'
+
   layout 'mailer'
+
+  before_action :attach_logo
+
+  private
+
+  def attach_logo
+    attachments.inline['U-M_Logo.svg'] = File.read(Rails.root.join('app/assets/images/U-M_Logo.svg'))
+  end
 end

app/views/containers/_container_detail.html.erb

@@ -9,7 +9,7 @@
           <div class="container-actions">
             <%= link_to edit_container_path(@container),
                         class: "btn btn-sm btn-outline-primary me-2" do %>
-              <i class="bi bi-pencil-square me-1"></i> Edit
+              <i class="bi bi-pencil-square me-1"></i> Edit Collection
             <% end %>
           </div>
         <% end %>

app/views/containers/_contest_descriptions_table.html.erb

@@ -28,14 +28,14 @@
           </td>
           <td><%= boolean_to_yes_no(description.active) %></td>
           <td class="text-center">
-            <div class="d-flex flex-column">
+            <div class="d-flex flex-row">
               <% contest_description_action_links(container, description).each do |action, config| %>
                 <%= link_to config[:path],
                       class: 'd-block',
                       data: config[:data]&.merge('bs-toggle': 'tooltip'),
                       title: config[:title],
                       aria: { label: config[:title] } do %>
-                  <i class="bi bi-<%= config[:icon] %>" style="font-size: 1.5rem;" aria-hidden="true"></i>
+                  <i class="bi bi-<%= config[:icon] %> fs-4 text-um-blue" aria-hidden="true"></i>
                   <span class="visually-hidden"><%= config[:title] %></span>
                 <% end %>
               <% end %>

app/views/containers/show.html.erb

@@ -25,7 +25,7 @@
   <%= render partial: "containers/assignments_table", locals: { container: @container, assignments: @assignments } %>
 <% end %>
 
-<h3 class="mt-4">Add New Permission</h3>
+<h4 class="mt-4">Add New Permission</h4>
 <%= turbo_frame_tag "new_assignment" do %>
   <%= render partial: 'containers/assignment_form', locals: { container: @container, assignment: @assignment } %>
 <% end %>

app/views/contest_instances/_judging_results.html.erb

@@ -15,9 +15,9 @@
                 @contest_instance,
                 round_id: round.id
               ),
-              class: "btn btn-sm btn-info me-3",
+              class: "btn btn-sm btn-outline-primary me-3",
               disabled: !round.complete? do %>
-              <i class="bi bi-envelope text-white"></i>
+              <i class="bi bi-envelope text-um-blue"></i>
               Email round <%= round.round_number %> results
             <% end %>
           </div>
@@ -28,7 +28,7 @@
                   data-bs-placement="top"
                   title="Number of times emails have been sent for this round">
               <i class="bi bi-envelope-check me-1"></i>
-              Emails sent: <%= round.emails_sent_count %> time<%= 's' if round.emails_sent_count > 1 %>
+              Emails sent: <%= pluralize(round.emails_sent_count, 'time') %>
             </span>
           <% end %>
         </div>

app/views/contest_instances/index.html.erb

@@ -27,8 +27,9 @@
   <%= @contest_description.notes %>
 </div>
 <div>
-  <%= link_to "Edit", edit_container_contest_description_path(@container, @contest_description), class: "btn btn-sm btn-primary" %>
-  <%= link_to "Archive", container_contest_description_path(@container, @contest_description), data: { controller: 'confirm', confirm_message_value: 'Are you sure you want to archive this?' } %>
+  <%= link_to edit_container_contest_description_path(@container, @contest_description), class: "btn btn-sm btn-outline-primary me-2" do %>
+  <i class="bi bi-pencil-square me-1"></i> Edit Contest
+  <% end %>
 </div>
 <hr>
 <h2><%= "#{pluralize(@contest_instances.count, "instance")} of this contest" %></h2>
@@ -110,21 +111,21 @@
               <td><%= contest_instance.require_campus_employment_info %></td>
               <td><%= contest_instance.require_finaid_info %></td>
               <td class="text-center">
-                <div class="d-flex flex-column">
+                <div class="d-flex flex-row">
                   <%= link_to container_contest_description_contest_instance_path(@container, @contest_description, contest_instance),
                         class: 'd-block',
                         data: { 'bs-toggle': 'tooltip' },
                         title: 'View instance',
                         aria: { label: 'View instance' } do %>
-                    <i class="bi bi-eye" style="font-size: 1.5rem;" aria-hidden="true"></i>
+                    <i class="bi bi-eye fs-4 text-um-blue" aria-hidden="true"></i>
                     <span class="visually-hidden">View instance</span>
                   <% end %>
                   <%= link_to edit_container_contest_description_contest_instance_path(@container, @contest_description, contest_instance),
                               class: 'd-block',
                               data: { 'bs-toggle': 'tooltip' },
                               title: 'Edit instance',
                               aria: { label: 'Edit instance' } do %>
-                    <i class="bi bi-pencil" style="font-size: 1.5rem;" aria-hidden="true"></i>
+                    <i class="bi bi-pencil fs-4 text-um-blue" aria-hidden="true"></i>
                     <span class="visually-hidden">Edit instance</span>
                   <% end %>
 

app/views/contest_instances/show.html.erb

@@ -21,7 +21,7 @@
     <div class="mb-2">
       <%= link_to edit_container_contest_description_contest_instance_path(@container, @contest_description, @contest_instance),
                   class: "btn btn-sm btn-outline-primary me-2" do %>
-        <i class="bi bi-pencil-square me-1"></i> Edit
+        <i class="bi bi-pencil-square me-1"></i> Edit Instance
       <% end %>
     </div>
   <% end %>

app/views/judging_rounds/edit.html.erb

@@ -70,6 +70,13 @@
         </div>
 
         <h3 class="mt-4">Comment Requirements</h3>
+        <div class="card mb-4">
+          <div class="card-body">
+            <% if (content = render_editable_content('judging_rounds', 'comment_interface_behavior')) %>
+              <%= content %>
+            <% end %>
+          </div>
+        </div>
         <div class="row">
           <div class="col-md-6">
             <div class="form-group">

app/views/judging_rounds/new.html.erb

@@ -52,6 +52,13 @@
         </div>
 
         <h3 class="mt-4">Comment Requirements</h3>
+        <div class="card mb-4">
+          <div class="card-body">
+            <% if (content = render_editable_content('judging_rounds', 'comment_interface_behavior')) %>
+              <%= content %>
+            <% end %>
+          </div>
+        </div>
         <div class="row">
           <div class="col-md-6">
             <div class="form-group">

app/views/layouts/mailer.html.erb

@@ -20,6 +20,9 @@
       }
       .logo {
         max-width: 150px;
+        width: 100px;
+        height: auto;
+        margin-bottom: 15px;
       }
       h1, h2, h3 {
         color: #1a5a96;
@@ -72,6 +75,19 @@
   </head>
 
   <body>
-    <%= yield %>
+    <div class="container">
+      <div class="header">
+        <h1 style="display: flex; align-items: center;"><%= image_tag attachments['U-M_Logo.svg'].url, alt: "University of Michigan Logo", class: "logo" %><span style="margin-left: 20px;">LSA Evaluate</span></h1>
+      </div>
+
+      <div class="content">
+        <%= yield %>
+      </div>
+
+      <div class="footer">
+        <p>This is an automated email. Please do not reply to this message.</p>
+        <p>&copy; <%= Time.now.year %> | <%= link_to 'The Regents of the University of Michigan', 'https://regents.umich.edu' %></p>
+      </div>
+    </div>
   </body>
 </html>

app/views/results_mailer/entry_evaluation_notification.html.erb

@@ -1,4 +1,4 @@
-<div class="container">
+<div>
   <div class="header">
     <h1><%= @contest_description.name %></h1>
   </div>
@@ -62,11 +62,6 @@
   <p>We value your creativity and hope you found this competition to be a rewarding experience. Your participation contributes to the vibrant artistic and academic community at our university.</p>
 
   <% if @contact_email.present? %>
-    <p>If you have any questions about the judging process or results, please contact <%= @contact_email %>.</p>
+    <p>If you have any questions about the judging process or results, please contact <%= mail_to @contact_email, @contact_email %>.</p>
   <% end %>
-
-  <div class="footer">
-    <p>This is an automated email. Please do not reply to this message.</p>
-    <p>&copy; <%= Time.now.year %> <%= @container.name %> | All Rights Reserved</p>
-  </div>
 </div>

db/seeds.rb

@@ -61,7 +61,9 @@
                           { page: "round_judge_assignments", section: "instructions",
                             content: ActionText::RichText.new(body: "Instructions for the round_judge_assignments") },
                           { page: "judging_assignments", section: "round_specific_instructions",
-                            content: ActionText::RichText.new(body: "Instructions for the round_specific_instructions") }
+                            content: ActionText::RichText.new(body: "Instructions for the round_specific_instructions") },
+                          { page: "judging_rounds", section: "comment_interface_behavior",
+                            content: ActionText::RichText.new(body: "Instructions for the comment_interface_behavior") }
                         ])
 
   # Seed data for School

test/mailers/previews/custom_devise_mailer_preview.rb

@@ -0,0 +1,11 @@
+class CustomDeviseMailerPreview < ActionMailer::Preview
+  def password_change
+    user = User.first || User.create!(
+      email: 'test@example.com',
+      password: 'password123',
+      first_name: 'Test',
+      last_name: 'User'
+    )
+    CustomDeviseMailer.password_change(user)
+  end
+end

test/mailers/previews/results_mailer_preview.rb

@@ -0,0 +1,60 @@
+class ResultsMailerPreview < ActionMailer::Preview
+  def entry_evaluation_notification
+    # Create sample data for preview
+    entry = Entry.first || create_sample_entry
+    round = JudgingRound.first || create_sample_round
+
+    ResultsMailer.entry_evaluation_notification(entry, round)
+  end
+
+  private
+
+  def create_sample_entry
+    Entry.create!(
+      title: "Sample Entry",
+      profile: Profile.first || create_sample_profile,
+      contest_instance: ContestInstance.first || create_sample_contest_instance
+    )
+  end
+
+  def create_sample_profile
+    Profile.create!(
+      user: User.first || create_sample_user
+    )
+  end
+
+  def create_sample_user
+    User.create!(
+      email: "sample@example.com",
+      password: "password123",
+      first_name: "Sample",
+      last_name: "User"
+    )
+  end
+
+  def create_sample_contest_instance
+    ContestInstance.create!(
+      contest_description: ContestDescription.first || create_sample_contest_description
+    )
+  end
+
+  def create_sample_contest_description
+    ContestDescription.create!(
+      name: "Sample Contest",
+      container: Container.first || create_sample_container
+    )
+  end
+
+  def create_sample_container
+    Container.create!(
+      name: "Sample Container",
+      contact_email: "contests@example.com"
+    )
+  end
+
+  def create_sample_round
+    JudgingRound.create!(
+      name: "Sample Round"
+    )
+  end
+end

test/mailers/previews/test_mailer_preview.rb

@@ -0,0 +1,5 @@
+class TestMailerPreview < ActionMailer::Preview
+  def test_email
+    TestMailer.test_email('test@example.com')
+  end
+end