projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Merge branch 'master' of github.com:maxious/ACTBus-ui
Merge branch 'master' of github.com:maxious/ACTBus-ui

Conflicts:
include/common-auth.inc.php
lib/openid-php/Auth/OpenID/Consumer.php
lib/openid-php/Auth/OpenID/Server.php
lib/openid-php/Auth/OpenID/TrustRoot.php
lib/openid-php/Auth/Yadis/Manager.php
lib/openid-php/Auth/Yadis/XRDS.php

file:a/about.php -> file:b/about.php
<?php <?php
  /*
  * Copyright 2010,2011 Alexander Sadleir
   
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
   
  http://www.apache.org/licenses/LICENSE-2.0
   
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  */
include ('include/common.inc.php'); include ('include/common.inc.php');
include_header("About", "about") include_header("About", "about")
?> ?>
<p> <p>
Busness Time - An ACT bus timetable webapp<br /> Busness Time - An ACT bus timetable webapp<br />
Based on the maxious-canberra-transit-feed (<a Based on the maxious-canberra-transit-feed (<a
href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>, href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,
last updated <?php last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />
echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br /> Source code for the <a
Source code for the <a href="https://github.com/maxious/ACTBus-data">transit
href="https://github.com/maxious/ACTBus-data">transit feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this site</a> available from github.<br />
site</a> available from github.<br /> Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />  
<br />  
Feedback encouraged; contact maxious@lambdacomplex.org<br />  
<br /> <br />
Some icons by Joseph Wain / glyphish.com<br /> Feedback encouraged; contact maxious@lambdacomplex.org<br />
Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a> <br />
, <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>) Some icons by Joseph Wain / glyphish.com<br />
and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>) Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
<br /> , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>)
<br /> and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
<small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip. <br />
Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty, GTFS-realtime API;
express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided Alerts and Trip Updates (but only Cancelled or Stop Skipped)
"as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability. Default format binary but can get JSON by adding ?ascii=yes
All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend, <br />
change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site <br />
without prior notice. </small> <small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip.
<?php Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty,
include_footer(); express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided
?> "as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability.
  All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend,
  change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site
  without prior notice. </small>
  <?php
  include_footer();
  ?>
   
file:a/css/jquery.mobile-1.0b2.css (deleted)
/*!  
* jQuery Mobile v1.0b2  
* http://jquerymobile.com/  
*  
* Copyright 2010, jQuery Project  
* Dual licensed under the MIT or GPL Version 2 licenses.  
* http://jquery.org/license  
*/  
/*  
* jQuery Mobile Framework  
* Copyright (c) jQuery Project  
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.  
*/  
 
 
/* A  
-----------------------------------------------------------------------------------------------------------*/  
 
