Merge 83076e1 into 6c2c29a

JMRI · May 21, 2021 · b824369 · b824369
2 parents 6c2c29a + 83076e1
commit b824369
Show file tree

Hide file tree

Showing 125 changed files with 1,367 additions and 1,834 deletions.
diff --git a/help/en/Acknowledgements.shtml b/help/en/Acknowledgements.shtml
@@ -1,32 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">
 
+<head>
   <title>JMRI: Acknowledgements</title>
   <meta name="author" content="Bob Jacobsen">
   <meta name="keywords" content=
-  "java model railroad JMRI CMRI decoderpro panelpro loconet lenz nce easydcc dcc nmra">
-  <!-- Style -->
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="/css/default.css"
-  media="screen">
-  <link rel="stylesheet" type="text/css" href="/css/print.css"
-  media="print">
-  <link rel="icon" href="/images/jmri.ico" type="image/png">
-  <link rel="home" title="Home" href="/">
-  <!-- /Style -->
+  "java model railroad JMRI decoderpro panelpro names people credits">
+  <!--#include virtual="/Style.shtml" -->
 </head>
 
 <body>
   <!--#include virtual="/Header.shtml" -->
-  <div class="nomenu" id="mBody">
+  <div id="mBody">
+    <!--#include virtual="Sidebar.shtml" --> <!-- might be improved to show an Alphabet sidebar + some nav? -->
     <div id="mainContent">
 
       <h2>Acknowledgements: People who've contributed to JMRI</h2>
+
       <p>A number of people have contributed their effort to JMRI.
       They are listed below in alphabetical order and deserve our
       thanks.<br>
@@ -1276,5 +1266,6 @@
       <!--#include virtual="/Footer.shtml" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
+  <script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/Map.jhm b/help/en/Map.jhm
@@ -4216,7 +4216,7 @@
 
 <mapID target="html.doc.Technical.JUnit_Reporting" url="html/doc/Technical/JUnit.shtml#Reporting"/>
 
-<mapID target="TemplatePlain" url="TemplatePlain.shtml"/>
+<mapID target="TemplatePlain" url="template-no-sidebar.shtml"/>
 
 <mapID target="manual.DecoderPro.Main_SPROG_Console" url="manual/DecoderPro/Main_SPROG.shtml#Console"/>
 
@@ -5150,4 +5150,4 @@
 
 <mapID target="manual.DecoderPro3.images.btn_throttle_labels" url="manual/DecoderPro3/images/btn_throttle_labels.png"/>
 
-</map>
+</map>
diff --git a/help/en/README b/help/en/README
@@ -8,8 +8,8 @@ There are several content subtrees:
   html - a help-customized version of the web site
   package - package-sensitive help, organized by Java package
 
-The TemplatePlain.shtml and TemplateBar.shtml files are basic templates
-to copy when making a new file.
+The template-no-sidebar.shtml and template-sidebar.shtml files
+are basic templates to copy when making a new file.
 
 For more information on maintaining the various metadata in the 
 help system, please see:

diff --git a/help/en/TemplatePlain.shtml b/help/en/TemplatePlain.shtml
diff --git a/help/en/glossary/index.shtml b/help/en/glossary/index.shtml
@@ -1,7 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta name="generator" content=
   "HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">
@@ -11,13 +10,7 @@
   <meta name="author" content="Egbert Broerse">
   <meta name="keywords" content=
   "model railroad JMRI decoderpro panelpro operations GUI I18N">
-  <!-- Style -->
-  <meta http-equiv="content-type" content="text/html; charset=us-ascii">
-  <link rel="stylesheet" type="text/css" href="/css/default.css" media="screen">
-  <link rel="stylesheet" type="text/css" href="/css/print.css" media="print">
-  <link rel="icon" href="/images/jmri.ico" type="image/png">
-  <link rel="home" title="home" href="/">
-  <!-- /Style -->
+  <!--#include virtual="/Style.shtml" -->
   <!-- Sortable tables -->
   <!-- <script src="../../../web/js/sorttable.js"></script> for local testing -->
 
