Merge pull request #7779 from bobjacobsen/Sidebar-from-master

Update web site "Sidebar" access
JMRI · Dec 30, 2019 · 8bceb2f · 8bceb2f
2 parents 42338be + f9165c7
commit 8bceb2f
Show file tree

Hide file tree

Showing 492 changed files with 4,721 additions and 462 deletions.
diff --git a/help/en/Acknowledgements.shtml b/help/en/Acknowledgements.shtml
@@ -207,7 +207,7 @@
         <a href="http://jmri.org/k/UDRP/index.shtml">despicable
         behavior</a>, and wrote a scripting example page</li>
 
-        <li><a href="https://github.com/JMRI/JMRI/pulls?utf8=✓&q=author%3Asilverailscolo+">Egbert Broerse</a>,
+        <li><a href="https://github.com/JMRI/JMRI/pulls?q=author%3Asilverailscolo+">Egbert Broerse</a>,
         <!-- silverailscolo --> who worked on translations, added
         Switchboards, graphic state display in the tables,
         the Output Matrix signal mast and the Rio Grande 1965
@@ -317,8 +317,8 @@
         <li>Bob Coleman added the CTI Acela support and did a huge
         amount of work on the operations code tests.</li>
 
-        <li>Jeff Collell, <!--- auctionsjeff --->
-            who added Light support for OpenLCB.<li>
+        <li>Jeff Collell, <!-- auctionsjeff -->
+            who added Light support for OpenLCB.</li>
 
         <li>Joe Comuzzi <!-- jcomuzzi -->
         added new icon tests and added a definition for  CNJ 1974 signals </li>
@@ -327,7 +327,7 @@
         decoder definitions for MRC decoders and the Kato
         FL11.</li>
 
-        <li><a href="https://github.com/JMRI/JMRI/pulls?utf8=✓&q=author%3Apetecressman+">Peter Cressman</a>
+        <li><a href="https://github.com/JMRI/JMRI/pulls?q=author%3Apetecressman+">Peter Cressman</a>
         provided a major improvement to Logix,
         improved Sensor Groups, fixed some problems in Routes, and
         provided the Warrant system for scripted running</li>
@@ -391,7 +391,7 @@
 
         <li>Mike Dunston, <!-- atanisoft -->
             who provided 
-            <a href="https://github.com/JMRI/JMRI/pull/4533">several updates</a> 
+            <a href="https://github.com/JMRI/JMRI/pulls?q=author%3Aatanisoft+">several updates</a> 
             for the DCC++ code</li>
 
         <li>Joe Ellis provided the DecoderPro configuration files
@@ -495,10 +495,10 @@
 
         <li>Mark Gurries, who provided loaner equipment and great
             ideas. He's currently working on decoder definitions for
-            DecoderPro </li>
-
+            DecoderPro
         <a name="H" id="H"></a>
-
+        </li>
+
         <li>Victoria K. Hall led the legal action that held Matt
         Katzer responsible for his depredations against JMRI</li>
 
@@ -553,18 +553,17 @@
         </li>
 
         <li>Osvaldo Hojvat provided definitions for several
-                    <a href-"http://www.ldhtrenes.com.ar">LDH</a>
+                    <a href="http://www.ldhtrenes.com.ar">LDH</a>
                     decoders</li>
 
         <li>Hornby Hobbys, who provided a full set of TTS manuals 
         plus information regarding various CVs.</li>
 
         <li>Al Huberty, who organized our first users meeting at
-        the NMRA Toronto convention</li>
-
+        the NMRA Toronto convention
         <a name="I" id="I"></a>
-
         <a name="J" id="J"></a>
+        </li>
 
         <li>AJ Ireland of Digitrax, who loaned equipment, answered
         questions and made valuable suggestions</li>
@@ -638,7 +637,7 @@
         <li>Matjaz Krajnc, who provided better code and icons for
         the web throttle</li>
 
