[mapserver-commits] r9700 - in branches/branch-5-6/docs: _static de en redirection

[svn at osgeo.org]

Author: aboudreault
Date: 2010-01-15 15:31:42 -0500 (Fri, 15 Jan 2010)
New Revision: 9700

Modified:
   branches/branch-5-6/docs/_static/ol.js
   branches/branch-5-6/docs/de/index.txt
   branches/branch-5-6/docs/en/index.txt
   branches/branch-5-6/docs/redirection/mapserver-redirect.conf
Log:
Update OL layout/css/js of the website + redirections

Modified: branches/branch-5-6/docs/_static/ol.js
===================================================================
--- branches/branch-5-6/docs/_static/ol.js	2010-01-15 18:45:13 UTC (rev 9699)
+++ branches/branch-5-6/docs/_static/ol.js	2010-01-15 20:31:42 UTC (rev 9700)
@@ -76,6 +76,9 @@
 OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
 if(!map.getCenter())
   map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
+var  controls = map.getControlsByClass('OpenLayers.Control.Navigation');
+for(var i = 0; i<controls.length; ++i)
+       controls[i].disableZoomWheel();
 }
 OpenLayers.Event.observe(window, "load", olmapinit);
 

Modified: branches/branch-5-6/docs/de/index.txt
===================================================================
--- branches/branch-5-6/docs/de/index.txt	2010-01-15 18:45:13 UTC (rev 9699)
+++ branches/branch-5-6/docs/de/index.txt	2010-01-15 20:31:42 UTC (rev 9700)
@@ -1,10 +1,6 @@
 .. _home:
 
-.. raw:: html
 
-    <table style="height:300px;"><tr><td style="width:50%; vertical-align:top">
-
-
 *****************************************************************************
  Willkommen zum MapServer
 *****************************************************************************
@@ -26,7 +22,14 @@
 
 .. raw:: html
 
-    </td><td id="olmaptd" width="50%" style="width:50%;height:100%;padding-top:25px;text-align:right;"> <div id="olmap" style="width:100%;height:100%;margin:0px;"></div><span style="width:100%;text-align:right;font-size:x-small;">map data by <a href="http://openstreetmap.org">openstreetmap</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)</td></tr></table>
+    <table style="height:450px;width:100%"><tr>
+    <td id="olmaptd" width="100%" style="width:100%;height:100%;padding-top:25px;text-align:right;">
+    <div id="olmap" style="width:100%;height:100%;margin:0px;"></div>
+    <span style="width:100%;text-align:right;font-size:x-small;">
+    Barcelona, SP.  Home of <a href="http://2010.foss4g.org/">FOSS4G 2010</a>. Map data by <a href="http://openstreetmap.org">openstreetmap</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)
+    </span>
+    </td>
+    </tr></table>
     <script src="_static/openlayers/OpenLayers.js"></script>
     <script src="_static/ol.js"></script>
 

Modified: branches/branch-5-6/docs/en/index.txt
===================================================================
--- branches/branch-5-6/docs/en/index.txt	2010-01-15 18:45:13 UTC (rev 9699)
+++ branches/branch-5-6/docs/en/index.txt	2010-01-15 20:31:42 UTC (rev 9700)
@@ -1,10 +1,6 @@
 .. _home:
 
-.. raw:: html
 
-    <table style="height:300px;"><tr><td style="width:50%; vertical-align:top">
-
-
 *****************************************************************************
  Welcome to MapServer
 *****************************************************************************
@@ -24,7 +20,14 @@
 
 .. raw:: html
 
-    </td><td id="olmaptd" width="50%" style="width:50%;height:100%;padding-top:25px;text-align:right;"> <div id="olmap" style="width:100%;height:100%;margin:0px;"></div><span style="width:100%;text-align:right;font-size:x-small;">map data by <a href="http://openstreetmap.org">openstreetmap</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)</td></tr></table>
+    <table style="height:450px;width:100%"><tr>
+    <td id="olmaptd" width="100%" style="width:100%;height:100%;padding-top:25px;text-align:right;">
+    <div id="olmap" style="width:100%;height:100%;margin:0px;"></div>
+    <span style="width:100%;text-align:right;font-size:x-small;">
+    Barcelona, SP.  Home of <a href="http://2010.foss4g.org/">FOSS4G 2010</a>. Map data by <a href="http://openstreetmap.org">openstreetmap</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)
+    </span>
+    </td>
+    </tr></table>
     <script src="_static/openlayers/OpenLayers.js"></script>
     <script src="_static/ol.js"></script>
 

Modified: branches/branch-5-6/docs/redirection/mapserver-redirect.conf
===================================================================
--- branches/branch-5-6/docs/redirection/mapserver-redirect.conf	2010-01-15 18:45:13 UTC (rev 9699)
+++ branches/branch-5-6/docs/redirection/mapserver-redirect.conf	2010-01-15 20:31:42 UTC (rev 9700)
@@ -2,6 +2,9 @@
 RewriteEngine On
 RewriteBase /
 
+RewriteRule ^$                   en/    [PT]
+RewriteRule ^([^/]{3,}.*)          en/$1   [PT]
+
 # Redirect home page to keep search engine ranking
 #RewriteRule ^$					http://www.mapserver.org/ [R=301,L]
 RewriteRule ^License				http://www.mapserver.org/copyright.html [R=301,L]