bible270 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fc7b160b27ec7e20797964b1e7a61244f85b2475ba61e5b8b16e0bfb48c491
-  data.tar.gz: df5de443f785eed07c04db5efdbee1184a0dc39cbf2862a6feec79c3bb83fb3d
+  metadata.gz: b91b3cab89c11a366f5530e56caa8342c99352854eff8245447d96ce3a2727de
+  data.tar.gz: 29cf150387757a35d5b46d7ef80a0dd01080162ac57d7847efdba52174cc0e13
 SHA512:
-  metadata.gz: 047001d13b3e85efb775b5abcb63431ce22bf02e0a6e853b4cf63bcf472e5ea5d2e6d95f2af56d8a0004275d343aeaea4c13df1d54d1ae49d7145f79e16d55b8
-  data.tar.gz: 06aa22e9592f1603f1136babc07b29657c3190f874d645f4e89deb66b0895e200fb155560f0cb628caa79e3c3fac1c8d2d40997e3a5ed6f18998b519fe13e3d0
+  metadata.gz: 4e7cf3647cecdde9ca4f5d692ea52bab1d0d711611ff05fcb0a93f5ddca161a0f9f1e3f4485b3cc94bd444181cbb5b2c04d1da71c8f53d57b28c230a71249180
+  data.tar.gz: d65529ce89abd4b8415e661468d898f06dfa7421fae5821038d96466326ac7018c1f6cc4bb9a60c0542ee1e8e1d64eeb3787473935eb99fec2a9f64582691ff5

data/README.md

@@ -272,6 +272,8 @@ Admins get an extra "Admin" link in the header. The broadcast form can send an i
 message either to every reader with an email address or only to readers recognized as administrators.
 From a reader's page you can:
 
