[OpenLayers-Commits] r12025 - in sandbox/ahocevar/google-ng: . lib/OpenLayers/Layer theme/default

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-05-28 02:26:53 -0700 (Sat, 28 May 2011)
New Revision: 12025

Modified:
   sandbox/ahocevar/google-ng/
   sandbox/ahocevar/google-ng/lib/OpenLayers/Layer/GoogleNG.js
   sandbox/ahocevar/google-ng/theme/default/style.css
Log:
better attribution readability, and display Map Data string only when copyrights were reported by the copyright service


Property changes on: sandbox/ahocevar/google-ng
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/roberthl/openlayers:9745-9748
   + /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:12003-12023

Modified: sandbox/ahocevar/google-ng/lib/OpenLayers/Layer/GoogleNG.js
===================================================================
--- sandbox/ahocevar/google-ng/lib/OpenLayers/Layer/GoogleNG.js	2011-05-28 09:25:58 UTC (rev 12024)
+++ sandbox/ahocevar/google-ng/lib/OpenLayers/Layer/GoogleNG.js	2011-05-28 09:26:53 UTC (rev 12025)
@@ -35,7 +35,7 @@
          'target="_blank" href="http://maps.google.com/maps?' +
          'll=${center}&z=${zoom}&t=${t}"><img width="62" height="24" ' +
          'src="http://maps.gstatic.com/mapfiles/google_white.png"/></a>' +
-         '</div>${mapData} - <a style="white-space: nowrap" target="_blank" ' +
+         '</div>${mapData}<a style="white-space: nowrap" target="_blank" ' +
          'href="http://www.google.com/help/terms_maps.html">' +
          'Terms of Use</a></span>',
     
@@ -179,8 +179,9 @@
         } else {
             myCopyrights = copyrights[this.mapTypes[this.type]];
         }
-        var mapData = "Map Data &copy;" + new Date().getFullYear() + " " +
-            myCopyrights.join(", ");
+        var mapData = myCopyrights.length == 0 ? "" :
+            "Map Data &copy;" + new Date().getFullYear() + " " +
+            myCopyrights.join(", ") + " - ";
         var center = this.map.getCenter();
         center && center.transform(
             this.map.getProjectionObject(),

Modified: sandbox/ahocevar/google-ng/theme/default/style.css
===================================================================
--- sandbox/ahocevar/google-ng/theme/default/style.css	2011-05-28 09:25:58 UTC (rev 12024)
+++ sandbox/ahocevar/google-ng/theme/default/style.css	2011-05-28 09:26:53 UTC (rev 12025)
@@ -356,7 +356,7 @@
 }
 
 .olGoogleAttribution.hybrid, .olGoogleAttribution.satellite {
-    color: white;
+    color: #EEE;
 }
 .olGoogleAttribution {
     color: #333;
@@ -365,7 +365,7 @@
     color: #77C;
 }
 span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a {
-    color: white;
+    color: #EEE;
 }
 
 /**