-        <li>Andrew Kroll, who improved the Operations documentation</a>
+        <li>Andrew Kroll, who improved the Operations documentation</li>
 
         <li>Ross Kudlick, who researched options switches on
         Digitrax command stations</li>
@@ -933,7 +932,7 @@
         <li>Joe Salemi, who contributed the Atlas 345 decoder
         definition and updated the TCS Tx definition.</li>
 
-        <li><a href="https://github.com/JMRI/JMRI/pulls?utf8=✓&q=author%3Adsand47+">Dave Sand</a>, <!-- dsand47 -->
+        <li><a href="https://github.com/JMRI/JMRI/pulls?q=author%3Adsand47+">Dave Sand</a>, <!-- dsand47 -->
         who's worked on Layout Editor, Logix, 
         Entry/Exit signaling and other things.</li>
 
@@ -1106,7 +1105,7 @@
 
         <li>George Warner, who changed all the TextFields to editable
         comboboxes (with drop-down menus); added a 2nd turnout
-        circle for slips and added left, right & bottom options
+        circle for slips and added left, right &amp; bottom options
         for the toolbar (and re-laid out same) in the Layout Editor.
         Added support for DMX512 lighting.
         Also wrote all the slip code for the web server.

diff --git a/help/en/TemplateBar.shtml b/help/en/TemplateBar.shtml
@@ -19,7 +19,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
     <h1>JMRI: Page Title???</h1>

