# HG changeset patch # User Mathias Gebbe <mgebbe@intevation.de> # Date 1393944351 -3600 # Node ID b775179be3d4b99f9da6ea3f8bff3b2a5f9481f5 # Parent 86216e9d75b19c71a785fc54ef857629bb15c400 RewriteRule for index.html and changed logo-link to "/" Changed Demoanwendung to Demoversion in contact.html Changed index.psp: don't remove word wrap diff -r 86216e9d75b1 -r b775179be3d4 .htaccess --- a/.htaccess Mon Mar 03 18:40:53 2014 +0100 +++ b/.htaccess Tue Mar 04 15:45:51 2014 +0100 @@ -4,3 +4,7 @@ AddDefaultCharset UTF-8 DirectoryIndex index.psp + +# Nobody should see the index.html +RewriteEngine On +RewriteRule ^index\.html$ $1/index.psp [R] diff -r 86216e9d75b1 -r b775179be3d4 contact.html --- a/contact.html Mon Mar 03 18:40:53 2014 +0100 +++ b/contact.html Tue Mar 04 15:45:51 2014 +0100 @@ -38,7 +38,7 @@ </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> - <li><a href="#"><span class="glyphicon glyphicon-cog"> Demoanwendung</span></a></li> + <li><a href="#"><span class="glyphicon glyphicon-cog"> Demoversion</span></a></li> <li><a href="http://wald.intevation.org/scm/?group_id=57"><span class="glyphicon glyphicon-folder-open"> SCM-Repository</span></a></li> <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits"><span class="glyphicon glyphicon-pencil"> Mailinglist</span></a></li> <li class="active"><a href="contact.html"><span class="glyphicon glyphicon-envelope"> Kontakt</span></a></li> diff -r 86216e9d75b1 -r b775179be3d4 index.html --- a/index.html Mon Mar 03 18:40:53 2014 +0100 +++ b/index.html Tue Mar 04 15:45:51 2014 +0100 @@ -31,7 +31,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="index.html"><img src="img/logo.png" alt="logo" class="img-responsive"></a> + <a class="brand" href="/"><img src="img/logo.png" alt="logo" class="img-responsive"></a> </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> diff -r 86216e9d75b1 -r b775179be3d4 index.psp --- a/index.psp Mon Mar 03 18:40:53 2014 +0100 +++ b/index.psp Tue Mar 04 15:45:51 2014 +0100 @@ -19,7 +19,7 @@ # END SETTINGS with open (tmpl, "r") as myfile: - template=myfile.read().replace('\n', '') + template=myfile.read() req.content_type = "text/html; charset=UTF-8" output = []