From 63a361225d750d1fbf70fadf92bd9216a32378fa Mon Sep 17 00:00:00 2001
From: Sebastian <trendschau@gmail.com>
Date: Wed, 28 Feb 2018 21:03:59 +0100
Subject: [PATCH] redirect index.php, fix styles, use absolute urls

---
 .gitignore                                    |  1 +
 .htaccess                                     | 11 ++++++++++-
 cache/lastCache.txt                           |  2 +-
 themes/typemill/chapter.twig                  |  2 +-
 themes/typemill/css/style.css                 |  5 +----
 themes/typemill/partials/navigation.twig      |  4 ++--
 themes/typemill/partials/navigationCover.twig |  4 ++--
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4888ca..7deda98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ plugins/admin
 plugins/demo
 plugins/disqus
 plugins/version
+plugins/finalwords
 system/vendor
 tests
 zips
diff --git a/.htaccess b/.htaccess
index 0eb7391..e8a10c0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -18,11 +18,20 @@ RewriteRule ^(.*)?\.txt$ - [F,L]
 RewriteRule ^(.*)?\.example$ - [F,L]
 RewriteRule ^(.*/)?\.git+ - [F,L]
 
+# Use this to redirect HTTP to HTTPS on apache servers
+# RewriteCond %{HTTPS} off
+# RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+
+
 # Use this to redirect www to non-wwww on apache servers
 # RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 # RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
-# Remove the index.php
+# Removes index.php
+RewriteCond %{THE_REQUEST} ^GET.*index\.php [NC]
+RewriteRule (.*?)index\.php/*(.*) /$1$2 [R=301,NE,L]
+
+# Directs all web requests through the site index file
 RewriteCond %{REQUEST_URI} !^/index\.php
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/cache/lastCache.txt b/cache/lastCache.txt
index f3e6806..270c4c4 100644
--- a/cache/lastCache.txt
+++ b/cache/lastCache.txt
@@ -1 +1 @@
-1519593451
\ No newline at end of file
+1519847402
\ No newline at end of file
diff --git a/themes/typemill/chapter.twig b/themes/typemill/chapter.twig
index 136b00d..bd602df 100644
--- a/themes/typemill/chapter.twig
+++ b/themes/typemill/chapter.twig
@@ -17,7 +17,7 @@
 	<ul>
 		{% for element in item.folderContent %}
 
-			<li class="level-2"><a href="{{ element.urlRel }}">{{ element.name }}</a></li>
+			<li class="level-2"><a href="{{ element.urlAbs }}">{{ element.name }}</a></li>
 		
 		{% endfor %}
 	</ul>
diff --git a/themes/typemill/css/style.css b/themes/typemill/css/style.css
index 4edecda..050b311 100644
--- a/themes/typemill/css/style.css
+++ b/themes/typemill/css/style.css
@@ -300,7 +300,7 @@ header p{
 /************************
 *  		CHAPTER		    *
 ************************/
-.chapter{
+.chapterNumber, .chapter h1{
 	text-align: center;
 }
 .chapterNumber{
@@ -314,9 +314,6 @@ header p{
 	padding-bottom: 40px;
 	margin:0;
 }
-.chapter p{
-	text-align: left;
-}
 
 /************************
 *  		ARTICLE		    *
diff --git a/themes/typemill/partials/navigation.twig b/themes/typemill/partials/navigation.twig
index 240113e..51c2aaf 100644
--- a/themes/typemill/partials/navigation.twig
+++ b/themes/typemill/partials/navigation.twig
@@ -11,12 +11,12 @@
 			<li class="{{ element.elementType }} level-{{ element.keyPathArray|length }}">
 		{% endif %}
             {% if element.elementType == 'folder' %}
-				<a href="{{ element.urlRel }}">{{ element.name|title }}</a>		
+				<a href="{{ element.urlAbs }}">{{ element.name|title }}</a>		
                 <ul>
                     {{ macros.loop_over(element.folderContent) }}
                 </ul>
             {% else %}
-				<a href="{{ element.urlRel }}">{{ element.name|title }}</a>
+				<a href="{{ element.urlAbs }}">{{ element.name|title }}</a>
             {% endif %}
         </li>
     {% endfor %}
diff --git a/themes/typemill/partials/navigationCover.twig b/themes/typemill/partials/navigationCover.twig
index 147a715..c0ca9d2 100644
--- a/themes/typemill/partials/navigationCover.twig
+++ b/themes/typemill/partials/navigationCover.twig
@@ -11,12 +11,12 @@
 			<li class="{{ element.elementType }} level-{{ element.keyPathArray|length }}">
 		{% endif %}
             {% if element.elementType == 'folder' and element.keyPathArray|length == 1 %}
-				<a href="{{ element.urlRel }}">{{ element.name|title }}</a>		
+				<a href="{{ element.urlAbs }}">{{ element.name|title }}</a>		
                 <ul>
                     {{ macros.loop_over(element.folderContent) }}
                 </ul>
             {% else %}
-				<a href="{{ element.urlRel }}">{{ element.name|title }}</a>
+				<a href="{{ element.urlAbs }}">{{ element.name|title }}</a>
             {% endif %}
         </li>
     {% endfor %}