[Mapbender-commits] r2868 - in branches/nimix_dev: conf core
http/css
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Aug 18 12:07:47 EDT 2008
Author: nimix
Date: 2008-08-18 12:07:47 -0400 (Mon, 18 Aug 2008)
New Revision: 2868
Added:
branches/nimix_dev/http/css/addwms.css
branches/nimix_dev/http/css/print.css
Modified:
branches/nimix_dev/conf/digitize_default.conf
branches/nimix_dev/conf/mapbender.conf-dist
branches/nimix_dev/conf/session.conf
branches/nimix_dev/conf/wfs_additional_spatial_search.conf
branches/nimix_dev/core/globalSettings.php
branches/nimix_dev/core/i18n.php
branches/nimix_dev/core/system.php
branches/nimix_dev/http/css/administration_alloc.css
Log:
merge
Modified: branches/nimix_dev/conf/digitize_default.conf
===================================================================
--- branches/nimix_dev/conf/digitize_default.conf 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/conf/digitize_default.conf 2008-08-18 16:07:47 UTC (rev 2868)
@@ -11,6 +11,9 @@
addButtonDig("delBasePoint", 1, "delete_node_off.png", "", "", 125, 0);
addButtonDig("clear", 1, "del_off.png", "", "", 150, 0);
+//definition of directory of digitize buttons
+buttonDig_imgdir = "../img/button_digitize/";
+
var buttonDig_wfs_src = "geomInfo.png";
var buttonDig_remove_src = "geomRemove.png";
var buttonDig_removeDb_src = "geomRemoveDb.png";
Modified: branches/nimix_dev/conf/mapbender.conf-dist
===================================================================
--- branches/nimix_dev/conf/mapbender.conf-dist 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/conf/mapbender.conf-dist 2008-08-18 16:07:47 UTC (rev 2868)
@@ -94,6 +94,11 @@
define("CONNECTION_PASSWORD", "<password>");
# --------------------------------------------
+# HOSTs not for Proxy (curl)
+# --------------------------------------------
+define("NOT_PROXY_HOSTS", "<ip>,<ip>,<ip>");
+
+# --------------------------------------------
# security: path to modules
# --------------------------------------------
@@ -158,4 +163,4 @@
$GEOS_PORT =GEOS_PORT;
$GEOS_OWNER=GEOS_OWNER;
$GEOS_PW=GEOS_PW;
-?>
\ No newline at end of file
+?>
Modified: branches/nimix_dev/conf/session.conf
===================================================================
--- branches/nimix_dev/conf/session.conf 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/conf/session.conf 2008-08-18 16:07:47 UTC (rev 2868)
@@ -8,6 +8,18 @@
$_SESSION["mb_myPOI"] = $_REQUEST["mb_myPOI"];
$_SESSION["mb_myPOI2SCALE"] = $_REQUEST["mb_myPOI2SCALE"];
+$_SESSION["mb_lang"] = $_REQUEST["lang"];
+
+$_SESSION["command"] = strtoupper($_REQUEST["COMMAND"]);
+
+$i = 1;
+$_SESSION["wms"] = array();
+while ($_REQUEST["wms".$i]) {
+ array_push($_SESSION["wms"], urldecode($_REQUEST["wms".$i]));
+ $i++;
+}
+unset($i);
+
$_SESSION["mb_myWmc"] = "";
$_SESSION["mb_myWmc_action"] = "";
if ($_REQUEST["wmc_id"]) {
@@ -22,4 +34,4 @@
$_SESSION["mb_myWmc"] = $_REQUEST["append_wmc_id"];
$_SESSION["mb_myWmc_action"] = "append";
}
-?>
\ No newline at end of file
+?>
Modified: branches/nimix_dev/conf/wfs_additional_spatial_search.conf
===================================================================
--- branches/nimix_dev/conf/wfs_additional_spatial_search.conf 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/conf/wfs_additional_spatial_search.conf 2008-08-18 16:07:47 UTC (rev 2868)
@@ -15,6 +15,8 @@
var spatialRequestIsSetMessage = "Gebiet eingegrenzt, bitte OK klicken!";
var clearFilterButtonLabel = "Neu";
+var noResultMsg = "Kein Ergebnis";
+
var buttonWfs_imgdir = "../img/button_gray/";
var buttonWfs_zIndex = 10;
Modified: branches/nimix_dev/core/globalSettings.php
===================================================================
--- branches/nimix_dev/core/globalSettings.php 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/core/globalSettings.php 2008-08-18 16:07:47 UTC (rev 2868)
@@ -1,12 +1,29 @@
<?php
+# $Id$
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
//
// start the session
//
session_start();
//
+// All data Mapbender handles internally are UTF-8
//
-// All data Mapbender handles internally are UTF-8
mb_internal_encoding("UTF-8");
//
Property changes on: branches/nimix_dev/core/globalSettings.php
___________________________________________________________________
Name: svn:keywords
+ HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Modified: branches/nimix_dev/core/i18n.php
===================================================================
--- branches/nimix_dev/core/i18n.php 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/core/i18n.php 2008-08-18 16:07:47 UTC (rev 2868)
@@ -1,8 +1,26 @@
<?php
+# $Id$
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
function _mb ($someString) {
if (USE_I18N) {
+// $e = new mb_notice("Translating '" . $someString . "' to language " . $_SESSION["mb_locale"] . ": '" . _($someString) . "'");
return _($someString);
}
return $someString;
}
-?>
\ No newline at end of file
+?>
Property changes on: branches/nimix_dev/core/i18n.php
___________________________________________________________________
Name: svn:keywords
+ HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Modified: branches/nimix_dev/core/system.php
===================================================================
--- branches/nimix_dev/core/system.php 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/core/system.php 2008-08-18 16:07:47 UTC (rev 2868)
@@ -1,5 +1,5 @@
<?php
-# $Id:$
+# $Id$
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
#
# mapbender version
#
-define("MB_VERSION_NUMBER", "2.5.0");
-define("MB_VERSION_APPENDIX", "RC2");
-define("MB_RELEASE_DATE", mktime(0,0,0,4,21,2008));//h, min,sec,month,day,year
+define("MB_VERSION_NUMBER", "2.6");
+define("MB_VERSION_APPENDIX", "trunk");
+define("MB_RELEASE_DATE", mktime(0,0,0,7,22,2008));//h, min,sec,month,day,year
#
# constants from map.js
Property changes on: branches/nimix_dev/core/system.php
___________________________________________________________________
Name: svn:keywords
+ HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: branches/nimix_dev/http/css/addwms.css (from rev 2864, trunk/mapbender/http/css/addwms.css)
===================================================================
--- branches/nimix_dev/http/css/addwms.css (rev 0)
+++ branches/nimix_dev/http/css/addwms.css 2008-08-18 16:07:47 UTC (rev 2868)
@@ -0,0 +1,80 @@
+* {
+ font: 12px normal Verdana,Arial,Helvetica,sans-serif;
+}
+
+body {
+ margin: 0;
+ padding: 10px;
+ color: #000;
+ background-color: #FFF;
+}
+
+h1, h2 {
+ margin: .5em 0;
+ padding: 0;
+ font-size: 1.5em;
+}
+
+h1 {
+ font-weight: bold;
+}
+
+p em {
+ font-style: italic;
+}
+
+form fieldset {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+form fieldset legend {
+ visibility: hidden;
+ display: none;
+}
+
+form p {
+ line-height: 1.25em;
+}
+
+table {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+table tbody tr.alternate {
+ background-color: #EEE;
+}
+
+table tbody tr:hover {
+ background-color: #CCC;
+}
+
+table thead th {
+ padding: 10px 5px;
+ text-align: left;
+ color: #FFF;
+ background-color: #000;
+ border: 1px solid #000;
+ border-top: 0;
+}
+
+table tbody td {
+ padding: 5px;
+ border: 1px solid #000;
+ cursor: pointer;
+}
+
+table tbody td strong {
+ font-weight: bold;
+}
+
+h2#resultString, p#progressIndicator, table#resultTable {
+ visibility: hidden;
+ display: none;
+}
+
+p#progressIndicator img {
+ vertical-align: middle;
+}
\ No newline at end of file
Modified: branches/nimix_dev/http/css/administration_alloc.css
===================================================================
--- branches/nimix_dev/http/css/administration_alloc.css 2008-08-18 16:03:32 UTC (rev 2867)
+++ branches/nimix_dev/http/css/administration_alloc.css 2008-08-18 16:07:47 UTC (rev 2868)
@@ -1,16 +1,28 @@
body{
background-color : #ffffff;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
}
select {
font-size: 11;
- font-family: "Times New Roman", Times, serif;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
width: 200px;
font-weight : bold;
}
.select_short{
width: auto;
}
+table{
+ font-family:Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size:11;
+}
+
+.wms_button{
+ color: black;
+ border: solid thin;
+ height:22px;
+ width:60px;
+}
+
checkbox{
background-color : #0066ff;
}
@@ -93,4 +105,4 @@
left: auto;
color : Red;
font-size : 13;
-}
\ No newline at end of file
+}
Copied: branches/nimix_dev/http/css/print.css (from rev 2864, trunk/mapbender/http/css/print.css)
===================================================================
--- branches/nimix_dev/http/css/print.css (rev 0)
+++ branches/nimix_dev/http/css/print.css 2008-08-18 16:07:47 UTC (rev 2868)
@@ -0,0 +1,45 @@
+* {
+ font: 12px normal Verdana,Arial,Helvetica,sans-serif;
+}
+
+body {
+ margin: 0;
+ padding: 10px;
+ color: #000;
+ background-color: #FFF;
+}
+
+form fieldset {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+form p {
+ line-height: 1.25em;
+ white-space: nowrap;
+}
+
+form p label {
+ /*
+ display: block;
+ float: left;
+ width: 7em;
+ padding-right: 1em;
+ line-height: 1.25em;
+ */
+}
+
+form p label em {
+ display: block;
+ color: #666;
+}
+
+form p input#mylegendcheckbox {
+ margin: 0;
+ padding: 0;
+}
+
+form p input#print {
+ margin-left: 8em;
+}
\ No newline at end of file
More information about the Mapbender_commits
mailing list