@@ -54,6 +47,7 @@ table.sortable th {
 
       <p>Click a heading to sort the list up or down.</p>
 
+    <div class="wide">
       <table class="sortable">
         <!-- The JMRI Glossary table, sort by clicking a header -->
         <!-- Copy all edits to help/en/glossary/index.shtml as well to keep both up to date -->
@@ -2369,9 +2363,11 @@ table.sortable th {
           <td class="da"></td>
         </tr>
       </table><!-- end of Glossary table -->
+    </div><!-- end of wide-table div -->
 
       <!--#include virtual="/Footer.shtml" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
+<script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/html/FAQ.shtml b/help/en/html/FAQ.shtml
@@ -1,13 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta name="author" content="Jerry Grochow">
 
+<head>
   <title>JMRI: Frequently Asked Questions (General)</title>
-
+  <meta name="author" content="Jerry Grochow">
   <!--#include virtual="/Style.shtml" -->
-
+  <!-- special inline FAQ styles -->
   <style type="text/css">
 * {
   box-sizing: border-box;
@@ -237,5 +235,6 @@
   <!-- FAQ-Tail -->
   <script type="text/javascript" src="/web/js/faq.js">
   </script><!-- /FAQ-Tail -->
+  <script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/html/Sidebar.shtml b/help/en/html/Sidebar.shtml
@@ -22,4 +22,6 @@
 
     </div> <!-- closes #side -->
 
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
diff --git a/help/en/html/SidebarCompact.shtml b/help/en/html/SidebarCompact.shtml
@@ -27,7 +27,7 @@
 
     <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->   
 
-    </div> <!-- closes #side -->  
-
-
+    </div> <!-- closes #side -->
+  <!-- button is in /Header -->
+  <script src="/js/side.js"></script>
 <!-- /SidebarCompact.shtml -->
diff --git a/help/en/html/SidebarNew.shtml b/help/en/html/SidebarNew.shtml
@@ -24,6 +24,8 @@
 
     </div>  <!-- ends side -->
 
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
 
 <!-- ============================================================================ -->

diff --git a/help/en/html/apps/DataManagement.shtml b/help/en/html/apps/DataManagement.shtml
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
-<head>
 
+<head>
   <title>JMRI: Understanding the Data Management</title>
   <meta name="Author" content="Jerry Grochow">
   <!--#include virtual="/Style.shtml" -->
@@ -553,6 +552,7 @@
       <!--#include virtual="/Footer.shtml" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
+  <script src="/js/main.js"></script>
 </body>
 </html>
 

diff --git a/help/en/html/apps/DecoderPro/Sidebar.shtml b/help/en/html/apps/DecoderPro/Sidebar.shtml
@@ -28,6 +28,7 @@
     <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->    
 
 </div> <!-- close #side -->
-
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
 
diff --git a/help/en/html/apps/DispatcherPro/Sidebar.shtml b/help/en/html/apps/DispatcherPro/Sidebar.shtml
@@ -28,5 +28,6 @@
     <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->    
 
 </div> <!-- close #side -->
-
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
diff --git a/help/en/html/apps/Errors.shtml b/help/en/html/apps/Errors.shtml
@@ -1,7 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta name="generator" content=
   "HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">
@@ -212,5 +211,6 @@
       <!--#include virtual="/Footer.shtml" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
+  <script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/html/apps/LoadStoreWork.shtml b/help/en/html/apps/LoadStoreWork.shtml
@@ -1,26 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
 <html lang="en">
-<head>
 
+<head>
   <title>JMRI: Loading and Storing Your Work</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="Author" content="Jerry Grochow">
   <!--#include virtual="/Style.shtml" -->
-
 </head>
 <!-- = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -->
 
 <body>
-  <!--#include virtual="/Header.shtml" -->
-  <div id="mBody">
-    <!--#include virtual="Sidebar.shtml" -->
+<!--#include virtual="/Header.shtml" -->
+<div id="mBody">
+  <!--#include virtual="Sidebar.shtml" -->
 
-    <div id="mainContent">
+  <div id="mainContent">
 
-        <a id="TopOfPage" name="TopOfPage"></a>
-        <h1>JMRI: Loading and Storing Your Work</h1>
-        <p class="subtitle">What Everyone Should Know</p>
+      <a id="TopOfPage" name="TopOfPage"></a>
+      <h1>JMRI: Loading and Storing Your Work</h1>
+      <p class="subtitle">What Everyone Should Know</p>
 
       <p class="noted">This page provides the basic information you should know about what commands are used to
       load and store the data you create and update in JMRI. A companion page with more information for advanced
@@ -334,5 +331,6 @@
       <!--#include virtual="/Footer.shtml" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
+  <script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/html/apps/OperationsPro/index.shtml b/help/en/html/apps/OperationsPro/index.shtml
@@ -1,13 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
-<head>
 
+<head>
   <title>JMRI: OperationsPro, an application for creating train manifests for operating sessions</title>
   <meta name="keywords" content="operations, Operations, OperationsPro">
 
  <!--#include virtual="/Style.shtml" -->
-
 </head>
 
 <body>
@@ -43,8 +41,8 @@
 
      <!--#include virtual="/Footer.shtml" -->
 
-
         </div><!-- closes #mainContent-->
     </div><!-- closes #mBody-->
+    <script src="/js/main.js"></script>
 </body>
 </html>
diff --git a/help/en/html/apps/PanelPro/Sidebar.shtml b/help/en/html/apps/PanelPro/Sidebar.shtml
@@ -28,5 +28,6 @@
     <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->    
 
 </div> <!-- close #side -->
-
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
diff --git a/help/en/html/apps/Sidebar.shtml b/help/en/html/apps/Sidebar.shtml
@@ -21,4 +21,6 @@
 	 <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->     
 
 	</div> <!-- closes #side -->
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
diff --git a/help/en/html/apps/SidebarNew.shtml b/help/en/html/apps/SidebarNew.shtml
@@ -21,4 +21,6 @@
 	 <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->     
 
 	</div> <!-- closes #side -->
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
diff --git a/help/en/html/apps/SoundPro/Sidebar.shtml b/help/en/html/apps/SoundPro/Sidebar.shtml
@@ -28,6 +28,7 @@
     <!--#include virtual="/help/en/parts/SidebarTail.shtml" -->    
 
 </div> <!-- close #side -->
-
+<!-- button is in /Header -->
+<script src="/js/side.js"></script>
 <!-- /Sidebar.shtml -->
 
diff --git a/help/en/html/apps/StoringYourWork.shtml b/help/en/html/apps/StoringYourWork.shtml
@@ -1,10 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
+
 <head><title>JMRI: Redirected Page</title>
 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
 <META HTTP-EQUIV="Refresh" CONTENT="6; URL=LoadStoreWork.shtml ">
 </head>
+<!-- = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -->
+
 <body>
 <p>This page has been moved to another location
 (<a href="LoadStoreWork">LoadStoreWork.shtml</a>)
@@ -14,4 +16,3 @@ as part of updating our web site.</p>
 <p>You should be redirected to the new location within 6 seconds, or click the link above.</p>
 </body>
 </html>
-
diff --git a/help/en/html/apps/index.shtml b/help/en/html/apps/index.shtml
@@ -1,14 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">
 
+<head>
   <title>JMRI: Applications</title>
  <!--#include virtual="/Style.shtml" -->
-
- </head>
+</head>
 
 <body>
   <!--#include virtual="/Header.shtml" -->
@@ -128,5 +124,6 @@
 
     </div><!-- close #mainContent -->
   </div><!-- close #mBody -->
+  <script src="/js/main.js"></script>
 </body>
 </html>