move to rails 1.2.3 and make the map use all the window space
This commit is contained in:
Steve Coast
parent
9b424b8614
commit
4f826acfca
4 changed files with 101 additions and 135 deletions
|
|
@ -10,10 +10,13 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<% if params[:controller] == 'site' and params[:action] == 'index' %>
|
||||
<div id="map" style="border: 1px solid black; position: absolute; right: 5px; bottom: 5px; left: 200px; top: 70px;"></div>
|
||||
<% end %>
|
||||
<div id="content">
|
||||
<% if flash[:notice] %>
|
||||
<% if flash[:notice] %>
|
||||
<div id="notice"><%= flash[:notice] %></div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
|
|
@ -67,18 +70,6 @@
|
|||
<a href="http://wiki.openstreetmap.org">Help & Wiki</a><br />
|
||||
<a href="http://www.opengeodata.org/">News blog</a><br />
|
||||
<a href="http://wiki.openstreetmap.org/index.php/Merchandise">Shop</a><br />
|
||||
<center>
|
||||
|
||||
<script type="text/javascript"><!--
|
||||
var detect = navigator.userAgent.toLowerCase();
|
||||
if (detect.indexOf('msie') >= 0) {
|
||||
document.write('<script type=\"text/javascript\"> google_ad_client = \"pub-7727744269903103\"; google_ad_width = 125; google_ad_height = 125; google_ad_format = \"125x125_as_rimg\"; google_cpa_choice = \"CAAQveHnzwEaCEiH5iXPqf1SKJe193M\"; </script> <script type=\"text/javascript\" src=\"http://pagead2.googlesyndication.com/pagead/show_ads.js\"> </script>');
|
||||
}
|
||||
//--></script>
|
||||
|
||||
|
||||
</center>
|
||||
|
||||
</div>
|
||||
<%= yield :optionals %>
|
||||
<div id="cclogo">
|
||||
|
|
@ -86,7 +77,7 @@
|
|||
|
||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
|
||||
<input type="hidden" name="cmd" value="_s-xclick">
|
||||
<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
|
||||
<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" style="border: none;" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
|
||||
<img alt="" border="0" src="https://www.paypal.com/en_GB/i/scr/pixel.gif" width="1" height="1">
|
||||
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
|
||||
</form>
|
||||
|
|
@ -98,4 +89,4 @@
|
|||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
</form>
|
||||
</div>
|
||||
|
||||
<div id="map" style="WIDTH: 700px; HEIGHT: 500px;"></div>
|
||||
|
||||
|
||||
<% lon = params['lon'] || '-0.1' %>
|
||||
<% lat = params['lat'] || '51.5' %>
|
||||
<% zoom = params['zoom'] || '5' %>
|
||||
<% zoom = params['zoom'] || '4' %>
|
||||
|
||||
<script type="text/javascript">
|
||||
var lon = <%= lon %>;
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
</script>
|
||||
<script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
var map, layer;
|
||||
|
||||
|
|
@ -60,30 +60,6 @@
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
init();
|
||||
// -->
|
||||
</script>
|
||||
|
||||
</head>
|
||||
|
||||
<% unless @user %>
|
||||
<div id="gads">
|
||||
<br>We're trialing the adverts below to support the project. Login and they go away.
|
||||
<script type="text/javascript"><!--
|
||||
google_ad_client = "pub-7727744269903103";
|
||||
google_ad_width = 728;
|
||||
google_ad_height = 90;
|
||||
google_ad_format = "728x90_as";
|
||||
google_ad_type = "text";
|
||||
google_ad_channel ="";
|
||||
google_color_border = "CCCCCC";
|
||||
google_color_bg = "FFFFFF";
|
||||
google_color_link = "000000";
|
||||
google_color_url = "000080";
|
||||
google_color_text = "000000";
|
||||
//--></script><script type="text/javascript"
|
||||
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
|
||||
</script> </div>
|
||||
<% end %>
|
||||
|
||||
init();
|
||||
// -->
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# ENV['RAILS_ENV'] ||= 'production'
|
||||
|
||||
# Specifies gem version of Rails to use when vendor/rails is not present
|
||||
RAILS_GEM_VERSION = '1.2.2'
|
||||
RAILS_GEM_VERSION = '1.2.3'
|
||||
|
||||
# Bootstrap the Rails environment, frameworks, and default configuration
|
||||
require File.join(File.dirname(__FILE__), 'boot')
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ body {
|
|||
|
||||
|
||||
#content {
|
||||
width: 700px;
|
||||
/* width: 700px; */
|
||||
padding: 0;
|
||||
/*padding-left: 1em;*/
|
||||
margin: 0;
|
||||
|
|
@ -166,7 +166,6 @@ body {
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
#mapImage {
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
|
|
@ -175,9 +174,9 @@ body {
|
|||
top: 0px;
|
||||
left: 14px;
|
||||
}
|
||||
|
||||
#mapEpilog {
|
||||
font-size: x-small;
|
||||
|
||||
}
|
||||
|
||||
#keyvalue {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue