Changeset 1200

Timestamp:

01/18/10 12:51:41 (2 years ago)

Author:

wyatt

Message:

Removed ads. Removed donations button. Updated news to note that the site is
not maintained and the code is GPL.

Location:

TripPlanner/branches/rb-0.4/tripplanner

Files:

• controllers/ads.py (deleted)
• public/images/ads (deleted)
• public/javascripts/ads.js (deleted)
• public/javascripts/gmap.js (modified) (1 diff)
• public/static/_google_ads_for_results.html (deleted)
• public/stylesheets/base.css (modified) (1 diff)
• templates/layout.html (modified) (4 diffs)
• templates/news.html (modified) (1 diff)

TripPlanner/branches/rb-0.4/tripplanner/public/javascripts/gmap.js

@@ -395 +395 @@
     var projection = new GMercatorProjection(10);
     var copyrights = new GCopyrightCollection('&copy; <a href="http://trimet.org/">TriMet</a>');
-    var wms_url = 'http://tilec.trimet.org/tilecache/tilecache.py?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=currentOSPN&FORMAT=image/pngSRS=EPSG:2913&WIDTH=256&HEIGHT=256';
-    var layer = new GTileLayer(copyrights, 0, 9);
+    var wms_url = 'http://maps.trimet.org/geoserver/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=currentOSPN&FORMAT=image/pngSRS=EPSG:4326&WIDTH=256&HEIGHT=256';
+    var layer = new GTileLayer(copyrights, 10, 19);
     layer.isPng = function() { return true; };
     layer.getOpacity = function() { return 1.0; };
     layer.getTileUrl = function(tile, zoom) {
-      var bbox = [7628293, 660879, 7632389, 664975].join(',');
-      var tile_url = [wms_url, "&BBOX=", bbox].join('');
+      var tile_url;
+      var x = tile.x * 256;
+      var y = tile.y * 256;
+      var sw_point = new GPoint(x, y + 255);
+      var ne_point = new GPoint(x + 255, y);
+      var sw = projection.fromPixelToLatLng(sw_point, zoom);
+      var ne = projection.fromPixelToLatLng(ne_point, zoom );
+      var bbox = [sw.lng(), sw.lat(), ne.lng(), ne.lat()].join(',');
+      tile_url = [wms_url, "&BBOX=", bbox].join('');
       return tile_url;
     };

TripPlanner/branches/rb-0.4/tripplanner/public/stylesheets/base.css

@@ -53 +53 @@
 #masthead, #input_container, #bar {
   padding: 5px;
-}
-#input_container, #bar, #content {
-  margin-right: 121px;
-}
-#ads {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 120px;
-  height: 100%;
-  background: white;
-  overflow: hidden;
-  border-left: 1px solid #99b3cc;
-}
-.ad.banner, .ad.banner a, .ad.banner a img {
-  width: 120px;
-  height: 90px;
-}
-.ad.banner a {
-  display: block;
 }
 #footer {

TripPlanner/branches/rb-0.4/tripplanner/templates/layout.html

@@ -127 +127 @@
                 <hr />
 
-                <p>
-                  byCycle needs your support. Spread the word. Make a donation if you can. Thanks.<br />
-                  <%include file="/widgets/paypal-button.html" />
-                </p>
-
-                <hr />
-
                 <p class="noprint">
                   Users should independently verify all information presented here. This
@@ -145 +138 @@
 
                 <p class="no-bottom-margin">
-                  &copy; 2004-2008 byCycle.org
+                  &copy; 2004-2009 byCycle.org
                 </p>
               % endif
@@ -187 +180 @@
       </div>
       <!-- /Content -->
-
-
-      <!-- Ads -->
-      <div id="ads" class="noprint">
-        ${self.ads()}
-      </div>
-      <!-- /Ads -->
 
 
@@ -268 +254 @@
 <%def name="javascript_includes()"></%def>
 <%def name="javascript()"></%def>
-
-<%def name="ads()">
-  <div class="ad banner">
-    <a href="http://www.myvega.com/" title="Vega - Complete Wholefood Health Optimizer"><img src="${h.url_for('/images/ads/oi_vega.jpg')}" width="120" height="90" alt="Vega - Complete Wholefood Health Optimizer" /></a>
-  </div>
-  <div class="ad banner">
-    <a href="http://www.veganbodybuilding.com/" title="Vegan Body Building and Fitness"><img src="${h.url_for('/images/ads/oi_vbb.jpg')}" width="120" height="90" alt="Vegan Body Building and Fitness" /></a>
-  </div>
-  ${h.javascript_include_tag('ads')}
-</%def>
 
 <%def name="errors()">

TripPlanner/branches/rb-0.4/tripplanner/templates/news.html

@@ -2 +2 @@
 
 <p>
-  No news.
+  <small><em>January 18, 2010</em></small>
 </p>
+
+<p>
+  This site is unmaintained. The last significant changes were made in <strong>May of 2007</strong> (although several data updates for the Portland region have been made since then). 
+</p>
+
+<p>
+  <a href="http://project.bycycle.org/">The code</a> is open source (GPLv3).
+</p>