diff --git a/danube/autoload.inc b/danube/autoload.inc index 6641740..12d9887 100644 --- a/danube/autoload.inc +++ b/danube/autoload.inc @@ -1,5 +1,5 @@ SERVERPATH(), $vars); } } \ No newline at end of file diff --git a/danube/page/default_introduction/introduction.html b/danube/page/default_introduction/introduction.html deleted file mode 100644 index 7ebaf78..0000000 --- a/danube/page/default_introduction/introduction.html +++ /dev/null @@ -1,3 +0,0 @@ -
-${danube_page_partners} -
\ No newline at end of file diff --git a/danube/page/default_introduction/introduction.tpl b/danube/page/default_introduction/tpl/introduction.tpl similarity index 100% rename from danube/page/default_introduction/introduction.tpl rename to danube/page/default_introduction/tpl/introduction.tpl diff --git a/danube/page/default_page/danube.tpl b/danube/page/default_page/danube.tpl deleted file mode 100644 index 4e3a13e..0000000 --- a/danube/page/default_page/danube.tpl +++ /dev/null @@ -1,96 +0,0 @@ - - - - ${danube_page_title} - - - ${danube_html_meta} - ${css} - ${js} - - - - - - - -
-
-
- - - - - - - -
- -
- ${languageFlags} -
- -
- ${danube_page_content}
-
- -
-
- ${danube_footer} -
-
- - - diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php index b2a813f..8d82b6f 100644 --- a/danube/page/default_page/default_page.php +++ b/danube/page/default_page/default_page.php @@ -1,25 +1,22 @@ '. - ''. - //''. - ''. - ''. - ''. - ''. - ''; + return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()). + \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()). + \SYSTEM\HTML\html::script('https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js'). + \SYSTEM\HTML\html::script('https://www.openstreetmap.org/openlayers/OpenStreetMap.js'). + \SYSTEM\HTML\html::script((new PPAGE('default_page/js/loadtexts.js'))->WEBPATH()). + \SYSTEM\HTML\html::script((new PPAGE('js/lang_switcher.js'))->WEBPATH()). + \SYSTEM\HTML\html::script((new PPAGE('default_page/js/galleria/galleria-1.2.9.min.js'))->WEBPATH()); } private function css(){ - return '';} + return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false));} private function languageFlags(){ - return '
- -
'; + return '
+ +
'; } public function html($_escaped_fragment_ = NULL){ @@ -38,6 +35,6 @@ class default_page extends SYSTEM\PAGE\Page { $vars['languageFlags'] = $this->languageFlags(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube')); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/danube.tpl'))->SERVERPATH(), $vars); } } \ No newline at end of file diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl new file mode 100644 index 0000000..c54947d --- /dev/null +++ b/danube/page/default_page/tpl/danube.tpl @@ -0,0 +1,74 @@ + + + + ${danube_page_title} + + + ${danube_html_meta} + ${css} + ${js} + + + + +
+
+
+ + + + +
+ +
+ ${languageFlags} +
+ +
+ ${danube_page_content} +
+
+
+ +
+
+ ${danube_footer} +
+
+
+ + \ No newline at end of file diff --git a/danube/page/googlemaps/googlemaps.php b/danube/page/googlemaps/googlemaps.php index c6a2edb..a257273 100644 --- a/danube/page/googlemaps/googlemaps.php +++ b/danube/page/googlemaps/googlemaps.php @@ -5,7 +5,7 @@ class googlemaps extends SYSTEM\PAGE\Page { $vars = array(); $vars['content'] = '
'; diff --git a/danube/path/PBOOTSTRAP.php b/danube/path/PBOOTSTRAP.php deleted file mode 100644 index 6ce768f..0000000 --- a/danube/path/PBOOTSTRAP.php +++ /dev/null @@ -1,5 +0,0 @@ -SERVERPATH()); } } \ No newline at end of file diff --git a/lib/system b/lib/system index b80827e..55ef099 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit b80827e711506a335dc51774948eba102396b528 +Subproject commit 55ef099e06745bda131cbc386b115107f3899487