Merge pull request #43 from WikiJourney/dev

Small modifications
WikiJourney · Feb 27, 2016 · 6f752ed · 6f752ed
2 parents a3bac97 + 6193606
commit 6f752ed
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 9 deletions.
diff --git a/about.php b/about.php
@@ -32,6 +32,10 @@
 <h2><?php echo _TEAM_TITLE; ?></h2>
 <p><a href="team.php"><?php echo _TEAM_WHO_R_WE; ?></a></p>
 
+<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>
 <?php
 	include("./include/bas.php");
 ?>
diff --git a/action.php b/action.php
@@ -40,7 +40,10 @@
 ?>
 <script type="text/javascript">
 <!--
-	// document.location.href = "index.php";
-	document.location.href = document.referrer;
+	if (document.referrer.indexOf('action.php') === -1) {
+		document.location.href = document.referrer;
+	} else {
+		document.location.href = 'index.php';
+	}
 -->
 </script>
diff --git a/images/design/lille.jpg b/images/design/lille.jpg
diff --git a/images/design/nord_tourisme.png b/images/design/nord_tourisme.png
diff --git a/images/design/wikimedia_france_logo.png b/images/design/wikimedia_france_logo.png
diff --git a/include/bas.php b/include/bas.php
@@ -9,7 +9,11 @@
 
 				</tr>
 				<tr>
-					<td><?php echo _NO_PARTNERS_LOL; ?></td>
+					<td>
+						<a target="_blank" href="http://www.wikimedia.fr/"><img src="./images/design/wikimedia_france_logo.png" title="Wikimedia France" alt="Wikimedia France"/></a>
+						<!--<a target="_blank" href="http://www.tourisme-nord.fr/"><img src="./images/design/nord_tourisme.png" title="Nord Tourisme" alt="Nord Tourisme"/></a>-->
+
+					</td>
 					<td>
 						<a target="_blank" href="https://www.facebook.com/WikiJourney"><img src="./images/design/fb.png" alt="Facebook" title="Facebook" /></a>
 						<a target="_blank" href="https://twitter.com/WikiJourney"><img src="./images/design/twitter.png" alt="Twitter" title="Twitter" /></a>

diff --git a/include/haut.php b/include/haut.php
@@ -123,7 +123,7 @@
 					document.getElementById("lien_" + "<?php echo $nomPage; ?>").style.cssText = "background-color: rgb(137,160,173);";
 			</script>
 
-		</div>
+	</div>
 		<?php
 		if($nomPage == 'index.php')
 		{

diff --git a/lg/en.php b/lg/en.php
@@ -17,7 +17,7 @@
 define("_BLOG",				"Blog");
 
 //===> Bottom
-define("_OUR_PARTNERS",		"Our partners");
+define("_OUR_PARTNERS",		"Partners");
 define("_NO_PARTNERS_LOL",	"No partners for the moment. If interested in a partnership, contact us!");
 define("_FOLLOW_US",		"Follow us!");
 

diff --git a/lg/fr.php b/lg/fr.php
@@ -17,7 +17,7 @@
 define("_BLOG",				"Blog");
 
 //===> Bottom
-define("_OUR_PARTNERS",		"Nos partenaires");
+define("_OUR_PARTNERS",		"En collaboration avec :");
 define("_NO_PARTNERS_LOL",	"Pas de partenaires pour l'instant. Un partenariat vous intéresse ? Contactez nous !");
 define("_FOLLOW_US",		"Suivez le projet !");
 

diff --git a/style/design.css b/style/design.css
@@ -63,10 +63,10 @@ margin: auto;
 
 #banniere {
 background-color:white;
-max-width: 1651px;
+max-width: 1502px;
 margin: 0 auto;
-background-image: url("../images/design/new_york.jpg");
-height: 238px;
+background-image: url("../images/design/lille.jpg");
+height: 300px;
 border-bottom: 1px solid black;
 font-size: 32px;
 color: black;
@@ -103,8 +103,10 @@ text-align: center;
 }
 
 #logoban{
+margin: 20px;
 margin-left: 100px;
 height: 180px;
+margin-bottom: 42px;
 }
 
 /* ===> Menu <===*/
@@ -119,6 +121,7 @@ text-align: center;
 opacity: 0.9;
 height: 40px;
 width: 1002px;
+
 }
 
 /* => Cells */
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,7 +123,7 @@ @@
     					document.getElementById("lien_" + "<?php echo $nomPage; ?>").style.cssText = "background-color: rgb(137,160,173);";
     			</script>
-    		</div>
+    	</div>
     		<?php
     		if($nomPage == 'index.php')
     		{
@@ Expand Down @@