+- **set their theme** — Parchment, Earth, Forest, Midnight, or System, independently of your own theme;
+
 - **move them to a day** — "put them on day 42 as of today" back-dates the start date; check-offs are
   keyed to day numbers, so nothing in their history moves;
 - **set their progress** — mark complete through day N (this also clears anything after, so it sets

data/app/controllers/bible270/admin_controller.rb

@@ -22,7 +22,7 @@ module Bible270
 
     before_action :require_admin!
     before_action :load_reader,
-                  only: %i[show destroy update_start update_profile update_notifications update_completion_animation
+                  only: %i[show destroy update_start update_profile update_theme update_notifications update_completion_animation
                            remove_avatar complete_through toggle_day]
     before_action :load_comment, only: %i[hide_comment unhide_comment destroy_comment]
 
@@ -248,6 +248,22 @@ module Bible270
       end
     end
 
+    def update_theme
+      unless Reader.display_mode_column?
+        return redirect_to admin_reader_path(@reader),
+                           alert: 'Run the pending Bible270 database migration before changing the theme.'
+      end
+
+      mode = params[:display_mode].to_s
+      unless Reader::DISPLAY_MODES.include?(mode)
+        return redirect_to admin_reader_path(@reader), alert: 'Choose a theme from the list.'
+      end
+
+      @reader.reload unless @reader.has_attribute?(:display_mode)
+      @reader.update!(display_mode: mode)
+      redirect_to admin_reader_path(@reader), notice: 'Theme updated.'
+    end
+
     def update_notifications
       unless Bible270.config.mention_notifications
         return redirect_to admin_reader_path(@reader), alert: 'Reflection emails are disabled for this installation.'

data/app/helpers/bible270/plan_helper.rb

@@ -182,12 +182,16 @@ module Bible270
       local&.strftime('%b %-d, %Y at %-I:%M %p')
     end
 
+    def b270_activity_datetime(time)
+      local = Bible270.local_time(time)
+      local&.strftime('%b %-d, %Y %H:%M')
+    end
+
     def b270_reader_activity_description(activity)
       day_link = link_to "Day #{activity.day}", day_path(activity.day), title: b270_day_readings(activity.day)
 
       if activity.day_completed?
-        readings = Plan.readings_for(activity.day).values.compact.join(', ')
-        safe_join(['completed ', day_link, " (#{readings})"])
+        safe_join(['completed ', day_link])
       else
         reference = Plan.parts_for(activity.day, activity.track).fetch(activity.part)
         safe_join(["checked off “#{reference}” for ", day_link])

data/app/views/bible270/admin/index.html.erb

@@ -96,7 +96,7 @@
           </div>
           <div class="sub b270-reader-activity">
             <% if (activity = @recent_reader_activities[reader.id]) %>
-              <%= b270_date(activity.occurred_at) %>: <%= b270_reader_activity_description(activity) %>
+              <%= b270_activity_datetime(activity.occurred_at) %>: <%= b270_reader_activity_description(activity) %>
             <% else %>
               No reading activity yet
             <% end %>

data/app/views/bible270/admin/show.html.erb

@@ -3,7 +3,7 @@
 <p class="b270-eyebrow"><%= link_to 'Admin', admin_path %></p>
 <h1><%= @reader.display_name %></h1>
 <p class="lede">
-  <%= @reader.email.presence || @reader.provider %> ·
+  <%= @reader.email.present? ? mail_to(@reader.email) : @reader.provider %> ·
   <%= @days_completed %> of <%= Bible270::Plan::DAYS %> days ·
   <%= @reader.completion_percent %>%
   <% if @reader.today_day %>· day <%= @reader.today_day %> today
@@ -18,13 +18,19 @@
     <div class="b270-avatarrow">
       <%= b270_avatar(@reader, size: 72, loading: 'eager') %>
       <% if Bible270::Reader.avatar_uploads? %>
-        <label class="b270-field" style="flex:1">
-          <span>Picture</span>
-          <%= file_field_tag :avatar, accept: Bible270::Avatars.content_types.join(',') %>
-          <span class="b270-hint" style="margin:0">
-            PNG, JPEG, GIF or WebP, up to <%= Bible270::Avatars.human_size(Bible270::Avatars.max_bytes) %>.
-          </span>
-        </label>
+        <div class="b270-avatarcontrols" style="flex:1;min-width:0">
+          <label class="b270-field">
+            <span>Picture</span>
+            <%= file_field_tag :avatar, accept: Bible270::Avatars.content_types.join(',') %>
+            <span class="b270-hint" style="margin:0">
+              PNG, JPEG, GIF or WebP, up to <%= Bible270::Avatars.human_size(Bible270::Avatars.max_bytes) %>.
+            </span>
+          </label>
+          <% if @reader.avatar_uploaded? %>
+            <%= button_tag "Remove picture", type: "submit", class: "b270-linkbtn",
+                  form: "b270-remove-picture" %>
+          <% end %>
+        </div>
       <% end %>
     </div>
 
@@ -40,9 +46,54 @@
   <% end %>
 
   <% if @reader.avatar_uploaded? %>
-    <%= button_to "Remove picture", admin_reader_avatar_path(@reader), method: :delete,
-          class: 'b270-linkbtn',
-          form: { data: { turbo_confirm: "Remove #{@reader.display_name}'s picture?" } } %>
+    <%# Keep picture removal separate from unsaved name and upload changes. %>
+    <%= form_with url: admin_reader_avatar_path(@reader), method: :delete,
+          html: { id: "b270-remove-picture", hidden: true },
+          data: { turbo_confirm: "Remove #{@reader.display_name}'s picture?" } do %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="b270-panel">
+  <h2 class="b270-subhead">Which translation they read</h2>
+  <p class="b270-hint" style="margin-top:0">
+    Reading links open in this translation.
+    <% if @reader.bible_version.blank? %>
+      They have expressed no preference, so they follow the site default
+      (<%= Bible270.config.bible_version %>).
+    <% end %>
+  </p>
+
+  <%= form_with url: admin_reader_version_path(@reader), method: :patch, class: "b270-form" do %>
+    <div class="row">
+      <%= select_tag :bible_version,
+            options_for_select([["Site default (#{Bible270.config.bible_version})", ""]] +
+                               Bible270::Translations.options,
+                               @reader.bible_version.to_s),
+            class: "b270-select", style: "width:auto" %>
+    </div>
+    <%= render "bible270/shared/passage_source", reader: @reader %>
+    <%= submit_tag "Save", class: "b270-btn" %>
+  <% end %>
+</div>
+
+<div class="b270-panel">
+  <h2 class="b270-subhead" id="b270-theme-heading">Theme</h2>
+  <% if Bible270::Reader.display_mode_column? %>
+    <%= form_with url: admin_reader_theme_path(@reader), method: :patch, class: "b270-emailform" do %>
+      <%= select_tag :display_mode,
+            options_for_select([["Parchment", "light"], ["Earth", "dark"], ["Forest", "dark_green"],
+                                ["Midnight", "dark_blue"], ["System", "system"]], @reader.effective_display_mode),
+            class: "b270-select", aria: { labelledby: "b270-theme-heading", describedby: "b270-theme-hint" } %>
+      <p id="b270-theme-hint" class="b270-hint" style="margin:0">
+        System follows the reader's device setting: Parchment for light, Earth for dark.
+      </p>
+      <%= submit_tag "Save", class: "b270-btn" %>
+    <% end %>
+  <% else %>
+    <p class="b270-flash alert" style="margin:0">
+      Run the pending Bible270 database migration before changing the theme.
+    </p>
   <% end %>
 </div>
 
@@ -119,28 +170,6 @@
   <%= render "bible270/shared/reflections", comments: @comments, moderate: true, editable: true, actions: true %>
 </div>
 
-<div class="b270-panel">
-  <h2 class="b270-subhead">Which translation they read</h2>
-  <p class="b270-hint" style="margin-top:0">
-    Reading links open in this translation.
-    <% if @reader.bible_version.blank? %>
-      They have expressed no preference, so they follow the site default
-      (<%= Bible270.config.bible_version %>).
-    <% end %>
-  </p>
-
-  <%= form_with url: admin_reader_version_path(@reader), method: :patch, class: "b270-form" do %>
-    <div class="row">
-      <%= select_tag :bible_version,
-            options_for_select([["Site default (#{Bible270.config.bible_version})", ""]] +
-                               Bible270::Translations.options,
-                               @reader.bible_version.to_s),
-            class: "b270-select", style: "width:auto" %>
-    </div>
-    <%= render "bible270/shared/passage_source", reader: @reader %>
-    <%= submit_tag "Save", class: "b270-btn" %>
-  <% end %>
-</div>
 
 <div class="b270-panel">
   <h2 class="b270-subhead">Completions</h2>

data/config/routes.rb

@@ -23,6 +23,7 @@ Bible270::Engine.routes.draw do
   get    'admin/readers/:id',            to: 'admin#show',             as: :admin_reader
   delete 'admin/readers/:id',            to: 'admin#destroy'
   patch  'admin/readers/:id/profile',    to: 'admin#update_profile', as: :admin_reader_profile
+  patch  'admin/readers/:id/theme', to: 'admin#update_theme', as: :admin_reader_theme
   patch  'admin/readers/:id/notifications', to: 'admin#update_notifications', as: :admin_reader_notifications
   patch  'admin/readers/:id/completion-animation', to: 'admin#update_completion_animation',
                                                    as: :admin_reader_completion_animation

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Andrew vonderLuft