Skip to content

Commit 83320ed

Browse files
committed
adds new webpage, moves Testing out of Download/Programs
See https://blueprints.launchpad.net/or/+spec/website-versions
1 parent ebdff93 commit 83320ed

File tree

8 files changed

+136
-46
lines changed

8 files changed

+136
-46
lines changed

Website/openrails.org/download/program/index.php

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
</div>
1919
</div>
2020
<div class="row">
21-
<div class="col-md-1"></div>
22-
<div class="col-md-4">
21+
<div class="col-md-2">&nbsp;</div>
22+
<div class="col-md-8">
2323
<h1>Stable Version 1.4 <small>(recommended)</small></h1>
2424
<br>
25+
</div>
26+
</div>
27+
<div class="row">
28+
<div class="col-md-4">&nbsp;</div>
29+
<div class="col-md-4">
2530
<!-- Button to trigger modal -->
2631
<a href="#modal1" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
2732
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the installer</h2>
@@ -38,50 +43,16 @@
3843
We're working hard on producing the next stable version. Please check back soon.
3944
</p>-->
4045
</div>
41-
<div class="col-md-2"></div>
42-
<div class="col-md-4">
43-
<h1>Testing Version</h1>
44-
<br>
45-
<!-- Button to trigger modal -->
46-
<a href="#modal2" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
47-
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the executables</h2>
48-
<p>
49-
See the installation guides below for the pre-requisites you'll need.
50-
</p>
51-
</a>
52-
<p style="text-align: center;">
53-
<?php echo date('d F Y', filemtime("$file_path/$download_testing")) . ', ' . round(filesize("$file_path/$download_testing") / 1024 / 1024) . 'MB'; ?>
54-
</p>
55-
</div>
5646
</div>
5747
<div class="row">
58-
<div class="col-md-6">
48+
<div class="col-md-2">&nbsp;</div>
49+
<div class="col-md-8">
50+
<h3>Other versions</h3>
51+
<p><a href="/download/versions/">Two other versions</a> are available.</p>
52+
5953
<h2><span id="installation_questions">Installation Questions </span><small>from the FAQ</small></h2>
6054
<?php include "../../learn/faq/install.php" ?>
6155
</div>
62-
<div class="col-md-6">
63-
<h2>Recent Code Changes</h2>
64-
<ul>
65-
<?php include "../../api/update/testing/changelog.html" ?>
66-
</ul>
67-
<p><a href='../changes/'>See more code changes</a></p>
68-
<h2>Installation Guides</h2>
69-
<ul>
70-
<li><a href="/files/installation_guide_en.pdf">Installation Guide (English)</a></li>
71-
<li><a href="/files/installation_guide_es.pdf">Tutorial de Instalación (Spanish)</a></li>
72-
</ul>
73-
<p>
74-
Note: No installation is necessary and multiple versions of Open Rails can co-exist in different folders.
75-
</p>
76-
<h2>Updater</h2>
77-
<p>
78-
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.
79-
</p>
80-
<h2>Unstable Version</h2>
81-
<p>
82-
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.
83-
</p>
84-
</div>
8556
</div>
8657
<?php include "../../shared/tail.php" ?>
8758
<?php include "../../shared/banners/preload_next_banner.php" ?>
@@ -90,11 +61,6 @@
9061
$title = 'Download Open Rails (stable version)';
9162
$download_file = $download_stable;
9263
include "preamble.php";
93-
94-
$modal = 'modal2';
95-
$title = "Download Open Rails (testing version)";
96-
$download_file = $download_testing;
97-
include "preamble.php";
9864
?>
9965
</body>
10066
</html>
Loading
Loading
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?php include "../../shared/head.php" ?>
2+
<link rel="stylesheet" href="../../shared/iframe/iframe.css" type="text/css" />
3+
<style>img { margin: 20px 0 20px 0; border: 2px solid #ccc; }</style>
4+
</head>
5+
6+
<body>
7+
<div class="container"><!-- Centres content and sets fixed width to suit device -->
8+
<?php include "../../shared/banners/choose_banner.php" ?>
9+
<?php include "../../shared/banners/show_banner.php" ?>
10+
<?php include "../../shared/menu.php" ?>
11+
<?php
12+
$download_stable = 'OpenRails-1.4-Setup.exe';
13+
$download_testing = 'OpenRails-Testing.zip';
14+
$file_path = "../../files";
15+
?>
16+
<div class="row">
17+
<div class="col-md-12">
18+
<h1>Download > Versions</h1>
19+
</div>
20+
</div>
21+
<div class="row">
22+
<div class="col-md-2">&nbsp;</div>
23+
<div class="col-md-8">
24+
<h2>Three Versions of Open Rails</h2>
25+
<p>
26+
Three versions of Open Rails are readily available to users, as shown below:
27+
</p>
28+
<img src="3_versions.png" width=617/>
29+
<p>
30+
For first-time users, we recommend the <a href="../program">Stable Version</a> which comes with an installer.
31+
</p>
32+
33+
<h2>Updater</h2>
34+
<p>
35+
Whichever version you choose, Open Rails has a mechanism to notify you of new versions and to update Open Rails for you.
36+
You will find the settings for this mechanism in <i>Menu > Options > Update</i>
37+
</p>
38+
<img src="updater_tab.png" width=617/>
39+
<p>
40+
Open Rails will check for updates at most once a day.
41+
If an update is found, then you can install the update just by clicking on the link in the top, right corner:
42+
</p>
43+
<img src="update_link.png" width=617/>
44+
45+
<h2>Testing Version</h2>
46+
<p>
47+
If you follow the Open Rails project on the forums, then you will hear about bug-fixes and new features.
48+
These are included in the Unstable Version for developers and testers to try out.
49+
Once they have been checked and approved, they are published (on Friday) as the latest Testing Version.
50+
Any user can easily update to the current weekly Testing Version and benefit from these improvements.
51+
</p>
52+
53+
<h3>Recent Code Changes</h3>
54+
<ul>
55+
<?php include "../../api/update/testing/changelog.html" ?>
56+
</ul>
57+
<p><a href='../changes/'>See more code changes</a></p>
58+
<p>
59+
The current Testing Version can also be downloaded as a Zip archive:
60+
</p>
61+
<br>
62+
</div>
63+
</div>
64+
<div class="row">
65+
<div class="col-md-4">&nbsp;</div>
66+
<div class="col-md-4">
67+
<!-- Button to trigger modal -->
68+
<a href="#modal2" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
69+
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the executables</h2>
70+
<p>
71+
See the installation guides below for the pre-requisites you'll need.
72+
</p>
73+
</a>
74+
</div>
75+
</div>
76+
<div class="row">
77+
<div class="col-md-2">&nbsp;</div>
78+
<div class="col-md-8">
79+
<p style="text-align: center;">
80+
<?php echo date('d F Y', filemtime("$file_path/$download_testing")) . ', ' . round(filesize("$file_path/$download_testing") / 1024 / 1024) . 'MB'; ?>
81+
</p>
82+
<ul>
83+
<li><a href="/files/installation_guide_en.pdf">Installation Guide (English)</a></li>
84+
<li><a href="/files/installation_guide_es.pdf">Tutorial de Instalación (Spanish)</a></li>
85+
</ul>
86+
<p>
87+
Note: Multiple versions of Open Rails will not interfere if they are saved to different folders.
88+
</p>
89+
90+
<h2>Unstable Version</h2>
91+
<p>
92+
To support development, the
93+
<a href='http://james-ross.co.uk/projects/or?utm_campaign=unstable-version&utm_source=openrails.org&utm_medium=referral'>latest unstable version</a>
94+
is also available, which is updated as and when we make changes to it.
95+
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>.
96+
The unstable versions are more <strong>likely to contain serious bugs</strong>
97+
and are only recommended for users wishing to help with Open Rails development.
98+
</p>
99+
<h3>Improvements</h3>
100+
<p>
101+
Improvements to Open Rails are drawn from several public sources as shown here:
102+
</p>
103+
<img src="improvements.png" width=617/>
104+
<p>
105+
We try to make sure that these changes all work and fit together by reviews as marked in orange in the diagram.
106+
</p>
107+
<br/>
108+
<br/>
109+
110+
</div>
111+
</div>
112+
</div>
113+
<?php include "../../shared/tail.php" ?>
114+
<?php include "../../shared/banners/preload_next_banner.php" ?>
115+
<?php
116+
$modal = 'modal2';
117+
$title = "Download Open Rails (testing version)";
118+
$download_file = $download_testing;
119+
include "../program/preamble.php";
120+
?>
121+
</body>
122+
</html>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php echo "<title>Open Rails - Download - Versions</title>"; ?>
Loading
Loading

Website/openrails.org/shared/menu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ function in_directory($cwd, $name) {
4343
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
4444
<ul class="dropdown-menu">
4545
<li><a href="/download/program/">Program</a></li>
46+
<li><a href="/download/versions/">Versions</a></li>
4647
<li><a href="/download/source/">Source</a></li>
4748
<li><a href="/download/changes/">Changes</a></li>
4849
<li><a href="/download/content/">Content</a></li>

0 commit comments

Comments
 (0)