translink 0.0.1 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. data/CHANGELOG.md +12 -0
  2. data/README.md +44 -8
  3. data/doc/schema.graffle +396 -82
  4. data/doc/schema.png +0 -0
  5. data/lib/translink/cli.rb +10 -16
  6. data/lib/translink/crawler.rb +5 -6
  7. data/lib/translink/db.rb +6 -14
  8. data/lib/translink/model/route.rb +29 -18
  9. data/lib/translink/model/stop.rb +17 -19
  10. data/lib/translink/model/stop_time.rb +26 -0
  11. data/lib/translink/model/trip.rb +48 -0
  12. data/lib/translink/page/route.rb +42 -18
  13. data/lib/translink/page/timetable.rb +15 -18
  14. data/lib/translink/page/trip.rb +90 -17
  15. data/lib/translink/page.rb +1 -1
  16. data/lib/translink/version.rb +1 -1
  17. data/lib/translink.rb +2 -3
  18. data/test/fixtures/sample/route.html +401 -1049
  19. data/test/fixtures/sample/timetable.html +170 -216
  20. data/test/fixtures/verbatim/route.html +1976 -7178
  21. data/test/fixtures/verbatim/timetable.html +1501 -6165
  22. data/test/fixtures/verbatim/trip.html +311 -508
  23. data/test/unit/cli_test.rb +4 -20
  24. data/test/unit/crawler_test.rb +16 -36
  25. data/test/unit/model/route_test.rb +14 -25
  26. data/test/unit/model/stop_test.rb +6 -31
  27. data/test/unit/model/stop_time_test.rb +11 -0
  28. data/test/unit/model/trip_test.rb +28 -0
  29. data/test/unit/page/route_test.rb +38 -28
  30. data/test/unit/page/timetable_test.rb +12 -10
  31. data/test/unit/page/trip_test.rb +38 -22
  32. data/test/unit/page_test.rb +1 -1
  33. data/translink.gemspec +2 -2
  34. metadata +24 -27
  35. data/lib/translink/code.rb +0 -9
  36. data/lib/translink/model/service.rb +0 -20
  37. data/lib/translink/model/stop/extractor.rb +0 -67
  38. data/test/unit/code_test.rb +0 -12
  39. data/test/unit/model/service_test.rb +0 -23
  40. data/test/unit/model/stop/extractor_test.rb +0 -112
data/test/fixtures/sample/timetable.html CHANGED
@@ -1,44 +1,20 @@
1
-
2
1
  <!DOCTYPE html>
3
2
  <html lang="en-au">
