diff --git a/.htaccess b/.htaccess
index 497b9dd..3d9cc86 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,2 +1,3 @@
RewriteEngine On
-RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2
\ No newline at end of file
+RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2 [L]
+RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]
\ No newline at end of file
diff --git a/danube/page/default_page/pics/photos/flower.png b/danube/files/content/flower.png
similarity index 100%
rename from danube/page/default_page/pics/photos/flower.png
rename to danube/files/content/flower.png
diff --git a/danube/page/default_page/pics/photos/top2.png b/danube/files/content/top2.big.png
similarity index 100%
rename from danube/page/default_page/pics/photos/top2.png
rename to danube/files/content/top2.big.png
diff --git a/danube/files/content/top2.png b/danube/files/content/top2.png
new file mode 100644
index 0000000..17f88b7
Binary files /dev/null and b/danube/files/content/top2.png differ
diff --git a/danube/files/content/verlauf_bg.png b/danube/files/content/verlauf_bg.png
index e78c252..ea1025c 100644
Binary files a/danube/files/content/verlauf_bg.png and b/danube/files/content/verlauf_bg.png differ
diff --git a/danube/files/content/verlauf_bg.small.png b/danube/files/content/verlauf_bg.small.png
new file mode 100644
index 0000000..e78c252
Binary files /dev/null and b/danube/files/content/verlauf_bg.small.png differ
diff --git a/danube/page/autoload.inc b/danube/page/autoload.inc
index b09808a..f62fe11 100644
--- a/danube/page/autoload.inc
+++ b/danube/page/autoload.inc
@@ -1,11 +1,10 @@
WEBPATH(false));}
+ return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
+ \SYSTEM\HTML\html::link( \SYSTEM\CACHE\cache_css::minify(
+ array( new PPAGE('default_page/css/default_page.css'))));}
public function html($_escaped_fragment_ = NULL){
$vars = array();
diff --git a/danube/page/default_page/js/default_page.js b/danube/page/default_page/js/default_page.js
index 807428c..e2db2d3 100644
--- a/danube/page/default_page/js/default_page.js
+++ b/danube/page/default_page/js/default_page.js
@@ -1,62 +1,10 @@
-/* jQuery on document ready */
-$(document).ready(function() {
- // handle navigation link click
- $('#danube_menu ul li a, #danube_menu .dropdown-menu li a, .test a').click(function () {
- loadAjaxContent($(this).attr('url'));
- //loadUrlPic($(this).attr('url'));
- });
- //handle arrowclicks
- $('.test a').click(function () {
- //loadUrlPic($(this).attr('url'));
- //alert("fu");
- loadApiPic(-1);
- });
-
+$(document).ready(function() {
new SYSTEM('./api.php',1,'start');
-});
-
-function loadAjaxContent(url) {
- var dataTmp;
- $.get(url, function (data) {
- dataTmp = data;
- bodyelem = $("html,body");
- bodyelem.animate();
- }).complete(function() {
- $('#site-content-wrapper').slideUp({duration: 'slow',
- complete: function(){
- $('#site-content').html(dataTmp);
- $('#site-content-wrapper').slideDown('slow');
- site_content_is_visible = true;
- }});
- });
-
-}
-function loadUrlPic(url_pic) {
- var dataTmp;
- $.get(url_pic, function (data) {
- dataTmp = data;
- bodyelem = $("html,body");
- bodyelem.animate();
- }).complete(function() {
- $('.carousel-inner').slideUp({duration: 'slow',
- complete: function(){
- $('#pic').html(dataTmp);
- $('.carousel-inner').slideDown('slow');
- site_content_is_visible = true;
- }});
- });
-}
-
-function loadApiPic(id) {
- var dataTmp;
- $.get('./api.php?call=img&id='+id, function (data) {
- dataTmp = data;
- bodyelem = $("html,body");
- bodyelem.animate();
- }).complete(function() {
-
+
+ $('.navbar-collapse a').click(function(){
+ $(".navbar-collapse").collapse('hide');
});
-}
+});
function switchTextBg(color){
@@ -64,7 +12,7 @@ function switchTextBg(color){
div.style.backgroundColor = color;
var div2 = document.getElementById("site-content-wrapper");
- //div2.style.backgroundColor = color;
+ div2.style.backgroundColor = color;
if (color == "black") div.style.color = "white";
if (color == "white") div.style.color = "black";
diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl
index 8c86c4d..7cad569 100644
--- a/danube/page/default_page/tpl/danube.tpl
+++ b/danube/page/default_page/tpl/danube.tpl
@@ -3,72 +3,67 @@
${danube_page_title}
-
+
${danube_html_meta}
-
-
+
-
-
- 