fixed danube

This commit is contained in:
Ulf Gebhardt 2013-05-22 22:30:20 +02:00
parent b2bcd93d51
commit 1d530063b0
34 changed files with 43 additions and 123 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

View File

@ -1,83 +0,0 @@
.Banner
{
}
.logo
{
width: 100%;
text-align: center;
margin-bottom: 20px;
}
.container#texts
{
background: white;
}
#logo
{
width: 180px;
float: left;
background: url(css/logo.png);
height: 65px;
}
.span4
{
padding: 5px;
/*
border-left: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
*/
border: 1px solid #DDDDDD;
background: #EFEFEF;
margin-bottom: 15px;
margin-top: 15px;
}
.span4
{
padding: 5px;
/*
border-left: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
*/
border: 1px solid #DDDDDD;
background: #FEFEFE;
}
.span12
{
padding: 5px;
/*
border-left: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
*/
border: 1px solid #DDDDDD;
background: #EFEFEF;
}
.span12#bot
{
padding: 5px;
/*
border-left: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
*/
border: 1px solid #DDDDDD;
background: #FEFEFE;
}
#wrap
{
padding-top: 60px;
}
.navbar
{
background: #212121;
color: #EFEFEF;
}
.row-fluid
{
}

View File

@ -2,4 +2,5 @@
//keep this
require_once dirname(__FILE__).'/path/register_path_classes.php';
require_once dirname(__FILE__).'/page/register_page_classes.php';
require_once dirname(__FILE__).'/page/register_page_classes.php';
require_once dirname(__FILE__).'/dbd/autoload.inc.php';

View File

@ -4,7 +4,6 @@ $autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
$autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
$autoload->registerFolder(dirname(__FILE__).'/tbl/system/','DBD\SYSTEM');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');

View File

@ -23,11 +23,11 @@ class PageApi extends \SYSTEM\PAGE\PageClass {
}
public static function action_prices(){
return new prices();
return new default_prices();
}
public static function action_contact(){
return new contact();
return new default_contact();
}
public static function action_pic(){

View File

@ -1,12 +0,0 @@
<?php
class contact extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['content'] = '';
$vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'contact/contact.tpl'), $vars);
}
}

View File

@ -0,0 +1,12 @@
<?php
class default_contact extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['content'] = '';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_contact/contact.tpl'), $vars);
}
}

View File

@ -2,9 +2,8 @@
<html>
<head>
<title>${danube_page_title}</title>
<!-- Bootstrap -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
${css}
${js}
</head>
<!--<body style="background: #3366CC;"> -->

View File

@ -4,18 +4,22 @@ class default_page extends SYSTEM\PAGE\Page {
private function js(){
return '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PJQUERY(),'jquery-1.9.1.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="http://mojotrollz.eu/web/danube/danube/page/js/loadtexts.js"></script>'.
'<script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>
<script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
<script type="text/javascript" src="http://mojotrollz.eu/web/danube/danube/page/osm/osm.js"></script>';
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="http://www.openlayers.org/api/OpenLayers.js"></script>'.
'<script type="text/javascript" language="JavaScript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'osm/osm.js').'"></script>';
}
private function css(){
return '<link href="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'css/bootstrap.min.css').'" rel="stylesheet" media="screen">';}
public function html(){
$vars = array();
$vars['css'] = $this->css();
$vars['js'] = $this->js();
$vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars);

View File

@ -0,0 +1,11 @@
<?php
class default_prices extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_prices/prices.tpl'), $vars);
}
}

View File

@ -1,11 +0,0 @@
<?php
class prices extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'prices/prices.tpl'), $vars);
}
}

View File

@ -5,6 +5,6 @@ $autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__),'');
$autoload->registerFolder(dirname(__FILE__).'/default_page','');
$autoload->registerFolder(dirname(__FILE__).'/googlemaps','');
$autoload->registerFolder(dirname(__FILE__).'/prices','');
$autoload->registerFolder(dirname(__FILE__).'/default_prices','');
$autoload->registerFolder(dirname(__FILE__).'/osm','');
$autoload->registerFolder(dirname(__FILE__).'/contact','');
$autoload->registerFolder(dirname(__FILE__).'/default_contact','');

View File

@ -1,5 +1,5 @@
<?php
class PBOOTSTRAP extends \SYSTEM\PATH {
public static function getPath(){
return \SYSTEM\C_ROOT.'bootstrap/'.\SYSTEM\C_SUBPATH;}
return \SYSTEM\C_ROOT.'lib/bootstrap/'.\SYSTEM\C_SUBPATH;}
}

View File

@ -1,5 +1,5 @@
<?php
class PJQUERY extends \SYSTEM\PATH {
public static function getPath(){
return \SYSTEM\C_ROOT.'jquery/'.\SYSTEM\C_SUBPATH;}
return \SYSTEM\C_ROOT.'lib/jquery/'.\SYSTEM\C_SUBPATH;}
}

View File

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB