Skip to content

Commit 0ae7659

Browse files
cjakemancjakeman
authored
Merge branch 'master' into manual-build-fixes
2 parents 8d96f8b + c4ed88e commit 0ae7659

File tree

5 files changed

+106
-34
lines changed

5 files changed

+106
-34
lines changed

‎contact/form.php

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php include "../shared/head.php" ?>
2+
</head>
3+
4+
<body>
5+
<div class="container"><!-- Centres content and sets fixed width to suit device -->
6+
<?php include "../shared/banners/choose_banner.php" ?>
7+
<?php include "../shared/banners/show_banner.php" ?>
8+
<?php include "../shared/menu.php" ?>
9+
<div class="row">
10+
<div class="col-md-4">
11+
<h1>Contact</h1>
12+
</div>
13+
</div>
14+
<div class="row">
15+
<div class="col-md-3">
16+
<p>
17+
For prompt help with a technical problem, please <a href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">post on one of the Open Rails forums</a> at Elvas Tower.
18+
</p><p>
19+
To report issues with the product or feature requests, please use <a href="../contribute/reporting-bugs/">our Bug Tracker</a>.
20+
</p><p>
21+
To contact the Open Rails Management Team, use <a href="form.php">this form to send us a message</a>.
22+
</p>
23+
</div>
24+
<div class="col-md-6">
25+
<!-- send this to another host as uktrainsim doesn't support mail() -->
26+
<form role="form" action="http://ccgi.jakeman.plus.com/or/forward_message.php" method="get">
27+
<div class="form-group">
28+
<label for="emailAddress">Email address</label>
29+
<input type="email" class="form-control" id="emailAddress" name="from" placeholder="Enter your email address. (We do not share this.)" autofocus required>
30+
</div>
31+
<div class="form-group">
32+
<label for="emailSubject">Subject</label>
33+
<input type="text" class="form-control" id="emailSubject" name="subject" placeholder="Enter your subject">
34+
</div>
35+
<input type="hidden" name="send_to_name" value="or_website">
36+
<input type="hidden" name="send_to_domain" value="jakeman.plus.com">
37+
<input type="hidden" name="success_url" value="http://openrails.org/contact/success.php">
38+
<?php $ip = $_SERVER['REMOTE_ADDR']; echo "<input type='hidden' name='ip' value='$ip'>" ?>
39+
<?php $referer = $_SERVER['HTTP_REFERER']; echo "<input type='hidden' name='referer' value='$referer'>" ?>
40+
<div class="form-group">
41+
<label for="emailMessage">Message</label>
42+
<textarea class="form-control" rows="10" id="emailMessage" name="body" placeholder="Please follow the guidance to the left about getting help." required title="Please follow the guidance to the left about getting help."></textarea>
43+
</div>
44+
<button type="submit" class="btn btn-default">Send</button>
45+
</form>
46+
47+
</div>
48+
</div>
49+
<?php include "../shared/tail.php" ?>
50+
<?php include "../shared/banners/preload_next_banner.php" ?>
51+
</body>
52+
</html>

‎contact/index.php

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,27 @@
1212
</div>
1313
</div>
1414
<div class="row">
15-
<div class="col-md-3">
15+
<div class="col-md-2"></div>
16+
<div class="col-md-4">
17+
<p><br>
18+
<a style="text-decoration: none;" class="btn btn-warning" href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">For help with a technical problem</a>
19+
</p>
20+
</div>
21+
<div class="col-md-4">
22+
<p>
23+
For prompt help with a technical problem, please use this button to post on one of the Open Rails forums</a> at Elvas Tower.
24+
</p>
25+
</div>
26+
</div>
27+
<div class="row">
28+
<div class="col-md-2"></div>
29+
<div class="col-md-8">
1630
<p>
17-
To contact the Open Rails Development Team, please <a href="http://www.trainsim.com/vbts/forumdisplay.php?104-Open-Rails-Discussion">post on the Open Rails forum</a> at TrainSim.
18-
</p><p>
1931
To report issues with the product or feature requests, please use <a href="../contribute/reporting-bugs/">our Bug Tracker</a>.
2032
</p><p>
21-
To contact the Open Rails Management Team, use this form to send us a message.
33+
To contact the Open Rails Management Team, use <a href="form.php">this form to send us a message</a>.
2234
</p>
2335
</div>
24-
<div class="col-md-6">
25-
<!-- send this to another host as uktrainsim doesn't support mail() -->
26-
<form role="form" action="http://ccgi.jakeman.plus.com/or/forward_message.php" method="get">
27-
<div class="form-group">
28-
<label for="emailAddress">Email address</label>
29-
<input type="email" class="form-control" id="emailAddress" name="from" placeholder="Enter your email address. (We do not share this.)" autofocus required>
30-
</div>
31-
<div class="form-group">
32-
<label for="emailSubject">Subject</label>
33-
<input type="text" class="form-control" id="emailSubject" name="subject" placeholder="Enter your subject">
34-
</div>
35-
<input type="hidden" name="send_to_name" value="or_website">
36-
<input type="hidden" name="send_to_domain" value="jakeman.plus.com">
37-
<input type="hidden" name="success_url" value="http://openrails.org/contact/success.php">
38-
<?php $ip = $_SERVER['REMOTE_ADDR']; echo "<input type='hidden' name='ip' value='$ip'>" ?>
39-
<?php $referer = $_SERVER['HTTP_REFERER']; echo "<input type='hidden' name='referer' value='$referer'>" ?>
40-
<div class="form-group">
41-
<label for="emailMessage">Message</label>
42-
<textarea class="form-control" rows="10" id="emailMessage" name="body" placeholder="Enter your message" required title="Please follow the guidance to the left about reporting problems."></textarea>
43-
</div>
44-
<button type="submit" class="btn btn-default">Send</button>
45-
</form>
46-
47-
</div>
4836
</div>
4937
<?php include "../shared/tail.php" ?>
5038
<?php include "../shared/banners/preload_next_banner.php" ?>

