rhein: saifix, system submodule, map border + sytlefix

This commit is contained in:
Ulf Gebhardt 2014-05-29 14:29:16 +02:00
parent 5dca80b5e4
commit e1b248dbce
7 changed files with 13 additions and 8 deletions

View File

@ -1,5 +1,5 @@
<?php <?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'rhein/autoload.inc.php'; //Project Classes require_once 'rhein/autoload.inc.php'; //Project Classes
require_once 'config.php'; require_once 'config.php';

View File

@ -1,6 +1,6 @@
<?php <?php
$rhein_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT), $rhein_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
array(config_ids::SYS_CONFIG_PATH_BASEURL, 'http://mojotrollz.eu/web/rhein/'), array(config_ids::SYS_CONFIG_PATH_BASEURL, 'http://fewo-rhein-zwbg.de/'),
array(config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/rhein/'), array(config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/rhein/'),
array(config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS), array(config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
array(config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'), array(config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
@ -9,10 +9,10 @@ $rhein_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING,
array(config_ids::SYS_CONFIG_DB_PASSWORD, 'dajsabeaisvd345'), array(config_ids::SYS_CONFIG_DB_PASSWORD, 'dajsabeaisvd345'),
array(config_ids::SYS_CONFIG_DB_DBNAME, 'host_rhein'), array(config_ids::SYS_CONFIG_DB_DBNAME, 'host_rhein'),
array(config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')), array(config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
array(config_ids::SYS_SAI_CONFIG_BASEURL, 'http://mojotrollz.eu/web/rhein/sai.php?'), array(config_ids::SYS_SAI_CONFIG_BASEURL, 'http://fewo-rhein-zwbg.de/sai.php?'),
array(config_ids::SYS_SAI_CONFIG_TITLE, 'Fewo Rhein - Admin Bereich'), array(config_ids::SYS_SAI_CONFIG_TITLE, 'Fewo Rhein - Admin Bereich'),
array(config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://mojotrollz.eu/web/rhein/" target="_blank">fewo rhein</a> &copy; WebCraft Media 2013'), array(config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://fewo-rhein-zwbg.de/" target="_blank">fewo rhein</a> &copy; WebCraft Media 2013'),
array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, '../system/'), array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
array(config_ids::SYS_CONFIG_LANGS, array('deDE')), array(config_ids::SYS_CONFIG_LANGS, array('deDE')),
array(config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'), array(config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'),
array(config_ids::WEBCRAFT_BILLING_TOKEN, 'RHEINadasdbcahdscjhd213')); array(config_ids::WEBCRAFT_BILLING_TOKEN, 'RHEINadasdbcahdscjhd213'));

View File

@ -1,5 +1,5 @@
<?php <?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'rhein/autoload.inc.php'; //Project Classes require_once 'rhein/autoload.inc.php'; //Project Classes
require_once 'config.php'; require_once 'config.php';

View File

@ -192,3 +192,6 @@ li {
max-width: 500px; max-width: 500px;
max-height: 420px; max-height: 420px;
} }
#map {
border: 1px solid black;}

View File

@ -33,6 +33,7 @@ function drawmap() {
var lat = 49.73296614; var lat = 49.73296614;
var zoom = 17; var zoom = 17;
$('#map').empty();
map = new OpenLayers.Map('map', { map = new OpenLayers.Map('map', {
projection: new OpenLayers.Projection("EPSG:900913"), projection: new OpenLayers.Projection("EPSG:900913"),
displayProjection: new OpenLayers.Projection("EPSG:4326"), displayProjection: new OpenLayers.Projection("EPSG:4326"),

View File

@ -1,5 +1,5 @@
<?php <?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'rhein/autoload.inc.php'; //Project Classes require_once 'rhein/autoload.inc.php'; //Project Classes
require_once 'config.php'; //Server config require_once 'config.php'; //Server config

1
system Submodule

@ -0,0 +1 @@
Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d