diff --git a/help/en/glossary/index.shtml b/help/en/glossary/index.shtml
@@ -39,7 +39,7 @@ table.sortable th {
 <body>
 <!--#include virtual="/Header" -->
   <div id="mBody">
-  <!--#include virtual="../html/Sidebar" -->
+  <!--#include virtual="../html/Sidebar.shtml" -->
   <div id="mainContent">
 
   <h1>JMRI: Glossary</h1>

diff --git a/help/en/html/Sidebar.shtml b/help/en/html/Sidebar.shtml
@@ -0,0 +1,60 @@
+<!-- Sidebar -->
+<!-- This is the common sidebar definition for help/en/html/ pages -->
+	  <hr class="hide">
+	  <div id="side"> <!-- Block of text on left side of page -->
+	    <div style="text-align: center">JMRI&reg; is...</div>
+	    <dl>
+
+		<dt><h3><a href="tools/index.shtml">Tools</a></h3></dt>
+		<dd>JMRI provides powerful tools for working with your
+		layout.
+		<ul>
+		    <li><a href="tools/Turnouts.shtml">Turnouts</a>
+            <li><a href="tools/Lights.shtml">Lights</a>
+		    <li><a href="tools/Sensors.shtml">Sensors</a>
+		    <li><a href="tools/throttle/ThrottleMain.shtml">Throttles</a>
+		    <li><a href="tools/consisttool/ConsistTool.shtml">Consisting</a>
+            <li><a href="tools/Blocks.shtml">Blocks</a>
+            <li><a href="tools/Reporters.shtml">Reporters</a>
+            <li><a href="tools/Memories.shtml">Memory Variables</a>
+		    <li><a href="tools/Routes.shtml">Routes</a>
+		    <li><a href="tools/LRoutes.shtml">LRoutes</a>
+            <li><a href="tools/Sections.shtml">Sections</a>
+            <li><a href="tools/Transits.shtml">Transits</a>
+		    <li><a href="tools/Logix.shtml">Logix</a>
+		    <li><a href="tools/fastclock/index.shtml">Fast Clocks</a>
+		    <li><a href="tools/speedometer/index.shtml">Speedometer</a>
+		    <li><a href="tools/Audio.shtml">Audio</a>
+		    <li><a href="tools/IdTags.shtml">ID Tags</a>
+		    <li><a href="tools/TimeTable.shtml">Timetable</a>
+
+            <li><a href="tools/index.shtml#systemSpecificTools">System-specific...</a>
+   	    </ul>
+		</dd>
+
+  	<dt><h3><a href="automation">Layout Automation</a></h3></dt>
+		<dd>Use JMRI to automate parts of your layout, from simply controlling a crossing gate
+		to running trains in the background.
+		  <ul>
+		    <li><a href="tools/signaling/index.shtml">Signaling</a>
+		    <li><a href="tools/EntryExit.shtml">Entry Exit (NX)</a>
+		    <li><a href="../package/jmri/jmrit/logix/Warrant.shtml">Warrants</a>
+		    <li><a href="../package/jmri/jmrit/dispatcher/Dispatcher.shtml">Dispatcher</a>
+		    <li><a href="tools/Routes.shtml">Routes</a>
+		    <li><a href="tools/LRoutes.shtml">LRoutes</a>
+		    <li><a href="tools/fastclock/index.shtml">Fast Clocks</a>
+		    <li><a href="tools/uss/index.shtml">USS CTC</a>
+		    <li><a href="tools/scripting/index.shtml">Scripting</a>
+		  </ul>
+		</dd>
+
+	    </dl>
+
+	</div> <!-- closes #side -->
+
+    <!-- Sidebar-Tail -->
+    <script type="text/javascript" src="/web/js/jquery-2.0.3.min.js"></script>
+    <script type="text/javascript" src="/web/js/here.js"></script>
+    <!-- /Sidebar-Tail -->
+
+<!-- /Sidebar -->
diff --git a/help/en/html/apps/DecoderPro/CreateDecoder.shtml b/help/en/html/apps/DecoderPro/CreateDecoder.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
     <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/CreateDecoderAdvanced.shtml b/help/en/html/apps/DecoderPro/CreateDecoderAdvanced.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/Debug.shtml b/help/en/html/apps/DecoderPro/Debug.shtml
@@ -22,7 +22,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/FAQ.shtml b/help/en/html/apps/DecoderPro/FAQ.shtml
@@ -27,7 +27,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/FileUpdate.shtml b/help/en/html/apps/DecoderPro/FileUpdate.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/Files.shtml b/help/en/html/apps/DecoderPro/Files.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
       <h1>JMRI: DecoderPro User Guide</h1>
 

diff --git a/help/en/html/apps/DecoderPro/FnMapping.shtml b/help/en/html/apps/DecoderPro/FnMapping.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/Ident.shtml b/help/en/html/apps/DecoderPro/Ident.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/Install.shtml b/help/en/html/apps/DecoderPro/Install.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/IntroXML.shtml b/help/en/html/apps/DecoderPro/IntroXML.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
       <!-- Page Body -->
 

diff --git a/help/en/html/apps/DecoderPro/LocoFile.shtml b/help/en/html/apps/DecoderPro/LocoFile.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/MoreInfo.shtml b/help/en/html/apps/DecoderPro/MoreInfo.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/MultiDecoder.shtml b/help/en/html/apps/DecoderPro/MultiDecoder.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
       <!-- Page Body -->
 

diff --git a/help/en/html/apps/DecoderPro/NetworkFiles.shtml b/help/en/html/apps/DecoderPro/NetworkFiles.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
       <!-- Page Body -->
 

diff --git a/help/en/html/apps/DecoderPro/Programmer.shtml b/help/en/html/apps/DecoderPro/Programmer.shtml
@@ -24,7 +24,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>

diff --git a/help/en/html/apps/DecoderPro/Roster.shtml b/help/en/html/apps/DecoderPro/Roster.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
       <!-- Page Body -->
 

diff --git a/help/en/html/apps/DecoderPro/RosterFile.shtml b/help/en/html/apps/DecoderPro/RosterFile.shtml
@@ -23,7 +23,7 @@
 <body>
   <!--#include virtual="/Header" -->
   <div id="mBody">
-    <!--#include virtual="Sidebar" -->
+    <!--#include virtual="Sidebar.shtml" -->
     <div id="mainContent">
 
       <h1>JMRI: DecoderPro User Guide</h1>