Skip to content

Commit

Permalink
Merge pull request #347 from jerryg2003/patch-6
Browse files Browse the repository at this point in the history
Various cleanups to community/connections
  • Loading branch information
bobjacobsen committed Jan 23, 2020
2 parents fc9f67c + f827229 commit b74e917
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 83 deletions.
66 changes: 12 additions & 54 deletions community/connections/CATS.shtml
@@ -1,60 +1,18 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!-- $Id: CATS.shtml,v 1.1 2008-05-23 16:39:46 jacobsen Exp $ -->
<html lang="en">
<head>
<title>
CATS, The Crandic Automated Traffic System
</title>
<meta name="author" content="Bob Jacobsen">
<meta name="keywords" content="JMRI CATS ">

<!-- The combination of "Define" and {Header,Style, Logo and Footer} comments -->
<!-- are an arbitrary design pattern used by the update.pl script to -->
<!-- easily replace the common header/footer code for all the web pages -->

<!-- delete the following 2 Defines if you want to use the default JMRI logo -->
<!-- or change them to reflect your alternative logo -->

<!-- Style -->
<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<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 -->
<head><title>JMRI: Redirected Page</title>
<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
<!-- CHANGE FOLLOWING LINE -->
<META HTTP-EQUIV="Refresh" CONTENT="5; URL=./CATS/index.shtml ">
</head>

<!--#include virtual="/Header.shtml" -->
<!--#include virtual="Sidebar.shtml" -->

<div id="mainContent">

<h1>Integration with CATS</h1>
<a href="http://cats4ctc.org"><!-- was http://home.comcast.net/~kb0oys/ --> <img src="https://cats4ctc.wdfiles.com/local--files/home:home/armstrong.jpg" width="60" height="40" alt="CATS" align="right"></a>

The Crandic Automated Traffic System (CATS) is a JMRI-based application by
Rodney Black for controlling and operating a model railroad.
There's more information on the
<a href="http://cats4ctc.org"><!-- was http://home.comcast.net/~kb0oys/ --> CATS web site</a>.


<h3>Technical Info</h3>

JMRI is a library, and CATS is a large, separately maintained application
that uses the library. As such, CATS provides an important
reference case for JMRI developers as they extend and adapt their code.
CATS should continue to work for it's users, with a minimum of extranous
effort for the CATS developers!

<p>A
<a href="../../help/en/html/doc/Technical/CATS.shtml">separate page</a>
describes how JMRI and CATS are connected, and
how the JMRI developers check that their changes
don't inadvertantly cause problems for CATS.

<!--#include virtual="/Footer.shtml" -->

</div><!-- closes #mainContent-->
</div> <!-- closes #mBody-->
<body>
This page has been moved to another location
<!-- CATS.shtml only referenced in one user group post in 2013 -->
(<a href="CATS/index.shtml">/community/connections/CATS/index.shtml</a>)
as part of updating our web site.
<p>Please update your bookmarks.
<p>If you got to this page from another JMRI page, please let us know so we can fix it.
<p>You should be redirected to the new page within 5 seconds.
</body>
</html>
8 changes: 7 additions & 1 deletion community/connections/ManifestCreator/index.shtml
Expand Up @@ -18,13 +18,19 @@
</head>

<body>
<!--#include virtual="/Header" -->
<!--#include virtual="../../../Header.shtml" -->
<div id="mBody">
<!--#include virtual="../Sidebar.shtml" -->
<div id="mainContent">
<!-- Page Body -->

<h1>JMRI: Manifest Creator</h1>

<p class="important">
This software is no longer for sale but author (Tom Stack) will discuss features and techniques
used with interested persons.
</p> <!-- Per Tom Stack 01-20-2020 by @jerryg -->

Manifest Creator is an Excel-based add-on to JMRI that can provide
train manifests and switch lists in a number of formats.

Expand Down
27 changes: 0 additions & 27 deletions community/connections/TrainCrew/Sidebar.shtml

This file was deleted.

6 changes: 5 additions & 1 deletion community/connections/TrainCrew/index.shtml
Expand Up @@ -22,7 +22,7 @@
<body>
<!--#include virtual="/Header" -->
<div id="mBody">
<!--#include virtual="Sidebar.shtml" -->
<!--#include virtual="../Sidebar.shtml" -->
<div id="mainContent">
<!-- Page Body -->

Expand All @@ -48,6 +48,10 @@
<br>it is not recommended to run JMRI as Administrator
all of the time, just to install TrainCrew.</p>


<p>TrainCrew code is available on <a href="https://github.com/ekapus/TrainCrew">GitHub here.</a>
</p>

<!--#include virtual="/Footer" -->
</div><!-- close #mainContent -->
</div><!-- close #mBody -->
Expand Down

0 comments on commit b74e917

Please sign in to comment.