.ui-bar-a {  
border: 1px solid #2A2A2A;  
background: #111111;  
color: #ffffff;  
font-weight: bold;  
text-shadow: 0 -1px 1px #000000;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#111)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #3c3c3c, #111); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #3c3c3c, #111); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #3c3c3c, #111); /* IE10 */  
background-image: -o-linear-gradient(top, #3c3c3c, #111); /* Opera 11.10+ */  
background-image: linear-gradient(top, #3c3c3c, #111);  
}  
.ui-bar-a,  
.ui-bar-a input,  
.ui-bar-a select,  
.ui-bar-a textarea,  
.ui-bar-a button {  
font-family: Helvetica, Arial, sans-serif;  
}  
.ui-bar-a .ui-link-inherit {  
color: #fff;  
}  
.ui-bar-a .ui-link {  
color: #7cc4e7;  
font-weight: bold;  
}  
.ui-body-a {  
border: 1px solid #2A2A2A;  
background: #222222;  
color: #fff;  
text-shadow: 0 1px 0 #000;  
font-weight: normal;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#666), to(#222)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #666, #222); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #666, #222); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #666, #222); /* IE10 */  
background-image: -o-linear-gradient(top, #666, #222); /* Opera 11.10+ */  
background-image: linear-gradient(top, #666, #222);  
}  
.ui-body-a,  
.ui-body-a input,  
.ui-body-a select,  
.ui-body-a textarea,  
.ui-body-a button {  
font-family: Helvetica, Arial, sans-serif;  
}  
.ui-body-a .ui-link-inherit {  
color: #fff;  
}  
.ui-body-a .ui-link {  
color: #2489CE;  
font-weight: bold;  
}  
.ui-br {  
border-bottom: rgb(130,130,130);  
border-bottom: rgba(130,130,130,.3);  
border-bottom-width: 1px;  
border-bottom-style: solid;  
}  
.ui-btn-up-a {  
border: 1px solid #222;  
background: #333333;  
font-weight: bold;  
color: #fff;  
text-shadow: 0 -1px 1px #000;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#555), to(#333)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #555, #333); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #555, #333); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #555, #333); /* IE10 */  
background-image: -o-linear-gradient(top, #555, #333); /* Opera 11.10+ */  
background-image: linear-gradient(top, #555, #333);  
}  
.ui-btn-up-a a.ui-link-inherit {  
color: #fff;  
}  
.ui-btn-hover-a {  
border: 1px solid #000;  
background: #444444;  
font-weight: bold;  
color: #fff;  
text-shadow: 0 -1px 1px #000;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#666), to(#444)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #666, #444); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #666, #444); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #666, #444); /* IE10 */  
background-image: -o-linear-gradient(top, #666, #444); /* Opera 11.10+ */  
background-image: linear-gradient(top, #666, #444);  
}  
.ui-btn-hover-a a.ui-link-inherit {  
color: #fff;  
}  
.ui-btn-down-a {  
border: 1px solid #000;  
background: #3d3d3d;  
font-weight: bold;  
color: #fff;  
text-shadow: 0 -1px 1px #000;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#333), to(#5a5a5a)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #333, #5a5a5a); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #333, #5a5a5a); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #333, #5a5a5a); /* IE10 */  
background-image: -o-linear-gradient(top, #333, #5a5a5a); /* Opera 11.10+ */  
background-image: linear-gradient(top, #333, #5a5a5a);  
}  
.ui-btn-down-a a.ui-link-inherit {  
color: #fff;  
}  
.ui-btn-up-a,  
.ui-btn-hover-a,  
.ui-btn-down-a {  
font-family: Helvetica, Arial, sans-serif;  
text-decoration: none;  
}  
 
 
/* B  
-----------------------------------------------------------------------------------------------------------*/  
 
.ui-bar-b {  
border: 1px solid #456f9a;  
background: #5e87b0;  
color: #fff;  
font-weight: bold;  
text-shadow: 0 -1px 1px #254f7a;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#81a8ce), to(#5e87b0)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #81a8ce, #5e87b0); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #81a8ce, #5e87b0); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #81a8ce, #5e87b0); /* IE10 */  
background-image: -o-linear-gradient(top, #81a8ce, #5e87b0); /* Opera 11.10+ */  
background-image: linear-gradient(top, #81a8ce, #5e87b0);  
}  
.ui-bar-b,  
.ui-bar-b input,  
.ui-bar-b select,  
.ui-bar-b textarea,  
.ui-bar-b button {  
font-family: Helvetica, Arial, sans-serif;  
}  
.ui-bar-b .ui-link-inherit {  
color: #fff;  
}  
.ui-bar-b .ui-link {  
color: #7cc4e7;  
font-weight: bold;  
}  
 
.ui-body-b {  
border: 1px solid #C6C6C6;  
background: #cccccc;  
color: #333333;  
text-shadow: 0 1px 0 #fff;  
font-weight: normal;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#e6e6e6), to(#ccc)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #e6e6e6, #ccc); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #e6e6e6, #ccc); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #e6e6e6, #ccc); /* IE10 */  
background-image: -o-linear-gradient(top, #e6e6e6, #ccc); /* Opera 11.10+ */  
background-image: linear-gradient(top, #e6e6e6, #ccc);  
}  
.ui-body-b,  
.ui-body-b input,  
.ui-body-b select,  
.ui-body-b textarea,  
.ui-body-b button {  
font-family: Helvetica, Arial, sans-serif;  
}  
.ui-body-b .ui-link-inherit {  
color: #333333;  
}  
.ui-body-b .ui-link {  
color: #2489CE;  
font-weight: bold;  
}  
.ui-btn-up-b {  
border: 1px solid #145072;  
background: #2567ab;  
font-weight: bold;  
color: #fff;  
text-shadow: 0 -1px 1px #145072;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#5f9cc5), to(#396b9e)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #5f9cc5, #396b9e); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #5f9cc5, #396b9e); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #5f9cc5, #396b9e); /* IE10 */  
background-image: -o-linear-gradient(top, #5f9cc5, #396b9e); /* Opera 11.10+ */  
background-image: linear-gradient(top, #5f9cc5, #396b9e);  
}  
.ui-btn-up-b a.ui-link-inherit {  
color: #fff;  
}  
.ui-btn-hover-b {  
border: 1px solid #00516e;  
background: #4b88b6;  
font-weight: bold;  
color: #fff;  
text-shadow: 0 -1px 1px #014D68;  
background-image: -webkit-gradient(linear, left top, left bottom, from(#72b0d4), to(#4b88b6)); /* Saf4+, Chrome */  
background-image: -webkit-linear-gradient(top, #72b0d4, #4b88b6); /* Chrome 10+, Saf5.1+ */  
background-image: -moz-linear-gradient(top, #72b0d4, #4b88b6); /* FF3.6 */  
background-image: -ms-linear-gradient(top, #72b0d4, #4b88b6); /* IE10 */  
background-image: -o-linear-gradient(top, #72b0d4, #4b88b6); /* Opera 11.10+ */  
background-image: linear-gradient(top, #72b0d4, #4b88b6);  
}  
.ui-btn-hover-b a.ui-link-inherit {  
color: #fff;  
}  
.ui-btn-down-b {