4
- <head><meta name="google-site-verification" content="nNhS0Na_38DlBjVO22yfHnekgn6xyusSgs0wqs4yDQ8" />
5
- <link rel="stylesheet" href="/utilities/css/common.css_v1.7.7.139" type="text/css" media="screen, print" />
6
- <!--[if lte IE 8]>
7
- <style type="text/css">
8
- #container-shadow {
9
- zoom: 1;
10
- background-color: #FFF;
11
- -ms-filter: "progid:DXImageTransform.Microsoft.Blur(PixelRadius=5,MakeShadow=true,ShadowOpacity=0.30)";
12
- padding: 0 0 0 10px;
13
- }
14
- .megamenu { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efeded', endColorstr='#d9d3d4'); }
15
- .searchform .searchbutton { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9e9e9e', endColorstr='#454545'); }
16
- .greyButton { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#999999', endColorstr='#555555'); }
17
- </style>
18
- <![endif]-->
19
- <!--[if lte IE 7]> <link href="/utilities/css/styles-ie-lte7.css_v1.7.7.139" media="screen" rel="stylesheet" type="text/css" ><![endif]-->
20
- <!--[if lte IE 6]> <link href="/utilities/css/styles-ie-lte6.css_v1.7.7.139" media="screen" rel="stylesheet" type="text/css" ><![endif]-->
21
- <!--[if gte IE 9]> <style type="text/css">.blueButton, .greyButton, .searchform .searchbutton { filter: none; }</style><![endif]-->
22
- <link rel="stylesheet" href="/utilities/css/print.css_v1.7.7.139" type="text/css" media="print" />
23
-
24
- <script src="/utilities/common-javascript_v1.7.7.139" type="text/javascript" charset="utf-8"></script>
25
-
26
- <script type="text/javascript">
27
- var _gaq = _gaq || [];
28
- _gaq.push(['_setAccount', 'UA-18464408-1']);
29
- _gaq.push(['_setDomainName', '.translink.com.au']);
30
- _gaq.push(['_trackPageview', '/travel-information/services-and-timetables/buses/bus-timetables']);
31
- (function () {
32
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
33
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
34
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
35
- })();
36
- </script>
3
+ <head>
4
+ <meta name="google-site-verification" content="nNhS0Na_38DlBjVO22yfHnekgn6xyusSgs0wqs4yDQ8" />
5
+ <link rel="stylesheet" href="/utilities/css/common-v2.1.2.29" type="text/css" media="screen, print" />
6
+ <link rel="stylesheet" href="/utilities/css/print-v2.1.2.29" type="text/css" media="print" />
7
+ <script src="/utilities/common-javascript-v2.1.2.29" type="text/javascript" charset="utf-8"></script>
37
8
 
38
- <title>
39
- Bus timetables | TransLink
40
- </title><meta name="description" content="TransLink is your one stop for public transport information, and coordinates and integrates public transport services in South East Queensland." /><meta name="keywords" content="TransLink,public,transport,information,bus,train,ferry,timetables,maps,events,service updates,announcements,go card,fares,tickets" /><meta name="author" content="TransLink Transit Authority" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
41
- <!-- Data: 8 November, 2011 -->
9
+ <title>All bus timetables | TransLink</title>
10
+ <meta name="description" content="TransLink is your one stop for public transport information, and coordinates and integrates public transport services in South East Queensland." />
11
+ <meta name="keywords" content="TransLink,public,transport,information,bus,train,ferry,timetables,maps,events,service updates,announcements,go card,fares,tickets" />
12
+ <meta name="author" content="TransLink Transit Authority" />
13
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
14
+ <!--[if lte IE 8]><style type="text/css">#suggestion-box { background-color: #DCDCDC; }</style><![endif]-->
15
+ <!--[if lte IE 7]>
16
+ <link rel="stylesheet" type="text/css" href="/utilities/css/nonstandard-ie-v2.1.2.29" />
17
+ <![endif]-->
42
18
  </head>
43
19
  <body>
44
20
  <ul class="access">
@@ -53,33 +29,33 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
53
29
  <div id="courtesy-nav">
54
30
  <ul id="courtesy-links">
55
31
  <li><a href="http://translink.com.au/utils/goto/context/mobile" title="View the website on your mobile">Mobile site</a></li>
56
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/online" title="go card"><i>go</i> card login</a></li>
32
+ <li><a href="http://translink.com.au/tickets-and-fares/go-card/online" title="go card login (opens in a new window)"><i>go</i> card login</a></li>
57
33
  <li><a href="http://translink.com.au/site-information/site-map" title="An overview of the entire TransLink website">Site map</a></li>
58
- <li class="last"><a href="http://translink.com.au/site-information/contact-us-and-help" title="Call us on 13 12 30, e-mail us, see us in person, follow us on Twitter, or send us a letter.">Contact us &amp; help</a></li>
34
+ <li class="last"><a href="http://translink.com.au/site-information/contact-us-and-help" title="Call us on 13 12 30, email us, see us in person, follow us on Twitter, or send us a letter.">Contact us &amp; help</a></li>
59
35
  </ul>
60
36
  </div>
61
37
  <div id="header-content">
62
38
  <h1 class="access">TransLink - Integrated public transport for South East Queensland</h1>
63
- <a href="http://translink.com.au/" title="TransLink"><img src="/Content/Images/logo_topleft_translink.png" alt="TransLink" style="width: 237px; height: 46px;" class="logo" /></a>
39
+ <a href="http://translink.com.au/" title="TransLink"><img src="/Content/Images/translink-logo.png" alt="TransLink" style="width: 237px; height: 46px;" class="logo" /></a>
64
40
  <img src="/Content/Images/tagline.png" alt="Making travel easy" class="tagline" style="height: 46px; width: 206px;" />
65
41
  </div>
66
42
  <a id="navigation-shortcut" tabindex="0"></a>
67
43
  <div id="main-nav" class="clearfix">
68
44
  <div id="header-search" class="rightalign">
69
- <form action="http://translink.com.au/site-information/search/results" method="get" id="search" class="searchform jLabel" name="search">
45
+ <form action="http://translink.com.au/site-information/search/results" method="get" id="search" class="searchform" name="search">
70
46
  <fieldset>
71
47
  <legend class="access">Search the TransLink website</legend>
72
48
  <p>
73
49
  <label for="searchbox" id="searchlabel1">Search site&hellip;</label>
74
- <input type="text" name="query" id="searchbox" value="" class="searchfield" />
50
+ <input type="text" name="query" id="searchbox" value="" class="searchfield" placeholder="Search site&hellip;" />
75
51
  <input type="submit" value="Search" class="searchbutton" />
76
52
  </p>
77
53
  </fieldset>
78
54
  </form>
79
55
  </div>
80
- <ul class="textShadowLight">
56
+ <ul class="text-shadow-light">
81
57
  <li><a href="http://translink.com.au/" title="TransLink - Home">Home</a></li>
82
- <li><a href="http://translink.com.au/travel-information" id="travelMenuLink">Travel information</a>
58
+ <li class="this-page"><a href="http://translink.com.au/travel-information" id="travelMenuLink">Travel information</a>
83
59
  <div id="travelMenu" class="megamenu">
84
60
  <div class="column">
85
61
  <ul>
@@ -87,30 +63,18 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
87
63
  <a href="/travel-information/journey-planner">Journey planner</a>
88
64
  <ul>
89
65
  <li><a href="/travel-information/journey-planner">Journey planner</a></li>
90
- <li><a href="/travel-information/journey-planner/train-planner">Train journey planner</a></li>
91
- <li><a href="/travel-information/journey-planner/ferry-planner">Ferry journey planner</a></li>
92
66
  </ul>
93
67
  </li>
94
68
  <li>
95
- <a href="http://translink.com.au/travel-information/services-and-timetables">Services and timetables</a>
69
+ <a href="http://translink.com.au/travel-information/network-information">Network information</a>
96
70
  <ul>
97
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/search">Find services and timetables</a></li>
98
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/buses">Buses</a></li>
99
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/trains">Trains</a></li>
100
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/ferries">Ferries</a></li>
101
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/event-transport">Event transport</a></li>
102
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/school-transport">School transport</a></li>
103
- <li><a href="http://translink.com.au/travel-information/services-and-timetables/late-night-services">Late night services</a></li>
104
- <li><a href="/travel-information/services-and-timetables/stop-to-stop">Stop-to-stop timetables</a></li>
105
- <li><a href="http://translink.com.au/travel-information/services-and-timetables">More...</a></li>
106
- </ul>
107
- </li>
108
- </ul>
109
- <ul>
110
- <li>
111
- <a href="http://translink.com.au/travel-information/maps">Maps</a>
112
- <ul>
113
- <li><a href="http://translink.com.au/travel-information/maps">Maps</a></li>
71
+ <li><a href="/travel-information/network-information/timetables">Timetables</a></li>
72
+ <li><a href="/travel-information/network-information/stops-and-stations">Stops and stations</a></li>
73
+ <li><a href="http://translink.com.au/travel-information/network-information/maps">Maps</a></li>
74
+ <li><a href="http://translink.com.au/travel-information/network-information/event-transport">Event transport</a></li>
75
+ <li><a href="http://translink.com.au/travel-information/network-information/late-night-services">Late night services</a></li>
76
+ <li><a href="http://translink.com.au/travel-information/network-information/school-transport">School transport</a></li>
77
+ <li><a href="http://translink.com.au/travel-information/network-information/track-closures">Planned track works</a></li>
114
78
  </ul>
115
79
  </li>
116
80
  </ul>
@@ -118,48 +82,24 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
118
82
  <div class="column">
119
83
  <ul>
120
84
  <li>
121
- <a href="http://translink.com.au/travel-information/service-updates">Service updates</a>
85
+ <a href="/travel-information/service-updates">Service updates</a>
122
86
  <ul>
123
- <li><a href="http://translink.com.au/travel-information/service-updates">Current status and upcoming changes</a></li>
87
+ <li><a href="/travel-information/service-updates">Current status and upcoming changes</a></li>
124
88
  <li><a href="http://translink.com.au/travel-information/service-updates/about-service-updates">About service updates</a></li>
125
- <li><a href="http://translink.com.au/travel-information/service-updates/queensland-rail-timetable-changes">Queensland Rail timetable changes</a></li>
126
- <li><a href="http://translink.com.au/travel-information/service-updates/richlands-station">Richlands station</a></li>
127
- </ul>
128
- </li>
129
- </ul>
130
- <ul>
131
- <li>
132
- <a href="http://translink.com.au/travel-information/stops-and-stations">Stops and stations</a>
133
- <ul>
134
- <li><a href="http://translink.com.au/travel-information/stops-and-stations/train-stations">Train stations</a></li>
135
- <li><a href="http://translink.com.au/travel-information/stops-and-stations/busway-stations">Busway stations</a></li>
136
- <li><a href="http://translink.com.au/travel-information/stops-and-stations/ferry-terminals">Ferry terminals</a></li>
137
- <li><a href="/travel-information/stops-and-stations/stop-timetables">Stop timetables</a></li>
138
- <li><a href="/travel-information/stops-and-stations/stops-near-you">Stops near you</a></li>
139
- <li><a href="http://translink.com.au/travel-information/stops-and-stations/bicycle-facilities">Bicycle facilities</a></li>
140
89
  </ul>
141
90
  </li>
142
91
  </ul>
143
92
  <ul>
144
93
  <li>
145
- <a href="http://translink.com.au/travel-information/accessibility">Accessibility</a>
94
+ <a href="http://translink.com.au/travel-information/accessibility-and-safety">Accessibility and safety</a>
146
95
  <ul>
147
- <li><a href="http://translink.com.au/travel-information/accessibility">Accessible services</a></li>
96
+ <li><a href="http://translink.com.au/travel-information/accessibility-and-safety/accessible-services">Accessible services</a></li>
97
+ <li><a href="http://translink.com.au/travel-information/accessibility-and-safety/safety-and-security">Safety and security</a></li>
148
98
  </ul>
149
99
  </li>
150
100
  </ul>
151
101
  <ul>
152
102
  <li>
153
- <a href="http://translink.com.au/travel-information/safety-and-security">Safety and security</a>
154
- <ul>
155
- <li><a href="http://translink.com.au/travel-information/safety-and-security">Safety and security</a></li>
156
- </ul>
157
- </li>
158
- </ul>
159
- </div>
160
- <div class="column">
161
- <ul>
162
- <li>
163
103
  <a href="http://translink.com.au/travel-information/visiting-south-east-queensland">Visiting South East Queensland</a>
164
104
  <ul>
165
105
  <li><a href="http://translink.com.au/travel-information/visiting-south-east-queensland">Visiting South East Queensland</a></li>
@@ -167,18 +107,18 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
167
107
  </ul>
168
108
  </li>
169
109
  </ul>
110
+ </div>
111
+ <div class="column">
170
112
  <ul>
171
113
  <li>
172
- <a href="http://translink.com.au/travel-information/how-to">How to</a>
173
- <ul>
174
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-bus">How to use the bus</a></li>
175
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-train">How to use the train</a></li>
176
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-ferry">How to use the ferry</a></li>
177
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-find-your-bus-stop">How to find your bus stop</a></li>
178
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-plan-your-journey">How to plan your journey</a></li>
179
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-transfer-between-services">How to transfer between services</a></li>
180
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-travel-with-children-and-prams">How to travel with children and prams</a></li>
181
- <li><a href="http://translink.com.au/travel-information/how-to/how-to-travel-with-large-items">How to travel with large items</a></li>
114
+ <a href="http://translink.com.au/travel-information/how-to" title="Travel information how to guides">How to</a>
115
+ <ul>
116
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-bus">use the bus</a></li>
117
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-train">use the train</a></li>
118
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-use-the-ferry">use the ferry</a></li>
119
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-plan-your-journey">plan your journey</a></li>
120
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-transfer-between-services">transfer between services</a></li>
121
+ <li><a href="http://translink.com.au/travel-information/how-to/how-to-travel-with-children-prams-or-large-items">travel with children or large items</a></li>
182
122
  <li><a href="http://translink.com.au/travel-information/how-to/tips-for-courteous-behaviour">Tips for courteous behaviour</a></li>
183
123
  </ul>
184
124
  </li>
@@ -186,43 +126,40 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
186
126
  </div>
187
127
  </div>
188
128
  </li>
189
- <li><a href="http://translink.com.au/tickets-and-fares" id="ticketsMenuLink">Tickets and fares</a>
190
- <div id="ticketsMenu" class="megamenu">
129
+ <li><a href="http://translink.com.au/tickets-and-fares">Tickets and fares</a>
130
+ <div class="megamenu">
191
131
  <div class="column">
192
132
  <ul>
193
133
  <li>
194
134
  <a href="http://translink.com.au/tickets-and-fares/go-card"><i>go</i> card</a>
195
135
  <ul>
196
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/about-go-card">About <i>go</i> card</a></li>
197
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/locations">Where to get it</a></li>
198
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/register-your-go-card">Register your <i>go</i> card</a></li>
199
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/top-up-your-go-card">Top up your <i>go</i> card.</a></li>
200
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/costs-and-discounts">Costs and discounts</a></li>
201
- <li><a href="http://translink.com.au/tickets-and-fares/go-card/more">More...</a></li>
136
+ <li><a href="http://translink.com.au/tickets-and-fares/go-card/online"><i>go</i> card account sign in</a></li>
137
+ <li><a href="http://translink.com.au/tickets-and-fares/go-card/new-to-go-card">New to <i>go</i> card?</a></li>
138
+ <li><a href="http://translink.com.au/tickets-and-fares/go-card/i-have-a-go-card">I have a <i>go</i> card</a></li>
139
+ <li><a href="http://translink.com.au/tickets-and-fares/go-card/buy-a-go-card">Where to buy and top up</a></li>
202
140
  </ul>
203
141
  </li>
204
142
  </ul>
205
- </div>
206
- <div class="column">
207
143
  <ul>
208
144
  <li>
209
145
  <a href="http://translink.com.au/tickets-and-fares/other-tickets">Other tickets</a>
210
146
  <ul>
211
147
  <li><a href="http://translink.com.au/tickets-and-fares/other-tickets/paper-tickets">Paper tickets</a></li>
212
- <li><a href="http://translink.com.au/tickets-and-fares/other-tickets/school-travel-passes">School travel passes</a></li>
148
+ <li><a href="http://translink.com.au/tickets-and-fares/other-tickets/school-tickets-and-fares">School tickets and fares</a></li>
213
149
  <li><a href="http://translink.com.au/tickets-and-fares/other-tickets/special-access-passes">Special access passes</a></li>
214
150
  </ul>
215
151
  </li>
216
152
  </ul>
153
+ </div>
154
+ <div class="column">
217
155
  <ul>
218
156
  <li>
219
157
  <a href="http://translink.com.au/tickets-and-fares/fares">Fares</a>
220
158
  <ul>
221
159
  <li><a href="http://translink.com.au/tickets-and-fares/fares/current-fares">Current fares</a></li>
222
- <li><a href="http://translink.com.au/tickets-and-fares/fares/changes-to-fares-and-ticketing-in-2011">Changes to fares and ticketing in 2011</a></li>
223
160
  <li><a href="http://translink.com.au/tickets-and-fares/fares/changes-to-fares-and-ticketing-in-2012">Changes to fares and ticketing in 2012</a></li>
224
161
  <li><a href="http://translink.com.au/tickets-and-fares/fares/concessions">Concessions</a></li>
225
- <li><a href="http://translink.com.au/tickets-and-fares/fares/peak-and-off-peak-times">Peak and off-peak times</a></li>
162
+ <li><a href="http://translink.com.au/tickets-and-fares/fares/off-peak-times">Off-peak times</a></li>
226
163
  <li><a href="http://translink.com.au/tickets-and-fares/fares/fare-zones">Zones</a></li>
227
164
  <li><a href="http://translink.com.au/tickets-and-fares/fares/conditions-of-travel">Conditions of travel</a></li>
228
165
  <li><a href="http://translink.com.au/tickets-and-fares/fares/discounts-and-ways-to-save">Discounts and ways to save</a></li>
@@ -233,12 +170,11 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
233
170
  <div class="column">
234
171
  <ul>
235
172
  <li>
236
- <a href="http://translink.com.au/tickets-and-fares/how-to">How to</a>
173
+ <a href="http://translink.com.au/tickets-and-fares/how-to" title="Tickets and fares how to guides">How to</a>
237
174
  <ul>
238
- <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-use-a-fare-machine">How to use a fare machine</a></li>
239
- <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-buy-a-ticket">How to buy a ticket</a></li>
240
- <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-claim-a-refund-for-incorrect-change">How to claim a refund for incorrect change</a></li>
241
- <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-upgrade-your-ticket">How to upgrade your ticket</a></li>
175
+ <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-use-a-fare-machine">use a fare machine</a></li>
176
+ <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-buy-a-ticket">buy a ticket</a></li>
177
+ <li><a href="http://translink.com.au/tickets-and-fares/how-to/how-to-claim-a-refund-for-incorrect-change">claim a refund for incorrect change</a></li>
242
178
  <li><a href="http://translink.com.au/tickets-and-fares/how-to/tickets-and-fares-after-midnight">Tickets and fares after midnight</a></li>
243
179
  </ul>
244
180
  </li>
@@ -246,9 +182,9 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
246
182
  </div>
247
183
  </div>
248
184
  </li>
249
- <li><a href="http://translink.com.au/news-and-updates" id="newsMenuLink">News and updates</a></li>
250
- <li><a href="http://translink.com.au/about-translink" id="aboutusMenuLink">About TransLink</a>
251
- <div id="aboutusMenu" class="megamenu">
185
+ <li><a href="http://translink.com.au/news-and-updates">News and updates</a></li>
186
+ <li><a href="http://translink.com.au/about-translink">About TransLink</a>
187
+ <div class="megamenu">
252
188
  <div class="column">
253
189
  <ul>
254
190
  <li>
@@ -267,10 +203,13 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
267
203
  <a href="http://translink.com.au/about-translink/what-we-do">What we do</a>
268
204
  <ul>
269
205
  <li><a href="http://translink.com.au/about-translink/what-we-do/strategic-plan">Strategic plan</a></li>
206
+ <li><a href="http://translink.com.au/about-translink/what-we-do/ticket-and-fare-integration">Ticket and fare integration</a></li>
270
207
  <li><a href="http://translink.com.au/about-translink/what-we-do/customer-research">Customer research</a></li>
271
208
  <li><a href="http://translink.com.au/about-translink/what-we-do/customer-service">Customer service</a></li>
272
209
  <li><a href="http://translink.com.au/about-translink/what-we-do/public-transport-planning">Public transport planning</a></li>
273
210
  <li><a href="http://translink.com.au/about-translink/what-we-do/infrastructure-projects">Infrastructure projects</a></li>
211
+ <li><a href="http://translink.com.au/about-translink/what-we-do/benefits-of-public-transport">Benefit of public transport</a></li>
212
+ <li><a href="http://translink.com.au/about-translink/what-we-do/awards">Awards</a></li>
274
213
  </ul>
275
214
  </li>
276
215
  </ul>
@@ -291,8 +230,9 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
291
230
  <li><a href="http://translink.com.au/about-translink/reporting-and-publications/media-releases">Media releases</a></li>
292
231
  <li><a href="http://translink.com.au/about-translink/reporting-and-publications/annual-and-quarterly-reports">Annual and quarterly reports</a></li>
293
232
  <li><a href="http://translink.com.au/about-translink/reporting-and-publications/key-facts-and-figures">Key facts and figures</a></li>
294
- <li><a href="http://translink.com.au/about-translink/reporting-and-publications/right-to-information">Right to information</a></li>
295
233
  <li><a href="http://translink.com.au/about-translink/reporting-and-publications/translink-network-plan">TransLink Network Plan</a></li>
234
+ <li><a href="http://translink.com.au/about-translink/reporting-and-publications/right-to-information">Right to information</a></li>
235
+ <li><a href="http://translink.com.au/about-translink/reporting-and-publications/special-event-declaration">Special event declaration</a></li>
296
236
  </ul>
297
237
  </li>
298
238
  </ul>
@@ -330,20 +270,17 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
330
270
  <span class="access">You are here:</span>
331
271
  <p>
332
272
  <a href="http://translink.com.au/">Home</a>
333
- <a href="http://translink.com.au/travel-information">Travel information</a>
334
-
335
- <a href="http://translink.com.au/travel-information/services-and-timetables">Services and timetables</a>
336
-
337
- <a href="http://translink.com.au/travel-information/services-and-timetables/buses">Buses</a>
338
- <a href="/travel-information/services-and-timetables/buses/bus-timetables">Bus timetables</a>
339
- Bus timetables
273
+ <a href="http://translink.com.au/travel-information">Travel information</a>
274
+
275
+ <a href="http://translink.com.au/travel-information/network-information">Network information</a>
276
+ <a href="/travel-information/network-information/timetables">Timetables</a>
340
277
 
341
278
  </p>
342
279
  </div>
343
- <div id="contentleftCol">
280
+ <div id="content-left-column">
344
281
  <div id="headingBar" class="clearfix">
345
- <h1>Bus timetables</h1>
346
- <span id="print"><a href="javascript:window.print()" class="noBorder">Print</a></span>
282
+ <h1>All bus timetables</h1>
283
+ <span id="print"><a href="javascript:window.print()" class="no-border">Print</a></span>
347
284
  <span id="resize_up"><a href="#">increase text size</a></span>
348
285
  <span id="resize_mid"><a href="#">reset text size</a></span>
349
286
  <span id="resize_down"><a href="#">decrease text size</a></span>
@@ -351,77 +288,92 @@ Bus timetables
351
288
  <div class="underline indented">&nbsp;</div>
352
289
 
353
290
 
354
- <div class="useful_green">
355
- <form action="/travel-information/services-and-timetables/buses/bus-timetables" method="post">
356
- <span class="inputGroup">
357
- <label for="RouteNumber">Bus route code</label><br />
358
- <input id="RouteNumber" name="RouteNumber" type="text" value="" />
291
+
292
+
293
+
294
+ <div class="useful">
295
+ <form action="/travel-information/network-information/timetables" method="post"> <div>
296
+ <span class="input-group">
297
+ <label for="RouteCode">Route code</label><br />
298
+ <input id="RouteCode" name="RouteCode" type="text" value="" />
359
299
  </span>
360
- <span class="inputGroup">
361
- <label for="TimetableDate">Date</label><br />
362
- <select class="dateSelection" id="TimetableDate" name="TimetableDate"><option value="2011-11-13">Today (Sunday)</option>
363
- <option selected="selected" value="2011-11-14">Mon 14 Nov 2011</option>
364
- <option value="2011-11-15">Tue 15 Nov 2011</option>
365
- <option value="2011-11-16">Wed 16 Nov 2011</option>
366
- <option value="2011-11-17">Thu 17 Nov 2011</option>
367
- <option value="2011-11-18">Fri 18 Nov 2011</option>
368
- <option value="2011-11-19">Sat 19 Nov 2011</option>
369
- <option value="2011-11-20">Sun 20 Nov 2011</option>
370
- <option value="2011-11-21">Mon 21 Nov 2011</option>
371
- <option value="2011-11-22">Tue 22 Nov 2011</option>
372
- <option value="2011-11-23">Wed 23 Nov 2011</option>
373
- <option value="2011-11-24">Thu 24 Nov 2011</option>
374
- <option value="2011-11-25">Fri 25 Nov 2011</option>
375
- <option value="2011-11-26">Sat 26 Nov 2011</option>
376
- <option value="2011-11-27">Sun 27 Nov 2011</option>
377
- <option value="2011-11-28">Mon 28 Nov 2011</option>
378
- <option value="2011-11-29">Tue 29 Nov 2011</option>
379
- <option value="2011-11-30">Wed 30 Nov 2011</option>
380
- <option value="2011-12-01">Thu 1 Dec 2011</option>
381
- <option value="2011-12-02">Fri 2 Dec 2011</option>
382
- <option value="2011-12-03">Sat 3 Dec 2011</option>
383
- <option value="2011-12-04">Sun 4 Dec 2011</option>
384
- <option value="2011-12-05">Mon 5 Dec 2011</option>
385
- <option value="2011-12-06">Tue 6 Dec 2011</option>
386
- <option value="2011-12-07">Wed 7 Dec 2011</option>
387
- <option value="2011-12-08">Thu 8 Dec 2011</option>
388
- <option value="2011-12-09">Fri 9 Dec 2011</option>
300
+ <span class="input-group">
301
+ <label for="Date">Date</label><br />
302
+ <select class="dateSelection" id="Date" name="Date"><option selected="selected" value="21/06/2012 12:00:00 AM">Today (Thursday)</option>
303
+ <option value="22/06/2012 12:00:00 AM">Fri 22 Jun 2012</option>
304
+ <option value="23/06/2012 12:00:00 AM">Sat 23 Jun 2012</option>
305
+ <option value="24/06/2012 12:00:00 AM">Sun 24 Jun 2012</option>
306
+ <option value="25/06/2012 12:00:00 AM">Mon 25 Jun 2012</option>
307
+ <option value="26/06/2012 12:00:00 AM">Tue 26 Jun 2012</option>
308
+ <option value="27/06/2012 12:00:00 AM">Wed 27 Jun 2012</option>
309
+ <option value="28/06/2012 12:00:00 AM">Thu 28 Jun 2012</option>
310
+ <option value="29/06/2012 12:00:00 AM">Fri 29 Jun 2012</option>
311
+ <option value="30/06/2012 12:00:00 AM">Sat 30 Jun 2012</option>
312
+ <option value="1/07/2012 12:00:00 AM">Sun 1 Jul 2012</option>
313
+ <option value="2/07/2012 12:00:00 AM">Mon 2 Jul 2012</option>
314
+ <option value="3/07/2012 12:00:00 AM">Tue 3 Jul 2012</option>
315
+ <option value="4/07/2012 12:00:00 AM">Wed 4 Jul 2012</option>
316
+ <option value="5/07/2012 12:00:00 AM">Thu 5 Jul 2012</option>
317
+ <option value="6/07/2012 12:00:00 AM">Fri 6 Jul 2012</option>
318
+ <option value="7/07/2012 12:00:00 AM">Sat 7 Jul 2012</option>
319
+ <option value="8/07/2012 12:00:00 AM">Sun 8 Jul 2012</option>
320
+ <option value="9/07/2012 12:00:00 AM">Mon 9 Jul 2012</option>
321
+ <option value="10/07/2012 12:00:00 AM">Tue 10 Jul 2012</option>
322
+ <option value="11/07/2012 12:00:00 AM">Wed 11 Jul 2012</option>
323
+ <option value="12/07/2012 12:00:00 AM">Thu 12 Jul 2012</option>
324
+ <option value="13/07/2012 12:00:00 AM">Fri 13 Jul 2012</option>
325
+ <option value="14/07/2012 12:00:00 AM">Sat 14 Jul 2012</option>
326
+ <option value="15/07/2012 12:00:00 AM">Sun 15 Jul 2012</option>
327
+ <option value="16/07/2012 12:00:00 AM">Mon 16 Jul 2012</option>
328
+ <option value="17/07/2012 12:00:00 AM">Tue 17 Jul 2012</option>
329
+ <option value="18/07/2012 12:00:00 AM">Wed 18 Jul 2012</option>
330
+ <option value="19/07/2012 12:00:00 AM">Thu 19 Jul 2012</option>
331
+ <option value="20/07/2012 12:00:00 AM">Fri 20 Jul 2012</option>
389
332
  </select>
390
333
  </span>
391
- <span class="inputGroupButtons" style="text-align: right;">
392
- <input type="submit" value="Search" class="blueButton" />
393
- </span>
394
- </form>
395
334
  </div>
396
-
397
- <div class="content">
398
- <p>Please select one of the following timetables:</p>
399
- <table class="contentTable">
335
+ <div>
336
+ <fieldset>
337
+ <legend>Service types</legend>
338
+ <span class="single-line"><input checked="checked" id="ServiceModeRegular" name="ServiceTypes" tabindex="13" type="checkbox" value="Regular" /> <label for="ServiceModeRegular">Regular</label></span>
339
+ <span class="single-line"><input checked="checked" id="ServiceModeExpress" name="ServiceTypes" tabindex="14" type="checkbox" value="Express" /> <label for="ServiceModeExpress">Express</label></span>
340
+ <span class="single-line"><input checked="checked" id="ServiceModeNightLink" name="ServiceTypes" tabindex="15" type="checkbox" value="NightLink" /> <label for="ServiceModeNightLink">NightLink</label></span>
341
+ <span class="single-line"><input id="ServiceModeSchool" name="ServiceTypes" tabindex="16" type="checkbox" value="School" /> <label for="ServiceModeSchool">School</label></span>
342
+ </fieldset>
343
+ </div>
344
+ <div class="right-align">
345
+ <input type="submit" value="Search" class="action-button" />
346
+ </div>
347
+ </form></div><div class="content">
348
+ <p>Click on a bus route name below to see today&#39;s timetable.</p>
349
+ <table class="content-table">
400
350
  <caption class="access">Timetable search results</caption>
401
351
  <thead>
402
352
  <tr>
403
- <th>Route code</th>
404
- <th>Route name</th>
405
- </tr>
353
+ <th>Route code</th>
354
+ <th>Route name</th>
355
+ </tr>
406
356
  </thead>
407
357
  <tbody>
408
-
409
- <tr>
410
- <td><a href="/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&amp;direction=Outbound&amp;routeCode=130">130 - Outbound</a></td>
411
- <td><a href="/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&amp;direction=Outbound&amp;routeCode=130">Parkinson Buz 130 Via Sunnybank</a></td>
358
+ <tr>
359
+ <td>130</td>
360
+ <td><a href="/travel-information/network-information/buses/130">City, Griffith Uni, Sunnybank Hills, Algester, Parkinson</a></td>
412
361
  </tr>
413
-
414
- </tbody>
362
+ </tbody>
415
363
  </table>
416
364
  </div>
417
-
418
365
  </div>
419
- <div id="contentrightCol" class="clearfix">
366
+ <div id="content-right-column" class="clearfix">
420
367
 
421
368
 
422
-
423
- </div>
424
- </div>
369
+ <div class="advertisement">
370
+ <p>Advertisement</p>
371
+ <a href="http://www.visitbrisbane.com.au/Travel/Events.aspx?utm_source=translink-website&amp;utm_medium=online-ad&amp;utm_content=skyscraper&amp;utm_campaign=visit-brisbane" title="Discover Brisbane" target="_blank">
372
+ <img src="/travel-information/utilities/ad-content/11" style="width: 160px; height: 600px;" alt="Discover Brisbane" />
373
+ </a>
374
+ </div>
375
+ </div>
376
+ </div>
425
377
  <a id="footer-shortcut" tabindex="0"></a>
426
378
  <div id="footer">
427
379
  <div id="footer-nav">
@@ -433,20 +385,18 @@ Bus timetables
433
385
  <a href="/travel-information/journey-planner" title="Plan your journey">Journey planner</a>
434
386
  </li>
435
387
  <li>
436
- <a href="http://translink.com.au/travel-information/services-and-timetables" title="View information about our services and timetables">Services and timetables</a>
388
+ <a href="http://translink.com.au/travel-information/network-information" title="View information about our network">Network information</a>
437
389
  </li>
438
390
  <li>
439
- <a href="http://translink.com.au/travel-information/maps" title="See our maps">
391
+ <a href="http://translink.com.au/travel-information/network-information/maps" title="See our maps">
440
392
  Maps
441
393
  </a>
442
394
  </li>
443
395
  <li>
444
- <a href="http://translink.com.au/travel-information/service-updates" title="View current status and upcoming changes">
445
- Service updates
446
- </a>
396
+ <a href="/travel-information/service-updates" title="View current status and upcoming changes">Service updates</a>
447
397
  </li>
448
398
  <li>
449
- <a href="http://translink.com.au/travel-information/how-to" title="How to guides">
399
+ <a href="http://translink.com.au/travel-information/how-to" title="Travel information how to guides">
450
400
  How to&hellip;
451
401
  </a>
452
402
  </li>
@@ -469,12 +419,11 @@ More travel information</a></li>
469
419
  <li>
470
420
  <a href="http://translink.com.au/tickets-and-fares/fares" title="View information about fares">Fares</a>
471
421
  </li>
472
- <li><a href="http://translink.com.au/tickets-and-fares/how-to" title="How to guides">
422
+ <li><a href="http://translink.com.au/tickets-and-fares/how-to" title="Ticket and fares how to guides">
473
423
  How to&hellip;</a></li>
474
424
  </ul>
475
425
  <ul>
476
- <li><a href="http://translink.com.au/tickets-and-fares" title="More on tickets and fares">More
477
- on tickets and fares</a></li>
426
+ <li><a href="http://translink.com.au/tickets-and-fares" title="More on tickets and fares">More on tickets and fares</a></li>
478
427
  </ul>
479
428
  </div>
480
429
  <div id="footer-about" class="leftalign">
@@ -504,9 +453,9 @@ on tickets and fares</a></li>
504
453
  </ul>
505
454
  </div>
506
455
  <div id="footer-searchbox" class="rightalign">
507
- <h3 id="cantfindheading">
508
- Can't find what you're looking for? Try&hellip;</h3>
509
- <form action="http://pan.search.qld.gov.au/search/search.cgi" class="searchform jLabel" id="footer-search" name="footer-search">
456
+ <h2 id="cantfindheading">
457
+ Can't find what you're looking for? Try&hellip;</h2>
458
+ <form action="http://pan.search.qld.gov.au/search/search.cgi" class="searchform" id="footer-search" name="footer-search">
510
459
  <fieldset>
511
460
  <legend class="access">Search the TransLink website</legend>
512
461
  <input type="hidden" name="num_ranks" value="10" />
@@ -514,10 +463,8 @@ Can't find what you're looking for? Try&hellip;</h3>
514
463
  <input type="hidden" name="collection" value="qld-gov" />
515
464
  <input type="hidden" name="profile" value="translink" />
516
465
  <p>
517
- <label for="searchbox2" id="searchlabel2">
518
- Search site&hellip;</label>
519
- <input type="text" name="query" id="searchbox2" value="" class="searchfield" autocomplete="off" /><input
520
- type="submit" value="Search" class="searchbutton" id="footersearch-button" />
466
+ <label for="searchbox2" id="searchlabel2">Search site&hellip;</label>
467
+ <input type="text" name="query" id="searchbox2" value="" class="searchfield" autocomplete="off" placeholder="Search site&hellip;" /><input type="submit" value="Search" class="searchbutton" id="footersearch-button" />
521
468
  </p>
522
469
  </fieldset>
523
470
  </form>
@@ -527,15 +474,10 @@ type="submit" value="Search" class="searchbutton" id="footersearch-button" />
527
474
  <li><a href="http://translink.com.au/site-information/site-map" title="An overview of the entire TransLink website">Site map</a></li>
528
475
  <li class="last"><a href="http://translink.com.au/site-information/contact-us-and-help" title="Call us on 13 12 30, e-mail us, see us in person, follow us on Twitter, or send us a letter.">Contact us &amp; help</a></li>
529
476
  </ul>
530
- <div id="footer-icons">
531
- <a class="hotspot1" href="http://translink.com.au/travel-information/services-and-timetables/buses" title="View the bus services page.">&nbsp;</a>
532
- <a class="hotspot2" href="http://translink.com.au/travel-information/services-and-timetables/trains" title="View the train services page.">&nbsp;</a>
533
- <a class="hotspot3" href="http://translink.com.au/travel-information/services-and-timetables/ferries" title="View the ferry services page.">&nbsp;</a>
534
477
  </div>
535
478
  </div>
536
- </div>
537
- <div id="footer-languages" class="textShadowDark">
538
- <h3>Information in your language</h3>
479
+ <div id="footer-languages" class="text-shadow-dark">
480
+ <h2>Information in your language</h2>
539
481
  <ul id="section-other-languages" class="clearfix">
540
482
  <li class="first"><a href="http://translink.com.au/site-information/languages/arabic" title="Arabic"><span dir="rtl">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</span></a></li>
541
483
  <li><a href="http://translink.com.au/site-information/languages/chinese" title="Chinese">&#31616;&#20307;&#20013;&#25991;</a></li>
@@ -558,11 +500,23 @@ type="submit" value="Search" class="searchbutton" id="footersearch-button" />
558
500
  <li><a href="http://translink.com.au/about-translink/reporting-and-publications/right-to-information" title="Right to information">Right to information</a></li>
559
501
  <li class="last"><a href="http://translink.com.au/site-information/contact-us-and-help/website-help" title="Website help">Website help</a></li>
560
502
  </ul>
561
- <p>&copy; TransLink Transit Authority 2010 <span style="color: #999;">v1.7.7.139</span></p>
503
+ <p>&copy; TransLink Transit Authority 2012 <span style="color: #999;">v2.1.2.29</span></p>
562
504
  </div>
563
505
  </div>
564
506
  </div>
565
507
  </div>
566
508
  </div>
509
+
510
+ <script type="text/javascript">
511
+ var _gaq = _gaq || [];
512
+ _gaq.push(['_setAccount', 'UA-18464408-1']);
513
+ _gaq.push(['_setDomainName', '.translink.com.au']);
514
+ _gaq.push(['_trackPageview', '/travel-information/network-information/buses/all-timetables']);
515
+ (function () {
516
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
517
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
518
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
519
+ })();
520
+ </script>
567
521
  </body>
568
522
  </html>