Release v2.0

v2.0

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 Thumbs.db
 oauth/OAuth_id.php
+.idea

.htaccess

@@ -0,0 +1,55 @@
+# compress with MOD_DEFLATE
+AddOutputFilterByType DEFLATE text/html text/css text/plain text/xml text/javascript application/x-javascript application/javascript application/x-httpd-php
+
+# proxies should not decompress for the user
+Header append Vary User-Agent env=!dont-vary
+
+<IfModule mod_headers.c>
+  # Cache images and other static files for 1 month
+  <FilesMatch ".(ico|jpe?g|png|gif|css|js|gz)$">
+    Header set Cache-Control "max-age=2592000"
+  </FilesMatch>
+
+  # Cache html and xml for 12 hours
+  <filesMatch ".(html|htm|xml)$">
+    Header set Cache-Control "max-age=43200"
+  </filesMatch>
+
+  # do NOT cache php and cgi files
+  <FilesMatch ".(php)$">
+    Header unset Cache-Control
+  </FilesMatch>
+</IfModule>
+
+# BEGIN Expire headers
+<IfModule mod_expires.c>
+  ExpiresActive On
+  ExpiresDefault "access plus 7200 seconds"
+  ExpiresByType image/jpg "access plus 2592000 seconds"
+  ExpiresByType image/jpeg "access plus 2592000 seconds"
+  ExpiresByType image/png "access plus 2592000 seconds"
+  ExpiresByType image/gif "access plus 2592000 seconds"
+  AddType image/x-icon .ico
+  ExpiresByType image/ico "access plus 2592000 seconds"
+  ExpiresByType image/icon "access plus 2592000 seconds"
+  ExpiresByType image/x-icon "access plus 2592000 seconds"
+  ExpiresByType text/css "access plus 2592000 seconds"
+  ExpiresByType text/javascript "access plus 2592000 seconds"
+  ExpiresByType text/html "access plus 7200 seconds"
+  ExpiresByType application/xhtml+xml "access plus 7200 seconds"
+  ExpiresByType application/javascript A259200
+  ExpiresByType application/x-javascript "access plus 2592000 seconds"
+</IfModule>
+# END Expire headers
+
+Header unset ETag
+FileETag none
+
+# protect the htaccess file
+<files .htaccess>
+order allow,deny
+deny from all
+</files>
+
+# forbid directory listing
+Options -Indexes

README.md

@@ -1,3 +1,5 @@
+![wikijourney.logo](images/design/wj_logos/logo_small.png)
+
 # WikiJourney (web)
 
 A website made for tourism, based on Wikipedia information.
@@ -14,8 +16,7 @@ A website made for tourism, based on Wikipedia information.
 
 ## Resources used
 
-The application uses [Leaflet](http://leafletjs.com/) to display [OSM](http://www.openstreetmap.org) tiles as well as [Leaflet Routing Machine](http://www.liedman.net/leaflet-routing-machine/) to guide users.
-Some icons from [Font Awesome](http://fontawesome.io/) were compiled using [Fontello](http://fontello.com/).
+The application uses [Leaflet](http://leafletjs.com/) to display [OSM](http://www.openstreetmap.org) tiles as well as [Leaflet Routing Machine](http://www.liedman.net/leaflet-routing-machine/) to guide users. 
 
 ## Contributing
 If you want to contribute, first: Thank you! Some advices though:
@@ -29,8 +30,6 @@ Links :
 - [App Repository](https://github.com/WikiJourney/wikijourney_app/)
 - [API Repository](https://github.com/WikiJourney/wikijourney_api/)
 
-![wikijourney.logo](http://wikijourneydev.alwaysdata.net/images/design/logo.png)
-
 If you're interested in making cities easier to visit, you can contribute to our project by improving our website or our application!
 
 -----------

about.php

@@ -18,24 +18,25 @@
 */
 	include("./include/haut.php");	
 ?>
+<div class="container" id="first_content">
+	<h1><?php echo _ABOUT_TITLE; ?></h1>
 
-<h1><?php echo _ABOUT_TITLE; ?></h1>
+	<?php echo _ABOUT_TEXT; ?>
 
-<?php echo _ABOUT_TEXT; ?>
+	<h2><?php echo _TECHNICAL_TITLE; ?></h2>
 
-<h2><?php echo _TECHNICAL_TITLE; ?></h2>
+	<p><?php echo _TECHNICAL_TEXT; ?></p>
+	<p>Wiki : <a href="https://github.com/WikiJourney/wikijourney_website/wiki" title="Wiki">GitHub</a></p>
+	<p>Blog : <a href="http://blog.wikijourney.eu" title="Blog">Blog</a></p>
 
-<p><?php echo _TECHNICAL_TEXT; ?></p>
-<p>Wiki : <a href="https://github.com/WikiJourney/wikijourney_website/wiki" title="Wiki">GitHub</a></p>
-<p>Blog : <a href="http://blog.wikijourney.eu" title="Blog">Blog</a></p>
+	<h2><?php echo _TEAM_TITLE; ?></h2>
+	<p><a href="team.php"><?php echo _TEAM_WHO_R_WE; ?></a></p>
 
-<h2><?php echo _TEAM_TITLE; ?></h2>
-<p><a href="team.php"><?php echo _TEAM_WHO_R_WE; ?></a></p>
+	<h2><?php echo _COPYRIGHT; ?></h2>
 
-<h2>Copyrights</h2>
-
-<p>Photo by <a href="https://www.flickr.com/photos/hailemichaelfiseha/6956440746">Fiseha Hailemichael</a><br/>
-All trademarks and logos are the property of their respective owners.</p>
+	<p>Photo : <a href="https://www.flickr.com/photos/hailemichaelfiseha/6956440746">Fiseha Hailemichael</a><br/>
+	<?php echo _COPYRIGHT_INFO; ?></p>
+</div>
 <?php
 	include("./include/bas.php");
 ?>