removed old libs, added flexslider reference, updated system reference, css fixes, minor fixes
This commit is contained in:
parent
49c0781ee8
commit
2e076fdefe
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -7,3 +7,6 @@
|
||||
[submodule "danube/sai/saimod_webcraft_gallery"]
|
||||
path = danube/sai/saimod_webcraft_gallery
|
||||
url = ../saimod_webcraft_gallery.git
|
||||
[submodule "lib/flexslider"]
|
||||
path = lib/flexslider
|
||||
url = ../lib_flexslider.git
|
||||
|
||||
2
api.php
2
api.php
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'lib/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'danube/autoload.inc'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 84 KiB |
BIN
danube/files/content/font.line.png
Normal file
BIN
danube/files/content/font.line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 43 KiB |
@ -1,15 +1,94 @@
|
||||
#galleria{ width: 800px; height: 600px; background: #FFF }
|
||||
#galleria{ width: 800px; height: 600px; }
|
||||
table tr td { padding: 3px; }
|
||||
div { border-radius: 5px;}
|
||||
body {background: #6699FF !important}
|
||||
#headbanner {width: 900px; margin-right: auto; margin-left: auto;}
|
||||
#box1{border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;}
|
||||
#box2{margin: 0; padding: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;}
|
||||
#myCarousel{background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto; border-bottom: 0px solid black;}
|
||||
#space{height: 7px;margin-left: 9px; margin-right: 9px;}
|
||||
#text{line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black; border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;}
|
||||
#languages {float: right; margin-right: 25px;}
|
||||
#footer{font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;}
|
||||
body {background: #6699FF !important; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;}
|
||||
#footer{color: grey; height: 25px; padding: 5px; margin-bottom: 5px;}
|
||||
#footer-left{}
|
||||
#footer-right a {color: grey}
|
||||
#footer-right{text-align: right}
|
||||
#footer-right{text-align: right}
|
||||
|
||||
.padding0{
|
||||
padding:0 !important
|
||||
}
|
||||
|
||||
.margin0{
|
||||
margin:0;
|
||||
}
|
||||
|
||||
.width100{
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.background {
|
||||
box-shadow: 5px 5px 3px; border: 1px solid black;
|
||||
}
|
||||
|
||||
.navbar{
|
||||
background: none; border: 0; margin: 0; font-size: 20px;
|
||||
}
|
||||
|
||||
.navbar-header{
|
||||
padding-left: 9px;
|
||||
}
|
||||
|
||||
.navbar-brand{
|
||||
padding-left: 6px; font-size:22px;
|
||||
}
|
||||
|
||||
#main-img{
|
||||
height: 410px;
|
||||
}
|
||||
|
||||
#main-box{
|
||||
margin-left: 9px; margin-right: 9px;
|
||||
}
|
||||
|
||||
#lang-row{
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
#lang-col{
|
||||
text-align: right; margin-right: 2px;
|
||||
}
|
||||
|
||||
#content-row{
|
||||
margin:0; line-height: 180%; border-right: 1px solid black; border-left: 1px solid black; padding: 10px; background: white;
|
||||
}
|
||||
|
||||
@media (max-width: 991px) {
|
||||
.navbar-header {
|
||||
float: none;
|
||||
}
|
||||
.navbar-toggle {
|
||||
display: block;
|
||||
}
|
||||
.navbar-collapse {
|
||||
border-top: 1px solid transparent;
|
||||
box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
|
||||
}
|
||||
.navbar-collapse.collapse {
|
||||
display: none!important;
|
||||
}
|
||||
.navbar-nav {
|
||||
float: none!important;
|
||||
margin: 7.5px -15px;
|
||||
}
|
||||
.navbar-nav>li {
|
||||
float: none;
|
||||
}
|
||||
.navbar-nav>li>a {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
.navbar-text {
|
||||
float: none;
|
||||
margin: 15px 0;
|
||||
}
|
||||
/* since 3.1.0 */
|
||||
.navbar-collapse.collapse.in {
|
||||
display: block!important;
|
||||
}
|
||||
.collapsing {
|
||||
overflow: hidden!important;
|
||||
}
|
||||
}
|
||||
@ -1,36 +1,37 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<title>${danube_page_title}</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="fragment" content="!">
|
||||
<meta property="og:url" content="http://www.blue-danube-massage.de" />
|
||||
${danube_html_meta}
|
||||
<style>.background{background:url(./files/content/verlauf_bg.png)}</style>
|
||||
<style>.background{background:url(./files/content/verlauf_bg.png)}#main-img{background: url('files/content/top2.png') no-repeat black}</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12" style="padding:0 !important">
|
||||
<h1 style="margin:0;">
|
||||
<div class="col-md-12 padding0">
|
||||
<h1 class="margin0">
|
||||
<a href="#" title="Blue Danube Massage">
|
||||
<img class="img-responsive" src="./files/content/font.png" alt="Blue Danube Massage" style="width: 100%;"/>
|
||||
<img class="img-responsive width100" src="./files/content/font.png" alt="Blue Danube Massage"/>
|
||||
</a>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container background" style="box-shadow: 5px 5px 3px; border: 1px solid black; border-top: 0px;">
|
||||
<div class="container background">
|
||||
<div class="row">
|
||||
<nav class="navbar navbar-inverse" style="background: none; border: 0; margin: 0; font-size: 20px;">
|
||||
<div class="navbar-header" style="padding-left: 9px;">
|
||||
<nav class="navbar navbar-inverse">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed pull-left" data-toggle="collapse" data-target="#menu-collapse" aria-expanded="false">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#" onclick="switchTextBg('white')" style="padding-left: 6px;">${danube_menu_home}</a>
|
||||
<a class="navbar-brand" href="#" onclick="switchTextBg('white')"><b>${danube_menu_home}</b></a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="menu-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
@ -42,25 +43,25 @@
|
||||
<li><a href="#!certificates" onclick="switchTextBg('black')">${danube_menu_certificates}</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&layout=button_count&show_faces=true&width=450&action=like&colorscheme=light&height=80" style="border:none; overflow:hidden;height:30px; margin-top: 15px; padding: 0; width: 140px;"></iframe></li>
|
||||
<li><iframe title="Facebook Button" src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.blue-danube-massage.de&layout=button_count&show_faces=false&width=450&action=like&colorscheme=light&height=80" style="border:none; overflow:hidden;height:30px; margin-top: 15px; margin-left: 16px; padding: 0; width: 140px;"></iframe></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<div style="margin-left: 9px; margin-right: 9px;">
|
||||
<div class="row" style="margin:0;">
|
||||
<div class="col-md-12" style="background: url('files/content/top2.png') no-repeat black; border-bottom-left-radius: 5; border-bottom-right-radius: 5; margin: 0; padding: 0; height: 410px;"></div>
|
||||
<div id="main-box">
|
||||
<div class="row margin0">
|
||||
<div class="col-md-12" id="main-img"></div>
|
||||
</div>
|
||||
|
||||
<div class="row" style="height: 24px;">
|
||||
<div class="col-md-2 pull-right" style="text-align: right; margin-right: 2px;">
|
||||
<div class="row" id="lang-row">
|
||||
<div class="col-md-2 pull-right" id="lang-col">
|
||||
<a href="javascript:system.language('deDE');" title="Sprache Deutsch"><img src="./files/content/ger.jpg" alt="Sprache Deutsch" height="14"/></a>
|
||||
<a href="javascript:system.language('enUS');" title="Language English"><img src="./files/content/uk.jpg" alt="Language English" height="14"/></a>
|
||||
<a href="javascript:system.language('huHU');" title="Language Hungarian"><img src="./files/content/hu.jpg" alt="Language Hungarian" height="14"/></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" style="margin:0; line-height: 180%; fonz-size: 80%; border-right: 1px solid black; border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; background: white;">
|
||||
<div id="content" class="col-md-12"></div>
|
||||
<div class="row" id="content-row">
|
||||
<div id="content" class="col-md-12 padding0"></div>
|
||||
</div>
|
||||
<div class="row" id="footer">
|
||||
<div id="footer-left" class="col-md-8">${danube_footer}</div>
|
||||
|
||||
@ -1 +1,6 @@
|
||||
${danube_page_content}
|
||||
<div class="row-fluid">
|
||||
<div class="col-md-10">${danube_page_content}</div>
|
||||
<div class="col-md-2 padding0" style="text-align: right;">
|
||||
<img src="./files/content/flower.png" alt="Blue Danube Massage Blume Innen" style="border-radius: 5px;"/>
|
||||
</div>
|
||||
</div>
|
||||
@ -1,2 +1,3 @@
|
||||
<?php
|
||||
//require_once dirname(__FILE__).'/saimod_webcraft_billing_satelite/autoload.inc';
|
||||
require_once dirname(__FILE__).'/saimod_webcraft_gallery/autoload.inc';
|
||||
require_once dirname(__FILE__).'/saimod_webcraft_billing_satelite/autoload.inc';
|
||||
@ -1,4 +1,3 @@
|
||||
<?php
|
||||
//require_once dirname(__FILE__).'/bootstrap/autoload.inc';
|
||||
//require_once dirname(__FILE__).'/unslider/autoload.inc';
|
||||
require_once dirname(__FILE__).'/system/autoload.inc';
|
||||
require_once dirname(__FILE__).'/system/autoload.inc';
|
||||
require_once dirname(__FILE__).'/flexslider/autoload.inc';
|
||||
Binary file not shown.
1109
lib/bootstrap/css/bootstrap-responsive.css
vendored
1109
lib/bootstrap/css/bootstrap-responsive.css
vendored
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
6158
lib/bootstrap/css/bootstrap.css
vendored
6158
lib/bootstrap/css/bootstrap.css
vendored
File diff suppressed because it is too large
Load Diff
9
lib/bootstrap/css/bootstrap.min.css
vendored
9
lib/bootstrap/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
2268
lib/bootstrap/js/bootstrap.js
vendored
2268
lib/bootstrap/js/bootstrap.js
vendored
File diff suppressed because it is too large
Load Diff
6
lib/bootstrap/js/bootstrap.min.js
vendored
6
lib/bootstrap/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
1
lib/flexslider
Submodule
1
lib/flexslider
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit f8f0ff421686a4e46d571b0bc8cdcf5310c7954d
|
||||
5
lib/jquery/jquery-1.9.1.min.js
vendored
5
lib/jquery/jquery-1.9.1.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
Subproject commit d764ef189be23dd705bb161235f1b8350f1989fb
|
||||
Subproject commit 89c46b58f51728f4ceea0dd13ff4fd342cea3371
|
||||
Reference in New Issue
Block a user