From: Jérôme <mojo@couak.net>
Date: Tue, 21 Apr 2015 13:34:12 +0000 (+0000)
Subject: Merge branch 'fix-footer' into 'master'
X-Git-Tag: 1.1~107^2
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/b00457671d8bf1b69e441b1ceb9f3254e6ca33bd?hp=dbed483dab23459cde5eaf65323491aa55440aff

Merge branch 'fix-footer' into 'master'

Fix the footer

- Remove invisible and unused <a>
- i10n of the strings
- rtrim() the trailing slashes in the webroot URL to avoid double slashes in the link to tos.php
- reformat and indent source to make it more readable
- link to the AGPL license is now HTTPS

See merge request !4
---

diff --git a/lib/template/footer.php b/lib/template/footer.php
index 50f7b83..d947421 100644
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -1,6 +1,11 @@
 
 <div id="copyright">
-<p><a href="https://gitlab.com/mojo42/Jirafeau/wikis/home"></a><br /><a href="http://www.gnu.org/licenses/agpl.html">agplv3</a> | <a href="https://gitlab.com/mojo42/Jirafeau/wikis/home">Jirafeau Project</a> | <a href="<?php echo $cfg['web_root'] . '/tos.php'; ?>">Terms of Service</a></p>
+    <p>
+        <br />
+        <a href="https://www.gnu.org/licenses/agpl.html">agplv3</a> |
+        <a href="https://gitlab.com/mojo42/Jirafeau/wikis/home"><?php echo t('Jirafeau Project') ?></a> |
+        <a href="<?php echo rtrim($cfg['web_root'], '/') . '/tos.php'; ?>"><?php echo t('Term Of Service') ?></a>
+    </p>
 </div>
 </div>
 <div id="jyraphe">