bible270 1.8.0 → 1.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1 -0
- data/app/controllers/bible270/readers_controller.rb +1 -0
- data/app/views/bible270/admin/show.html.erb +22 -21
- data/app/views/bible270/profiles/edit.html.erb +1 -0
- data/app/views/bible270/readers/index.html.erb +1 -1
- data/app/views/bible270/readers/progress.html.erb +1 -1
- data/app/views/bible270/readers/show.html.erb +1 -1
- data/app/views/bible270/shared/_day_index.html.erb +2 -2
- data/app/views/bible270/shared/_reflections.html.erb +5 -1
- data/app/views/layouts/bible270/application.html.erb +1 -1
- data/lib/bible270/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d8847a6c76ffa4c376eba0f756941756b7bee81ef73006db8eed81dcc536243c
|
|
4
|
+
data.tar.gz: af808d62015dcae17eb0be8811f20d3f2363854f34416f6e431b55737be34c2d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0b7794ad79750aa7c6111ffd5662780501690144b675bef3cf6e74cfac042c5e74f0b21ebac9c24bdf582001605db82a4d3d2bbf79f88220478d1ccee828ae1d
|
|
7
|
+
data.tar.gz: 29ed3d365cdf2dbe514a900d33bbf2db1a100270c8edf5db274f89496f3e29960acd1973f2484c71e7225beb27ca0f702bbedf7d17408ccba5ad1ea1f6c2b1b6
|
data/CHANGELOG.md
CHANGED
|
@@ -12,6 +12,7 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
|
|
|
12
12
|
|
|
13
13
|
### Changed
|
|
14
14
|
|
|
15
|
+
- shorten the Community introduction and link signed-in readers to today's Day, make recent reflections editable from My Progress, expand the 270-day grids by default on reader and Profile pages, and move Admin completions below translation settings
|
|
15
16
|
- link reader email addresses directly to email composition and link recent-activity day labels to their Day pages with passage tooltips in Admin
|
|
16
17
|
- include each reader's last reading-activity date in the `bible270:readers:list` and Admin Reader Stats reports
|
|
17
18
|
|
|
@@ -6,6 +6,7 @@ module Bible270
|
|
|
6
6
|
# Community is a directory of fellow readers, not a leaderboard. Keep the
|
|
7
7
|
# order predictable without implying that progress determines standing.
|
|
8
8
|
@readers = Reader.all.to_a.sort_by(&:sort_name)
|
|
9
|
+
@today_day = current_reader&.today_day
|
|
9
10
|
@show_admin_progress = Bible270.config.admin?(current_reader)
|
|
10
11
|
@days_completed = Reader.completed_days_by_id if @show_admin_progress
|
|
11
12
|
end
|
|
@@ -113,27 +113,6 @@
|
|
|
113
113
|
numbers and are not touched.</p>
|
|
114
114
|
</div>
|
|
115
115
|
|
|
116
|
-
<div class="b270-panel">
|
|
117
|
-
<h2 class="b270-subhead">Completions</h2>
|
|
118
|
-
<%= form_with url: admin_reader_through_path(@reader), method: :patch, class: "b270-startform" do %>
|
|
119
|
-
<label class="b270-field">
|
|
120
|
-
<span>Mark complete through day (0 clears everything)</span>
|
|
121
|
-
<%= number_field_tag :day, @days_completed, min: 0, max: Bible270::Plan::DAYS %>
|
|
122
|
-
</label>
|
|
123
|
-
<%= submit_tag 'Apply', class: 'b270-btn' %>
|
|
124
|
-
<% end %>
|
|
125
|
-
<p class="b270-hint">This also clears anything after that day, so it sets their progress exactly.</p>
|
|
126
|
-
|
|
127
|
-
<div class="b270-grid" style="margin-top:16px">
|
|
128
|
-
<% (1..Bible270::Plan::DAYS).each do |d| %>
|
|
129
|
-
<%= button_to d, admin_reader_day_path(@reader, d), method: :post,
|
|
130
|
-
class: b270_day_cell_classes(d, reader: @reader),
|
|
131
|
-
title: b270_day_readings(d),
|
|
132
|
-
form: { style: 'display:contents', id: "day-#{d}" } %>
|
|
133
|
-
<% end %>
|
|
134
|
-
</div>
|
|
135
|
-
<p class="b270-hint">Click a day to toggle it complete.</p>
|
|
136
|
-
</div>
|
|
137
116
|
|
|
138
117
|
<div class="b270-panel">
|
|
139
118
|
<%= render "bible270/shared/reflections", comments: @comments, moderate: true %>
|
|
@@ -162,6 +141,28 @@
|
|
|
162
141
|
<% end %>
|
|
163
142
|
</div>
|
|
164
143
|
|
|
144
|
+
<div class="b270-panel">
|
|
145
|
+
<h2 class="b270-subhead">Completions</h2>
|
|
146
|
+
<%= form_with url: admin_reader_through_path(@reader), method: :patch, class: "b270-startform" do %>
|
|
147
|
+
<label class="b270-field">
|
|
148
|
+
<span>Mark complete through day (0 clears everything)</span>
|
|
149
|
+
<%= number_field_tag :day, @days_completed, min: 0, max: Bible270::Plan::DAYS %>
|
|
150
|
+
</label>
|
|
151
|
+
<%= submit_tag 'Apply', class: 'b270-btn' %>
|
|
152
|
+
<% end %>
|
|
153
|
+
<p class="b270-hint">This also clears anything after that day, so it sets their progress exactly.</p>
|
|
154
|
+
|
|
155
|
+
<div class="b270-grid" style="margin-top:16px">
|
|
156
|
+
<% (1..Bible270::Plan::DAYS).each do |d| %>
|
|
157
|
+
<%= button_to d, admin_reader_day_path(@reader, d), method: :post,
|
|
158
|
+
class: b270_day_cell_classes(d, reader: @reader),
|
|
159
|
+
title: b270_day_readings(d),
|
|
160
|
+
form: { style: 'display:contents', id: "day-#{d}" } %>
|
|
161
|
+
<% end %>
|
|
162
|
+
</div>
|
|
163
|
+
<p class="b270-hint">Click a day to toggle it complete.</p>
|
|
164
|
+
</div>
|
|
165
|
+
|
|
165
166
|
<div class="b270-panel">
|
|
166
167
|
<h2 class="b270-subhead">Remove</h2>
|
|
167
168
|
<p class="b270-hint" style="margin-top:0">Deletes the reader together with every check-off and
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<% content_for :title, "Community — #{Bible270.config.app_name}" %>
|
|
2
2
|
<p class="b270-eyebrow">Community</p>
|
|
3
3
|
<h1>Reading together</h1>
|
|
4
|
-
<p class="lede">
|
|
4
|
+
<p class="lede">Walking through the Word, sharing reflections and encouraging one another.<% if @today_day %> <%= link_to "Go to today (Day #{@today_day})", day_path(@today_day), class: "b270-todaylink" %><% end %></p>
|
|
5
5
|
|
|
6
6
|
<% if @readers.any? %>
|
|
7
7
|
<div class="b270-list">
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
<% if @reader %>
|
|
14
14
|
<div class="b270-panel">
|
|
15
15
|
<%= render "bible270/shared/reflections", comments: @recent_comments,
|
|
16
|
-
title: "Your recent reflections",
|
|
16
|
+
title: "Your recent reflections", editable: true,
|
|
17
17
|
empty_text: "You have not written any reflections yet." %>
|
|
18
18
|
</div>
|
|
19
19
|
<% end %>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
<%# locals: (reader: nil) %>
|
|
1
|
+
<%# locals: (reader: nil, expanded: false) %>
|
|
2
2
|
<% if Bible270::Plan::DAYS.positive? %>
|
|
3
3
|
<% grid_reader = reader || current_reader %>
|
|
4
4
|
<% today = signed_in? && grid_reader == current_reader ? current_reader.today_day : nil %>
|
|
5
|
-
<details class="b270-index"
|
|
5
|
+
<details class="b270-index"<%= " open" if expanded %>>
|
|
6
6
|
<summary>View all <%= Bible270::Plan::DAYS %> days</summary>
|
|
7
7
|
<div class="b270-grid">
|
|
8
8
|
<% (1..Bible270::Plan::DAYS).each do |d| %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<%# locals: (comments:, title: "Their reflections", moderate: false, empty_text: "None yet.") %>
|
|
1
|
+
<%# locals: (comments:, title: "Their reflections", moderate: false, editable: false, empty_text: "None yet.") %>
|
|
2
2
|
<%#
|
|
3
3
|
A reader's reflections. Three views showed near-identical markup: the admin
|
|
4
4
|
page, a reader's public page, and the progress page, differing only in whether
|
|
@@ -21,6 +21,10 @@
|
|
|
21
21
|
<%= link_to "Day #{comment.day}", day_path(comment.day) %>
|
|
22
22
|
· <%= b270_date(comment.created_at) %>
|
|
23
23
|
<% if moderate && comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
|
|
24
|
+
<% if editable && b270_can_edit?(comment) %>
|
|
25
|
+
<%= link_to "edit", day_path(comment.day, edit: comment.id, anchor: "comment-#{comment.id}"),
|
|
26
|
+
class: "b270-cedit" %>
|
|
27
|
+
<% end %>
|
|
24
28
|
</div>
|
|
25
29
|
|
|
26
30
|
<div class="b270-cbody"><%= b270_comment_body(comment) %></div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<% if flash[:notice] %><div class="b270-flash notice"><%= flash[:notice] %></div><% end %>
|
|
21
21
|
<%= yield %>
|
|
22
22
|
<%# Pages with their own day grid opt out with content_for :hide_day_index %>
|
|
23
|
-
<%= render 'bible270/shared/day_index' unless content_for?(:hide_day_index) %>
|
|
23
|
+
<%= render 'bible270/shared/day_index', expanded: content_for?(:expand_day_index) unless content_for?(:hide_day_index) %>
|
|
24
24
|
<%= b270_footer %>
|
|
25
25
|
</div>
|
|
26
26
|
<%= render "bible270/shared/scripture_popups" %>
|
data/lib/bible270/version.rb
CHANGED