Skip to content

Commit

Permalink
Merge pull request #542 from cjakeman/website-versions
Browse files Browse the repository at this point in the history
adds new webpage, moves Testing out of Download/Programs
  • Loading branch information
cjakeman committed Dec 28, 2021
2 parents da94ec4 + 83320ed commit feff309
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 46 deletions.
58 changes: 12 additions & 46 deletions Website/openrails.org/download/program/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
</div>
</div>
<div class="row">
<div class="col-md-1"></div>
<div class="col-md-4">
<div class="col-md-2">&nbsp;</div>
<div class="col-md-8">
<h1>Stable Version 1.4 <small>(recommended)</small></h1>
<br>
</div>
</div>
<div class="row">
<div class="col-md-4">&nbsp;</div>
<div class="col-md-4">
<!-- Button to trigger modal -->
<a href="#modal1" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the installer</h2>
Expand All @@ -38,50 +43,16 @@
We're working hard on producing the next stable version. Please check back soon.
</p>-->
</div>
<div class="col-md-2"></div>
<div class="col-md-4">
<h1>Testing Version</h1>
<br>
<!-- Button to trigger modal -->
<a href="#modal2" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the executables</h2>
<p>
See the installation guides below for the pre-requisites you'll need.
</p>
</a>
<p style="text-align: center;">
<?php echo date('d F Y', filemtime("$file_path/$download_testing")) . ', ' . round(filesize("$file_path/$download_testing") / 1024 / 1024) . 'MB'; ?>
</p>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-2">&nbsp;</div>
<div class="col-md-8">
<h3>Other versions</h3>
<p><a href="/download/versions/">Two other versions</a> are available.</p>

<h2><span id="installation_questions">Installation Questions </span><small>from the FAQ</small></h2>
<?php include "../../learn/faq/install.php" ?>
</div>
<div class="col-md-6">
<h2>Recent Code Changes</h2>
<ul>
<?php include "../../api/update/testing/changelog.html" ?>
</ul>
<p><a href='../changes/'>See more code changes</a></p>
<h2>Installation Guides</h2>
<ul>
<li><a href="/files/installation_guide_en.pdf">Installation Guide (English)</a></li>
<li><a href="/files/installation_guide_es.pdf">Tutorial de Instalación (Spanish)</a></li>
</ul>
<p>
Note: No installation is necessary and multiple versions of Open Rails can co-exist in different folders.
</p>
<h2>Updater</h2>
<p>
The built-in updater checks this website for new updates once per day. The testing version is updated once per week, usually on Friday around 7pm UK time.
</p>
<h2>Unstable Version</h2>
<p>
To support development, the <a href='http://james-ross.co.uk/projects/or?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>latest unstable version</a> is also available, which is updated as and when we <a href='http://james-ross.co.uk/projects/or/log?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>make changes to it</a>. <a href='http://james-ross.co.uk/projects/or/builds?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>Previous unstable versions are available</a>. The unstable versions are more <strong>likely to contain serious bugs</strong> and are only recommended for users wishing to help with Open Rails development.
</p>
</div>
</div>
<?php include "../../shared/tail.php" ?>
<?php include "../../shared/banners/preload_next_banner.php" ?>
Expand All @@ -90,11 +61,6 @@
$title = 'Download Open Rails (stable version)';
$download_file = $download_stable;
include "preamble.php";