‎contribute/developing-code/index.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
From your PC, you can simply view the repository from a web browser.
4646
GitHub.com provides the GitHub Desktop program to interface between GitHub.com and your PC (for 64-bit Windows only).
4747
Other Windows programs are SourceTree and TortoiseGit and also Visual Studio includes a Git tool.
48+
See our <a href="https://onedrive.live.com/view.aspx?resid=7F0F05E28F47C189!295694&ithint=file%2cdocx&authkey=!ABYL6qOsIy85Bdc">step-by-step instructions for starting to work with Git</a>.
4849
</p><p>
4950
The main folders in the repository are:
5051
</p>
@@ -105,6 +106,24 @@
105106
</ol>
106107
</div>
107108
</li>
109+
<li>
110+
<a href=# id="tests">
111+
<h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Running the Test Suite</h2>
112+
</a>
113+
<div class="accordion_body">
114+
<p>
115+
The Open Rails source tree includes a number of unit and integration tests, primarily for portions of the code that deal with data processing. All code changes must pass these tests. Developers are also encouraged to write their own tests for any code that lends itself to testing.
116+
</p>
117+
<p>
118+
After opening the solution in Visual Studio,
119+
</p>
120+
<ol>
121+
<li>Select <em>Test > Test Explorer</em></li>
122+
<li>Wait for the tests to populate in the <em>Test Explorer</em> pane</li>
123+
<li>In the top-left corner of this pane, select "Run All Tests," or press Ctrl-R, then A.</li>
124+
</ol>
125+
</div>
126+
</li>
108127
<li>
109128
<a href=# id="code_policy"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Policy for Code Changes</h2></a>
110129
<div class="accordion_body">

‎discover/project-team/index.php

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,25 @@
1111
<h1>Discover > Project Team</h1>
1212
</div>
1313
</div>
14+
<div class="row">
15+
<div class="col-md-3"></div>
16+
<div class="col-md-6">
17+
<h2>Meeting the Team</h2>
18+
<p>
19+
The Project Team meets on <a href="http://www.elvastower.com">the Elvas Tower bulletin board</a> where Dave Nelson has encouraged us from the very beginning.
20+
He provides <a href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">hosting for our public discussions</a> and private threads so, although we hang out on other boards too, this is the one to follow.
21+
</p>
22+
</div>
23+
</div>
1424
<div class="row">
1525
<div class="col-md-3"></div>
1626
<div class="col-md-6">
17-
<h2>Roles and Focus</h2>
18-
<p>
27+
<h2>Roles and Focus</h2>
28+
<p>
1929
Most of the team has a focus even if we help out with several roles. Here is the currently active team but it's difficult to keep track of everyone, so please get in touch if your name is missing or you would like it removed.
20-
</p><p>
30+
</p><p>
2131
(The names listed are those used on <a href="http://www.elvastower.com">the Elvas Tower forum</a>.)
22-
</p>
32+
</p>
2333
</div>
2434
</div>
2535
<div class="row">
@@ -53,8 +63,11 @@
5363
<table>
5464
<tr><td>JTang</td></tr>
5565
<tr><td>Matej Pacha</td></tr>
56-
<tr><td>Rob Roeterdink (roeter)</td></tr>
66+
<tr><td>Mauricio (mbm_OR)</td></tr>
67+
<tr><td>PerpetualKid</td></tr>
5768
<tr><td>rdamurphy</td></tr>
69+
<tr><td>Rob Roeterdink (roeter)</td></tr>
70+
<tr><td>Ryan Young (YoRyan)</td></tr>
5871
<tr><td>steamer_ctn</td></tr>
5972
<tr><td>Stefan PAITONI</td></tr>
6073
<tr><td>wacampbell</td></tr>

‎share/community/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</p><p>
3838
These boards have forums and files dedicated to Open Rails:</p>
3939
<ul>
40-
<li><a href="http://www.elvastower.com" target="_blank" title="(Open Rails forums are public, others require membership.)">Elvas Tower</a> - International and American</li>
40+
<li><a href="http://www.elvastower.com" target="_blank" title="(Open Rails forums are public, others require membership.)">Elvas Tower</a> - International and American and <br/>also the <a href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">home of the Open Rails Project Team</a></li>
4141
<li><a href="http://www.trainsim.com" target="_blank">TrainSim</a> - International and American</li>
4242
<li><a href="http://www.railpage.com.au" target="_blank">Rail Page</a> - Australian</li>
4343
<li><a href="http://forums.railvictoria.net/viewforum.php?f=48" target="_blank">Rail Victoria Forums</a> - Australian</li>

0 commit comments

Comments
 (0)