Commit e3dc3ac5 authored by mmarkus1's avatar mmarkus1
Browse files

new structure and some error correction

parent b1c08d2e
<?xml version="1.0" encoding="UTF-8"?>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/page_index.html" data-template-at="content-container">
<div data-template="mviewer:show"/>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/surroundings.html" data-template-at="content-container">
<!--<div data-template="mviewer:show"/>-->
<div data-template="confluence:confluence" data-template-id=""/>
</div>
<!-- FOOTER
================================================== -->
<footer>
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="footer__col">
<h3 class="footer__header">ARCHITRAVE</h3>
<p>
Art and Architecture in German Travel Accounts to Paris and Versailles in the Baroque Era
</p>
<ul class="social-icons social-icons_sm">
<li class="facebook">
<a href="#">
<i class="fa fa-facebook"/>
</a>
</li>
<li class="twitter">
<a href="#">
<i class="fa fa-twitter"/>
</a>
</li>
<li class="google-plus">
<a href="#">
<i class="fa fa-google-plus"/>
</a>
</li>
</ul>
</div>
</div>
<div class="col-xs-6 col-sm-2">
</div>
<div class="col-xs-6 col-sm-2">
<!-- Hier war vorher Learn More... -->
</div>
<div class="col-xs-12 col-sm-4">
<!-- Hier war vorher email subscribe -->
</div>
</div> <!-- / .row -->
<hr class="footer__hr"/>
<div class="row">
<div class="col-sm-6">
<p>
ARCHITRAVE 2017. All rights reserved.
</p>
</div>
</div> <!-- / .row -->
</div> <!-- / .container -->
</footer>
<!-- Navbar -->
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar_main" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
</button>
<a class="navbar-brand" href="index.html">ARCHITRAVE</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar_main">
<!--<ul class="nav navbar-nav navbar-left">-->
<ul class="nav navbar-nav navbar-left" data-template="templates:include" data-template-path="/../../sade-projects/textgrid/templates/tmpl1/nav_include.html">
<!--<li><a href="index.html">Home</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="profile.html">Profile</a></li>
<li><a href="edit-profile.html">Edit Profile</a></li>
<li><a href="inbox.html">Inbox</a></li>
<li><a href="inbox-dialog.html">Inbox: Dialog</a></li>
<li><a href="sign-in.html">Sign In</a></li>
<li><a href="sign-up.html">Sign Up</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Blog <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="blog.html">Blog</a></li>
<li><a href="blog-timeline.html">Blog: Timeline</a></li>
<li><a href="blog-post.html">Blog Post</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Gallery <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="gallery-text.html">Gallery: Text blocks</a></li>
<li><a href="gallery-bubbles.html">Gallery: Bubbles</a></li>
<li><a href="gallery-item.html">Gallery Item</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More Pages <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="about-us.html">About Us</a></li>
<li><a href="contact.html">Contact Us</a></li>
<li><a href="404.html">Error 404</a></li>
<li><a href="faq.html">FAQ</a></li>
<li><a href="team.html">Our Team</a></li>
<li><a href="pricing.html">Pricing</a></li>
</ul>
</li>
<li><a href="ui-elements.html">UI elements</a></li>-->
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-globe"/>
<span data-template="lang:translate" data-template-content="Language"/> <span class="caret"/>
</a>
<ul class="dropdown-menu">
<li>
<a href="#" onclick="insertParam('lang','de');">Deutsch</a>
<a href="#" onclick="insertParam('lang','en');">English</a>
<a href="#" onclick="insertParam('lang','fr');">Français</a>
</li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-search navbar-right" action="results.html" method="GET">
<div class="form-group">
<input id="searchInput" type="text" class="form-control" placeholder="  Search" data-template="templates:form-control" name="q"/>
<input id="searchLang" type="hidden" name="lang" value="en"/>
</div>
<button class="btn btn-default" type="submit">
<i class="fa fa-search"/>
<span data-template="lang:translate" data-template-content="Search"/>
</button>
</form>
</div><!-- /.navbar-collapse -->
</div><!-- /.container -->
</nav>
<html lang="en">
<html>
<head class="html_boxed">
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
......@@ -17,112 +17,14 @@
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600italic,600,700,700italic,800,800italic" rel="stylesheet" type="text/css"/>
</head>
<body>
<!-- NAVIGATION
================================================== -->
<!-- Navbar -->
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar_main" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
</button>
<a class="navbar-brand" href="index.html">ARCHITRAVE</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar_main">
<!--<ul class="nav navbar-nav navbar-left">-->
<ul class="nav navbar-nav navbar-left" data-template="templates:include" data-template-path="/../../sade-projects/textgrid/templates/tmpl1/nav_include.html">
<!--<li><a href="index.html">Home</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="profile.html">Profile</a></li>
<li><a href="edit-profile.html">Edit Profile</a></li>
<li><a href="inbox.html">Inbox</a></li>
<li><a href="inbox-dialog.html">Inbox: Dialog</a></li>
<li><a href="sign-in.html">Sign In</a></li>
<li><a href="sign-up.html">Sign Up</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Blog <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="blog.html">Blog</a></li>
<li><a href="blog-timeline.html">Blog: Timeline</a></li>
<li><a href="blog-post.html">Blog Post</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Gallery <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="gallery-text.html">Gallery: Text blocks</a></li>
<li><a href="gallery-bubbles.html">Gallery: Bubbles</a></li>
<li><a href="gallery-item.html">Gallery Item</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More Pages <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="about-us.html">About Us</a></li>
<li><a href="contact.html">Contact Us</a></li>
<li><a href="404.html">Error 404</a></li>
<li><a href="faq.html">FAQ</a></li>
<li><a href="team.html">Our Team</a></li>
<li><a href="pricing.html">Pricing</a></li>
</ul>
</li>
<li><a href="ui-elements.html">UI elements</a></li>-->
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-globe"/>English <span class="caret"/>
</a>
<ul class="dropdown-menu">
<li>
<a href="?lang=de">Deutsch</a>
<a href="?lang=en">English</a>
<a href="?lang=fr">Français</a>
</li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-search navbar-right">
<div class="form-group">
<input type="text" class="form-control" placeholder=" Search"/>
</div>
<button type="submit" class="btn btn-default">
<i class="fa fa-search"/>Search
</button>
</form>
</div><!-- /.navbar-collapse -->
</div><!-- /.container -->
</nav>
<!-- CONTENT
================================================== -->
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/navbar.html" data-template-at="content-container">
</div>
<!-- Showcase -->
<div class="showcase">
......@@ -178,72 +80,18 @@
</a>
</div> <!-- / .carousel -->
</div> <!-- / .showcase -->
<!-- SERVICES
<!-- CONTENT
================================================== -->
<div class="container" id="content-container">
</div> <!-- / .container -->
<!-- FOOTER
================================================== -->
<footer>
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="footer__col">
<h3 class="footer__header">ARCHITRAVE</h3>
<p>
Art and Architecture in German Travel Accounts to Paris and Versailles in the Baroque Era
</p>
<ul class="social-icons social-icons_sm">
<li class="facebook">
<a href="#"><i class="fa fa-facebook"></i></a>
</li>
<li class="twitter">
<a href="#"><i class="fa fa-twitter"></i></a>
</li>
<li class="google-plus">
<a href="#"><i class="fa fa-google-plus"></i></a>
</li>
</ul>
</div>
</div>
<div class="col-xs-6 col-sm-2">
</div>
<div class="col-xs-6 col-sm-2">
<!-- Hier war vorher Learn More... -->
</div>
<div class="col-xs-12 col-sm-4">
<!-- Hier war vorher email subscribe -->
</div>
</div> <!-- / .row -->
<hr class="footer__hr"/>
<div class="row">
<div class="col-sm-6">
<p>
ARCHITRAVE 2017. All rights reserved.
</p>
</div>
</div> <!-- / .row -->
</div> <!-- / .container -->
</footer>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/footer.html" data-template-at="content-container">
</div>
<!-- JavaScript
================================================== -->
......@@ -258,5 +106,40 @@
<!-- JS Custom -->
<script src="assets/js/custom.js"/>
<!-- Custom JS Scripts -->
<script>
function getLang() {
var lang = document.location.search.split("lang=")[1];
if (lang !== undefined) { document.getElementById("searchLang").value = lang; }
else {}
}
function insertParam(key, value) {
key = escape(key); value = escape(value);
var kvp = document.location.search.substr(1).split("&amp;");
if (kvp == '') {
document.location.search = '?' + key + '=' + value;
}
else {
var i = kvp.length; var x; while (i--) {
x = kvp[i].split('=');
if (x[0] == key) {
x[1] = value;
kvp[i] = x.join('=');
break;
}
}
if (i &lt; 0) { kvp[kvp.length] = [key, value].join('='); }
//this will reload the page, it's likely better to store this until finished
document.location.search = kvp.join('&amp;');
}
}
</script>
</body>
</html>
<html lang="en">
<html>
<head class="html_boxed">
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
......@@ -17,173 +17,24 @@
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600italic,600,700,700italic,800,800italic" rel="stylesheet" type="text/css"/>
</head>
<body>
<!-- NAVIGATION
================================================== -->
<!-- Navbar -->
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar_main" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
</button>
<a class="navbar-brand" href="index.html">ARCHITRAVE</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar_main">
<!--<ul class="nav navbar-nav navbar-left">-->
<ul class="nav navbar-nav navbar-left" data-template="templates:include" data-template-path="/../../sade-projects/textgrid/templates/tmpl1/nav_include.html">
<!--<li><a href="index.html">Home</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="profile.html">Profile</a></li>
<li><a href="edit-profile.html">Edit Profile</a></li>
<li><a href="inbox.html">Inbox</a></li>
<li><a href="inbox-dialog.html">Inbox: Dialog</a></li>
<li><a href="sign-in.html">Sign In</a></li>
<li><a href="sign-up.html">Sign Up</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Blog <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="blog.html">Blog</a></li>
<li><a href="blog-timeline.html">Blog: Timeline</a></li>
<li><a href="blog-post.html">Blog Post</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Gallery <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="gallery-text.html">Gallery: Text blocks</a></li>
<li><a href="gallery-bubbles.html">Gallery: Bubbles</a></li>
<li><a href="gallery-item.html">Gallery Item</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More Pages <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="about-us.html">About Us</a></li>
<li><a href="contact.html">Contact Us</a></li>
<li><a href="404.html">Error 404</a></li>
<li><a href="faq.html">FAQ</a></li>
<li><a href="team.html">Our Team</a></li>
<li><a href="pricing.html">Pricing</a></li>
</ul>
</li>
<li><a href="ui-elements.html">UI elements</a></li>-->
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-globe"/>English <span class="caret"/>
</a>
<ul class="dropdown-menu">
<li>
<a href="?lang=de">Deutsch</a>
<a href="?lang=en">English</a>
<a href="?lang=fr">Français</a>
</li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-search navbar-right">
<div class="form-group">
<input type="text" class="form-control" placeholder=" Search"/>
</div>
<button type="submit" class="btn btn-default">
<i class="fa fa-search"/>Search
</button>
</form>
</div><!-- /.navbar-collapse -->
</div><!-- /.container -->
</nav>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/navbar.html" data-template-at="content-container">
</div>
<!-- CONTENT
================================================== -->
<div class="container" id="content-container">
</div> <!-- / .container -->
<!-- FOOTER
================================================== -->
<footer>
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="footer__col">
<h3 class="footer__header">ARCHITRAVE</h3>
<p>
Art and Architecture in German Travel Accounts to Paris and Versailles in the Baroque Era
</p>
<ul class="social-icons social-icons_sm">
<li class="facebook">
<a href="#"><i class="fa fa-facebook"></i></a>
</li>
<li class="twitter">
<a href="#"><i class="fa fa-twitter"></i></a>
</li>
<li class="google-plus">
<a href="#"><i class="fa fa-google-plus"></i></a>
</li>
</ul>
</div>
</div>
<div class="col-xs-6 col-sm-2">
</div>
<div class="col-xs-6 col-sm-2">
<!-- Hier war vorher Learn More... -->
</div>
<div class="col-xs-12 col-sm-4">
<!-- Hier war vorher email subscribe -->
</div>
</div> <!-- / .row -->
<hr class="footer__hr"/>
<div class="row">
<div class="col-sm-6">
<p>
ARCHITRAVE 2017. All rights reserved.
</p>
</div>
</div> <!-- / .row -->
</div> <!-- / .container -->
</footer>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/footer.html" data-template-at="content-container">
</div>
<!-- JavaScript
================================================== -->
......@@ -198,5 +49,40 @@
<!-- JS Custom -->
<script src="assets/js/custom.js"/>
<!-- Custom JS Scripts -->
<script>
function getLang() {
var lang = document.location.search.split("lang=")[1];
if (lang !== undefined) { document.getElementById("searchLang").value = lang; }
else {}
}
function insertParam(key, value) {
key = escape(key); value = escape(value);
var kvp = document.location.search.substr(1).split("&amp;");
if (kvp == '') {