Addition of M'Cheyne's readings, and rename of 'Reports' icon to 'Res…

…ources'
STEPBible · Sep 6, 2023 · f9ddbf5 · f9ddbf5
1 parent 72ef534
commit f9ddbf5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/step-core/src/main/resources/HtmlBundle.properties b/step-core/src/main/resources/HtmlBundle.properties
@@ -432,7 +432,7 @@ highlighted_for_related_text=Highlighted for related text
 original_color=Reset colors
 copy=Copy
 book_summary=Summary
-report=Reports
+report=Resources
 word_has_synonyms=This word has %d synonyms
 
 default_search=(default search)

diff --git a/step-web/src/main/webapp/html/mcheynes_readings.html b/step-web/src/main/webapp/html/mcheynes_readings.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>R. M. M'Cheyne's 1 or 3 Year Readings</title>
+    <title>R. M. M'Cheyne's 1, 2, or 3 Year Readings</title>
     <link href="/css/bootstrap.css" rel="stylesheet" media="screen"/>
     <link href="/css/bootstrap-theme.min.css" rel="stylesheet" media="screen"/>
     <link href="/css/cardo.css" rel="stylesheet" media="screen"/>
@@ -104,9 +104,9 @@
 </head>
 <body style="margin:0;background-color:white"">
 <div id="header">
-<h2 class="hTitle">R. M. M'Cheyne's 1 or 3 Year Readings</h2>
+<h2 class="hTitle">R. M. M'Cheyne's 1, 2, or 3 Year Readings</h2>
 
-<p>Based on the reading plans of Robert Murray M'Cheyne’s Bible Reading Calendar.  To read through the Bible in one year, click on the date to show all three readings.  Note that the readings will be shown in Bible book order.
+<p>Based on the reading plans of Robert Murray M'Cheyne’s Bible Reading Calendar.  The plan can be used to read through the Bible in one, two, or three years.  As a one-year plan, read the passages in all three columns; as a two-year plan, read the passages from columns A + B in the first year, and A + C in the next; as a three-year plan, read one column at a time.
 
 </div>
 <div class="fixTableHead">
@@ -211,9 +211,9 @@ <h2 class="hTitle">R. M. M'Cheyne's 1 or 3 Year Readings</h2>
         '  <thead>\n' +
         '    <tr class="tb_head">\n' +
         '      <th class="th_col">Date</th>\n' +
-        '      <th class="th_col">Year 1</th>\n' +
-        '      <th class="th_col">Year 2</th>\n' +
-        '      <th class="th_col">Year 3</th>\n' +
+        '      <th class="th_col">A</th>\n' +
+        '      <th class="th_col">B</th>\n' +
+        '      <th class="th_col">C</th>\n' +
         '    </tr>\n' +
         '  </thead>\n';
     $("#plan").append(tblHeadingHTLM);

diff --git a/step-web/src/main/webapp/html/reports_by_step.html b/step-web/src/main/webapp/html/reports_by_step.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <title>Reports from STEPBible</title>
-  <meta name="description" content="STEPBible reports on Gospel Harmony, Places (Maps), OT Parallels, NT Letter Structure, OT used in NT, Miracles...">
+  <title>Resources Powered by STEPBible</title>
+  <meta name="description" content="STEPBible resources on Gospel Harmony, Places (Maps), OT Parallels, NT Letter Structure, OT used in NT, Miracles...">
 </head>
-<body style="margin:0;background-color:white"">
+<body style="background-color:white"">
 <div>
 	<span>
 		<a href="/" id="logo">
@@ -24,7 +24,7 @@
 			</svg>
 		</a>
 	</span>
-	<h2 style="color:#17758f;font-size:22px">     Reports Powered by STEPBible*</h2>
+	<h2 style="color:#17758f;font-size:22px">     Resources Powered by STEPBible</h2>
 </div>
 <ul>
 <li><a href="gospel_harmony.html">Harmony of the Gospels</a></li>
@@ -38,17 +38,18 @@ <h2 style="color:#17758f;font-size:22px">     Reports Powered by STEPBible*</h2>
 <li>People in the Bible (coming soon)</li>
 </ul>
 <br>
-<p style="color:#17758f;font-size:22px"><b>     Reading Plans*</b></p>
+<p style="color:#17758f;font-size:22px"><b>     Reading Plans</b></p>
 <ul>
 <li><a href="one_year_themes_chrono.html">1 yr themes collected chronologically</a></li>
 <li><a href="one_year_chrono_OT_and_NT_together.html">1 yr chronological OT and NT</a></li>
 <li><a href="one_year_chrono_NT_related_OT.html">1 yr chronological NT with related OT</a></li>
 <li><a href="one_year_chrono_OT_related_NT.html">1 yr chronological OT with related NT</a></li>
 <li><a href="two_year_chrono_OT_related_NT.html">2 yr chronological OT with related NT</a></li>
+<li><a href="mcheynes_readings.html">R. M. M'Cheyne's 1, 2, or 3 yr readings</a></li>
 <li><a href="lectionary.html">3 yr Revised Common Lectionary</a></li>
 <li><a href="parashot.html">Jewish Parashot (Torah & Haftorah)</a></li>
 </ul>
 <br>
-* Now mobile-friendly!
+All resources and readings are mobile-friendly!
 </body>
 </html>
diff --git a/step-web/src/main/webapp/js/step_ready.js b/step-web/src/main/webapp/js/step_ready.js
@@ -25,7 +25,7 @@
                             '<a id="panel-icon" style="padding-left:5px" class="hidden-xs navbarIconDesc" href="javascript:step.util.createNewColumn();" title="' + __s.open_in_new_panel + '">' +
                                 '<i class="glyphicon glyphicon-plus"></i><span class="navbarIconDesc hidden-sm">&nbsp;' + __s.new_panel + '</span>' +
                             '</a>' +
-                            '<a id="report-icon" style="padding-left:5px" href="html/reports_by_step.html" target="_blank" title="Reports that uses STEP">' +
+                            '<a id="report-icon" style="padding-left:5px" href="html/reports_by_step.html" target="_blank" title="Resources powered by STEPBible">' +
                                 '<i class="glyphicon glyphicon-th-list"></i><span class="navbarIconDesc hidden-xs">&nbsp;&nbsp;' + __s.report + '</span>' +
                             '</a>' +
                             '<a id="stats-icon" style="padding-left:5px" href="javascript:step.util.ui.initSidebar(\'analysis\');" title="' + __s.passage_stats + '">' +