twig implementation

5 files changed, 8 insertions, 8 deletions

diff --git a/tpl/_footer.twig b/tpl/_footer.twig
index 59b58fa5..b1d7b8d4 100644
--- a/tpl/_footer.twig
+++ b/tpl/_footer.twig
@@ -1,3 +1,3 @@
         <footer class="mr2 mt3 smaller">
-            <p>powered by <a href="http://inthepoche.com">poche</a></p>
+            <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p>
         </footer>
\ No newline at end of file
diff --git a/tpl/config.twig b/tpl/config.twig
index 9a51e566..c18806bc 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -40,11 +40,11 @@
                 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
                 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
                 <p><ul>
-                <li><a href="/?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
-                <li><a href="/?import&from=readability">{% trans "import from Readability" %}</a>  (you must have a "readability" file on your server)</li>
+                <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
+                <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a>  (you must have a "readability" file on your server)</li>
                 </ul></p>
 
                 <h2>{% trans "Export your poche datas" %}</h2>
-                <p><a href="?view=export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
+                <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
             </div>
 {% endblock %}
\ No newline at end of file
diff --git a/tpl/export.twig b/tpl/export.twig
index d22d05fc..4adb9540 100644
--- a/tpl/export.twig
+++ b/tpl/export.twig
@@ -1 +1 @@
-export {$export}
\ No newline at end of file
+{{ export }}
\ No newline at end of file
diff --git a/tpl/js/poche.js b/tpl/js/poche.js
index 97d9911d..b4eac11c 100644
--- a/tpl/js/poche.js
+++ b/tpl/js/poche.js
@@ -23,7 +23,7 @@ function toggle_archive(element, id, view_article) {
 }
 
 function sort_links(view, sort) {
-    $.get('index.php', { view: view, sort: sort, full_head: 'no' }, function(data) {
+    $.get('index.php', { view: view, sort: sort }, function(data) {
       $('#content').html(data);
     });
 }
diff --git a/tpl/login.twig b/tpl/login.twig
index 70c2190c..c3028795 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -16,9 +16,9 @@
                                                 <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if demo == 1 %}value="poche"{% endif %} />
                                         </div>
                                         <div class="row">
-                                                <label class="col w150p">{% trans "Stay signed in" %}</label>
+                                                <label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
                                                 <div class="col">
-                                                        <input type="checkbox" name="longlastingsession" tabindex="3">
+                                                        <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3">
                                                         <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
                                                 </div>
                                         </div>