$modal = 'modal2';
$title = "Download Open Rails (testing version)";
$download_file = $download_testing;
include "preamble.php";
?>
</body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
122 changes: 122 additions & 0 deletions Website/openrails.org/download/versions/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?php include "../../shared/head.php" ?>
<link rel="stylesheet" href="../../shared/iframe/iframe.css" type="text/css" />
<style>img { margin: 20px 0 20px 0; border: 2px solid #ccc; }</style>
</head>

<body>
<div class="container"><!-- Centres content and sets fixed width to suit device -->
<?php include "../../shared/banners/choose_banner.php" ?>
<?php include "../../shared/banners/show_banner.php" ?>
<?php include "../../shared/menu.php" ?>
<?php
$download_stable = 'OpenRails-1.4-Setup.exe';
$download_testing = 'OpenRails-Testing.zip';
$file_path = "../../files";
?>
<div class="row">
<div class="col-md-12">
<h1>Download > Versions</h1>
</div>
</div>
<div class="row">
<div class="col-md-2">&nbsp;</div>
<div class="col-md-8">
<h2>Three Versions of Open Rails</h2>
<p>
Three versions of Open Rails are readily available to users, as shown below:
</p>
<img src="3_versions.png" width=617/>
<p>
For first-time users, we recommend the <a href="../program">Stable Version</a> which comes with an installer.
</p>

<h2>Updater</h2>
<p>
Whichever version you choose, Open Rails has a mechanism to notify you of new versions and to update Open Rails for you.
You will find the settings for this mechanism in <i>Menu > Options > Update</i>
</p>
<img src="updater_tab.png" width=617/>
<p>
Open Rails will check for updates at most once a day.
If an update is found, then you can install the update just by clicking on the link in the top, right corner:
</p>
<img src="update_link.png" width=617/>

<h2>Testing Version</h2>
<p>
If you follow the Open Rails project on the forums, then you will hear about bug-fixes and new features.
These are included in the Unstable Version for developers and testers to try out.
Once they have been checked and approved, they are published (on Friday) as the latest Testing Version.
Any user can easily update to the current weekly Testing Version and benefit from these improvements.
</p>

<h3>Recent Code Changes</h3>
<ul>
<?php include "../../api/update/testing/changelog.html" ?>
</ul>
<p><a href='../changes/'>See more code changes</a></p>
<p>
The current Testing Version can also be downloaded as a Zip archive:
</p>
<br>
</div>
</div>
<div class="row">
<div class="col-md-4">&nbsp;</div>
<div class="col-md-4">
<!-- Button to trigger modal -->
<a href="#modal2" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the executables</h2>
<p>
See the installation guides below for the pre-requisites you'll need.
</p>
</a>
</div>
</div>
<div class="row">
<div class="col-md-2">&nbsp;</div>
<div class="col-md-8">
<p style="text-align: center;">
<?php echo date('d F Y', filemtime("$file_path/$download_testing")) . ', ' . round(filesize("$file_path/$download_testing") / 1024 / 1024) . 'MB'; ?>
</p>
<ul>
<li><a href="/files/installation_guide_en.pdf">Installation Guide (English)</a></li>
<li><a href="/files/installation_guide_es.pdf">Tutorial de Instalación (Spanish)</a></li>
</ul>
<p>
Note: Multiple versions of Open Rails will not interfere if they are saved to different folders.
</p>

<h2>Unstable Version</h2>
<p>
To support development, the
<a href='http://james-ross.co.uk/projects/or?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>latest unstable version</a>
is also available, which is updated as and when we make changes to it.
Previous unstable versions <a href='http://james-ross.co.uk/projects/or/log?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>are available</a>.
The unstable versions are more <strong>likely to contain serious bugs</strong>
and are only recommended for users wishing to help with Open Rails development.
</p>
<h3>Improvements</h3>
<p>
Improvements to Open Rails are drawn from several public sources as shown here:
</p>
<img src="improvements.png" width=617/>
<p>
We try to make sure that these changes all work and fit together by reviews as marked in orange in the diagram.
</p>
<br/>
<br/>

</div>
</div>
</div>
<?php include "../../shared/tail.php" ?>
<?php include "../../shared/banners/preload_next_banner.php" ?>
<?php
$modal = 'modal2';
$title = "Download Open Rails (testing version)";
$download_file = $download_testing;
include "../program/preamble.php";
?>
</body>
</html>
1 change: 1 addition & 0 deletions Website/openrails.org/download/versions/title.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?php echo "<title>Open Rails - Download - Versions</title>"; ?>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Website/openrails.org/shared/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function in_directory($cwd, $name) {
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/download/program/">Program</a></li>
<li><a href="/download/versions/">Versions</a></li>
<li><a href="/download/source/">Source</a></li>
<li><a href="/download/changes/">Changes</a></li>
<li><a href="/download/content/">Content</a></li>
Expand Down

0 comments on commit feff309

Please sign in to comment.