X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fdefault%2Fpage.footer.html;h=51bdb2f0b0eb0569f0b42e8d2255ccafb3a334d8;hb=c4ad3d4f061d05a01db25aa54dda830ba776792d;hp=84f136122db3c1bafa4c418f229ac23bd48062ef;hpb=53ed6d7d1e678d7486337ce67a2f17b30bac21ac;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index 84f13612..51bdb2f0 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,29 +1,20 @@
-<<<<<<< HEAD
-=======
-<div id="footer">
-  <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
-  - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community
-  - <a href="doc/html/index.html" rel="nofollow">Help/documentation</a>
-    {loop="$plugins_footer.text"}
-        {$value}
-    {/loop}
->>>>>>> Generate HTML documentation using MkDocs (WIP)
-</div>
+</main>
 
 <div class="pure-g">
   <div class="pure-u-2-24"></div>
-  <div id="footer" class="pure-u-20-24">
+  <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo">
+    <i class="fa fa-shaarli" aria-hidden="true"></i>
     <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
-    {if="isLoggedIn()===true"}
+    {if="$is_logged_in===true"}
       {$version}
     {/if}
     &middot;
-    The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community &middot;
-    <a href="doc/Home.html" rel="nofollow">Documentation</a>
+    {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t} &middot;
+    <a href="{$base_path}/doc/html/index.html" rel="nofollow">{'Documentation'|t}</a>
       {loop="$plugins_footer.text"}
           {$value}
       {/loop}
-  </div>
+  </footer>
   <div class="pure-u-2-24"></div>
 </div>
 
@@ -34,9 +25,19 @@
 {/loop}
 
 {loop="$plugins_footer.js_files"}
-	<script src="{$value}#"></script>
+	<script src="{$base_path}/{$value}#"></script>
 {/loop}
 
-<script src="js/shaarli.js"></script>
-<script src="inc/awesomplete.js#"></script>
-<script src="inc/awesomplete-multiple-tags.js#"></script>
+<div id="js-translations" class="hidden">
+  <span id="translation-fold">{'Fold'|t}</span>
+  <span id="translation-fold-all">{'Fold all'|t}</span>
+  <span id="translation-expand">{'Expand'|t}</span>
+  <span id="translation-expand-all">{'Expand all'|t}</span>
+  <span id="translation-delete-link">{'Are you sure you want to delete this link?'|t}</span>
+  <span id="translation-shaarli-desc">
+    {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t}
+  </span>
+</div>
+
+<input type="hidden" name="js_base_path" value="{$base_path}" />
+<script src="{$asset_path}/js/shaarli.min.js?v={$version_hash}#"></script>