[GRASS-SVN] r51458 - in grass-web/trunk: . community
community/user_map
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Apr 17 10:29:28 EDT 2012
Author: neteler
Date: 2012-04-17 07:29:28 -0700 (Tue, 17 Apr 2012)
New Revision: 51458
Added:
grass-web/trunk/community/map.inc
grass-web/trunk/community/map.php
grass-web/trunk/community/title_map.inc
grass-web/trunk/community/user_map/
grass-web/trunk/community/user_map/connection.php
Removed:
grass-web/trunk/community/user_map/connection.php
grass-web/trunk/map.inc
grass-web/trunk/map.php
grass-web/trunk/user_map/
Modified:
grass-web/trunk/community/index.php
grass-web/trunk/community/main.inc
grass-web/trunk/community/support.php
grass-web/trunk/main.inc
grass-web/trunk/sitestyle.css
Log:
map stuff moved into community/
Modified: grass-web/trunk/community/index.php
===================================================================
--- grass-web/trunk/community/index.php 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/community/index.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -83,7 +83,7 @@
</table>
<hr>
- <div align="right">© 1999-2011 GRASS Development Team<br>
+ <div align="right">© 1999-2012 GRASS Development Team<br>
<a href="../impressum.html">Imprint</a> |
<a href="../contact.php">Comments</a> about this page<br>
<i>Last change: $Date$ </i><br>
Modified: grass-web/trunk/community/main.inc
===================================================================
--- grass-web/trunk/community/main.inc 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/community/main.inc 2012-04-17 14:29:28 UTC (rev 51458)
@@ -25,14 +25,11 @@
<P>
<center>
- <a href="javascript:openPmapper(890, 630, 1, '&mapwidth=600&mapheight=400')">
+ <a href="http://grass.osgeo.org/community/map.php">
<img src="../images/grassusers_big.jpg" alt="GRASS users map" hspace="5"></a>
- <small><br><i>New GRASS User map - please click to add yourself - (<a href="http://mapserver.gdf-hannover.de/grassusers/map.phtml?winwidth=890&winheight=630&language=1&mapwidth=600&mapheight=400">without pop-up</a>)</i></small>
- <P>
- <a href="http://mapserver.gdf-hannover.de/cgi-bin/grassuserwfs?REQUEST=GetCapabilities&SERVICE=WFS&VERS
-ION=1.0.0">WFS GetCapabilities URL</a> -
- <a href="http://mapserver.gdf-hannover.de/cgi-bin/grassuserwms?REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.0.0">WMS GetCapabilities URL</a> <br>
+ <small><br><i>New GRASS User map - please click to add yourself</i></small>
</center>
+<P>
<ul>
<li> The <a href="http://en.wikipedia.org/wiki/Web_Feature_Service">OGC Web Feature Service (WFS)</a>
Copied: grass-web/trunk/community/map.inc (from rev 51456, grass-web/trunk/map.inc)
===================================================================
--- grass-web/trunk/community/map.inc (rev 0)
+++ grass-web/trunk/community/map.inc 2012-04-17 14:29:28 UTC (rev 51458)
@@ -0,0 +1,4 @@
+<center>
+ <div id="mappanel"></div>
+</center>
+
Copied: grass-web/trunk/community/map.php (from rev 51456, grass-web/trunk/map.php)
===================================================================
--- grass-web/trunk/community/map.php (rev 0)
+++ grass-web/trunk/community/map.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <title>GRASS GIS: The World Leading Free Software GIS Community Map</title>
+ <meta name="robots" content="index,follow">
+ <meta name="description"
+ content="GRASS GIS (Geographic Resources Analysis Support System) is an open source,
+ free software (FOSS) Geographical Information System (GIS) with raster, topological
+ vector, image processing, and visualization functionality">
+ <meta name="keywords"
+ content="open source gps, GRASS, FOSS, open source gis, open source gis grass, open source web gis, open source gis software, free open source gis, gis, mapping, open source software, mapping software, cartography, gis data, geospatial, open source 3d, geographic information system, geographic information systems, gis software, mapping data, free software, raster, topology, vector, image processing, visualization, hydrology, archeology, archaeology, 3D GIS">
+ <meta name="Author" content="GRASS Development Team">
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <link rel="stylesheet" href="../sitestyle.css" type="text/css">
+
+ <script src="user_map/lib/ext-base.js" type="text/javascript"></script>
+ <script src="user_map/lib/ext-all.js" type="text/javascript"></script>
+ <script src="user_map/lib/OpenLayers_grass.js" type="text/javascript"></script>
+ <script src="user_map/lib/GeoExt.js" type="text/javascript"></script>
+ <script src="user_map/user_map.js" type="text/javascript"></script>
+
+</head>
+<body>
+ <!-- TOP LOGO LINE -->
+<table bgcolor="#ffffff" cellspacing="0" cellpadding="0" border="0" width="100%">
+ <tbody>
+ <tr><td>
+ <table cellspacing="1" cellpadding="0" border="0" width="100%" >
+ <tbody>
+ <tr bgcolor="#ffffff">
+ <td nowrap="nowrap">
+ <a href="../index.php">
+ <img src="../images/grasslogo_vector_small.png" alt="GRASS GIS (Geographic Resources Analysis Support System)" hspace="22" border="0">
+ </a>
+ </td>
+ <td nowrap="nowrap">
+ <table cellspacing="0" cellpadding="1" border="0" width="100%">
+ <tbody>
+ <tr bgcolor="#ffffff">
+ <td nowrap="nowrap">
+ <?php
+ include("title_map.inc");
+ ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<table cellspacing="0" cellpadding="1" border="0" width="100%">
+<tbody>
+ <tr>
+ <td valign="top">
+ <?php
+ include("../menu_search.inc");
+ ?>
+ </td>
+ <td valign="top">
+ <?php
+ include("../menu_top.inc");
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <?php
+ include("menu_side.inc");
+ ?>
+ </td>
+ <td valign="top" class="leftmenu"> <!-- MAIN PART -->
+ <?php
+ include("map.inc");
+ ?>
+
+ <!-- END MAIN PART -->
+
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<hr>
+ <div align="right">© 1999-2012 GRASS Development Team<br>
+ <a href="../impressum.html">Imprint</a> |
+ <a href="../contact.php">Comments</a> about this page<br>
+ </div>
+
+</body>
+</html>
Modified: grass-web/trunk/community/support.php
===================================================================
--- grass-web/trunk/community/support.php 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/community/support.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -24,26 +24,26 @@
<table cellspacing="1" cellpadding="0" border="0" width="100%" >
<tbody>
<tr bgcolor="#ffffff">
- <td nowrap="nowrap">
+ <td nowrap="nowrap">
<a href="../index.php">
<img src="../images/grasslogo_vector_small.png" alt="GRASS GIS (Geographic Resources Analysis Support System)" hspace="22" border="0">
</a>
</td>
- <td nowrap="nowrap">
+ <td nowrap="nowrap">
<table cellspacing="0" cellpadding="1" border="0" width="100%">
<tbody>
<tr bgcolor="#ffffff">
<td nowrap="nowrap">
<?php
- include("title.inc");
- ?>
+ include("title.inc");
+ ?>
</td>
</tr>
- </tbody>
+ </tbody>
</table>
</td>
</tr>
- </tbody>
+ </tbody>
</table>
</td>
</tr>
@@ -89,7 +89,7 @@
<a href="../impressum.html">Imprint</a> |
<a href="../contact.php">Comments</a> about this page<br>
</div>
-
+
</body>
</html>
Copied: grass-web/trunk/community/title_map.inc (from rev 51457, grass-web/trunk/community/title.inc)
===================================================================
--- grass-web/trunk/community/title_map.inc (rev 0)
+++ grass-web/trunk/community/title_map.inc 2012-04-17 14:29:28 UTC (rev 51458)
@@ -0,0 +1,4 @@
+<!-- keep indentation -->
+ <center><br>
+ <h1>GRASS GIS Community Map</h1>
+ </center>
Deleted: grass-web/trunk/community/user_map/connection.php
===================================================================
--- grass-web/trunk/user_map/connection.php 2012-04-17 13:42:26 UTC (rev 51456)
+++ grass-web/trunk/community/user_map/connection.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -1,12 +0,0 @@
-<?php
-
-// $grassuserdb = new PDO('sqlite:/var/www/grass-web/user_map/user_grass.sqlite');
-
-$grassuserdb = new SQLite3('/var/www/grass-web/user_map/user_grass.sqlite');
-
-
-if (!$grassuserdb){
- echo "{success: false, errors: {reason: 'Error opening database'}}";
- exit;
-}
-?>
Copied: grass-web/trunk/community/user_map/connection.php (from rev 51457, grass-web/trunk/user_map/connection.php)
===================================================================
--- grass-web/trunk/community/user_map/connection.php (rev 0)
+++ grass-web/trunk/community/user_map/connection.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -0,0 +1,12 @@
+<?php
+
+// $grassuserdb = new PDO('sqlite:/var/www/grass-web/user_map/user_grass.sqlite');
+
+$grassuserdb = new SQLite3('/osgeo/grass/grass-web-public/user_map/user_grass.sqlite');
+
+
+if (!$grassuserdb){
+ echo "{success: false, errors: {reason: 'Error opening database'}}";
+ exit;
+}
+?>
Modified: grass-web/trunk/main.inc
===================================================================
--- grass-web/trunk/main.inc 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/main.inc 2012-04-17 14:29:28 UTC (rev 51458)
@@ -12,7 +12,7 @@
</td>
<td valign="top">
<center>
- <a href="http://grass.osgeo.org/map.php"><img src="images/grassusers_small.jpg" alt="GRASS users map" border="0" hspace="5"></a><br>
+ <a href="http://grass.osgeo.org/community/map.php"><img src="images/grassusers_small.jpg" alt="GRASS GIS users map" border="0" hspace="5"></a><br>
<small> <i>GRASS GIS User map</i></small>
</center>
</td>
Deleted: grass-web/trunk/map.inc
===================================================================
--- grass-web/trunk/map.inc 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/map.inc 2012-04-17 14:29:28 UTC (rev 51458)
@@ -1,4 +0,0 @@
-<center>
- <div id="mappanel"></div>
-</center>
-
Deleted: grass-web/trunk/map.php
===================================================================
--- grass-web/trunk/map.php 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/map.php 2012-04-17 14:29:28 UTC (rev 51458)
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>GRASS GIS - The World Leading Free Software GIS</title>
- <meta name="robots" content="index,follow">
- <meta name="description"
- content="GRASS GIS (Geographic Resources Analysis Support System) is an open source,
- free software (FOSS) Geographical Information System (GIS) with raster, topological
- vector, image processing, and visualization functionality">
- <meta name="keywords"
- content="open source gps, GRASS, FOSS, open source gis, open source gis grass, open source web gis, open source gis software, free open source gis, gis, mapping, open source software, mapping software, cartography, gis data, geospatial, open source 3d, geographic information system, geographic information systems, gis software, mapping data, free software, raster, topology, vector, image processing, visualization, hydrology, archeology, archaeology, 3D GIS">
- <meta name="Author" content="GRASS Development Team">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <link rel="stylesheet" href="sitestyle.css" type="text/css">
- <link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml">
-
- <script src="user_map/lib/ext-base.js" type="text/javascript"></script>
- <script src="user_map/lib/ext-all.js" type="text/javascript"></script>
- <script src="user_map/lib/OpenLayers_grass.js" type="text/javascript"></script>
- <script src="user_map/lib/GeoExt.js" type="text/javascript"></script>
- <script src="user_map/user_map.js" type="text/javascript"></script>
-
-</head>
-<body>
- <!-- TOP LOGO LINE -->
-<table bgcolor="#ffffff" cellspacing="0" cellpadding="0" border="0" width="100%">
- <tbody>
- <tr><td>
- <table cellspacing="1" cellpadding="0" border="0" width="100%" >
- <tbody>
- <tr bgcolor="#ffffff">
- <td nowrap="nowrap"> <img src="images/grasslogo_vector_tiny.png" alt="GRASS GIS (Geographic Resources Analysis Support System)" hspace="22">
- </td>
- <td nowrap="nowrap">
- <table cellspacing="0" cellpadding="1" border="0" width="100%">
- <tbody>
- <tr bgcolor="#ffffff">
- <td nowrap="nowrap">
- <center><br>
- <h1>Welcome to GRASS GIS</h1>
-<?php
-
-// avoid PHP warning noise
-error_reporting(1);
-
-if ( $MYIP != "202.158.214.106" ) {
- if (function_exists('curl_init')) {
- $ch = curl_init();
- $MYIP = $_SERVER['SERVER_ADDR'];
- $timeout = 5; // set to zero for no timeout
- curl_setopt ($ch, CURLOPT_URL, "http://api.hostip.info/get_html.php?ip=$MYIP");
- curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
- $file_contents = curl_exec($ch);
- curl_close($ch);
- if (!$file_contents) {
- echo "<font size=\"-1\"><i>You are at an official GRASS site (other <a href=\"mirrors.php\">mirror sites</a>)<br>";
- } else {
- if (preg_match("/Internal Server Error/i", $file_contents)) {
- echo "<font size=\"-1\"><i>You are at an official GRASS site (other <a href=\"mirrors.php\">mirror sites</a>)<br>";
- } else {
- // e.g.: "Country: UNITED STATES (US) City: San Diego, CA"
- $MYSTATETMP = explode(":", $file_contents);
- $MYSTATETMP2 = explode(")", $MYSTATETMP[1]);
- $MYSTATE = $MYSTATETMP2[0] . ")";
- if ($MYIP == "140.211.15.75") {
- echo "<font size=\"-1\"><i>You are at the official GRASS site in $MYSTATE
- (<a href=\"mirrors.php\">mirror sites</a>)<br>";
- } else {
- echo "<font size=\"-1\"><i>You are at a GRASS mirror site in $MYSTATE (other <a href=\"mirrors.php\">mirror sites</a>)<br>";
- }
- }
- }
- } elseif (function_exists('fopen') && allow_url_fopen ) {
- $MYIP = $_SERVER['SERVER_ADDR'];
- $file = fopen ("http://api.hostip.info/get_html.php?ip=$MYIP", "r");
- if (!$file) {
- echo "<font size=\"-1\"><i>You are at an official GRASS site (other
- <a href=\"mirrors.php\">mirror sites</a>)<br>";
- } else {
- $line = fgets ($file, 34);
- $MYSTATETMP = explode(":", $line);
- $MYSTATE = $MYSTATETMP[1];
- if ($MYIP == "140.211.15.75") {
- echo "<font size=\"-1\"><i>You are at the official GRASS site in $MYSTATE
- (<a href=\"mirrors.php\">mirror sites</a>)<br>";
- } else {
- echo "<font size=\"-1\"><i>You are at a GRASS mirror site in $MYSTATE (other <a href=\"mirrors.php\">mirror sites</a>)<br>";
- }
- fclose($file);
- }
- } else {
- echo "<font size=\"-1\"><i>You are at a GRASS mirror site
- (other <a href=\"mirrors.php\">mirror sites</a>)<br>";
- }
-}
-?>
- This site is updated daily: LASTUPDATED</i> <!-- processed by cron/sed -->
- </font>
- </center>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
-</table>
-
-<table cellspacing="0" cellpadding="1" border="0" width="100%">
-<tbody>
- <tr>
- <td valign="top">
- <?php
- include("main_menu_search.inc");
- ?>
- </td>
- <td valign="top">
- <?php
- include("main_menu_top.inc");
- ?>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <?php
- include("main_menu_side.inc");
- ?>
- </td>
- <td valign="top" class="leftmenu"> <!-- MAIN PART -->
- <?php
- include("map.inc");
- ?>
-
- <!-- END MAIN PART -->
- </td>
- </tr>
- </tbody>
-</table>
-
-<hr>
- <div align="right">© 1999-2012 GRASS Development Team<br>
- <a href="impressum.html">Imprint</a> |
- <a href="contact.php">Comments</a> about this page
- </div>
-
-</body>
-</html>
-
Modified: grass-web/trunk/sitestyle.css
===================================================================
--- grass-web/trunk/sitestyle.css 2012-04-17 13:57:14 UTC (rev 51457)
+++ grass-web/trunk/sitestyle.css 2012-04-17 14:29:28 UTC (rev 51458)
@@ -61,32 +61,32 @@
}
.pan {
- background-image: url(user_map/image/icon_pan.png) !important;
+ background-image: url(community/user_map/image/icon_pan.png) !important;
height: 20px !important;
width: 20px !important;
}
.infobox {
- background-image: url(user_map/image/info.png) !important;
+ background-image: url(community/user_map/image/info.png) !important;
height: 20px !important;
width: 20px !important;
}
.addbox {
- background-image: url(user_map/image/grass.png) !important;
+ background-image: url(community/user_map/image/grass.png) !important;
height: 22px !important;
width: 20px !important;
}
.zoommax {
- background-image: url(user_map/image/icon_zoomfull.png) !important;
+ background-image: url(community/user_map/image/icon_zoomfull.png) !important;
height: 20px !important;
width: 20px !important;
}
.zoomin {
- background-image:url(user_map/image/icon_zoomin.png) !important;
+ background-image:url(community/user_map/image/icon_zoomin.png) !important;
height:20px !important;
width:20px !important;
}
.zoomout {
- background-image:url(user_map/image/icon_zoomout.png) !important;
+ background-image:url(community/user_map/image/icon_zoomout.png) !important;
height:20px !important;
width:20px !important;
}
More information about the grass-commit
mailing list