aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/config.twig11
-rw-r--r--tpl/export.twig (renamed from tpl/export.html)0
-rw-r--r--tpl/home.twig9
-rw-r--r--tpl/layout.twig1
-rw-r--r--tpl/login.twig9
5 files changed, 10 insertions, 20 deletions
diff --git a/tpl/config.twig b/tpl/config.twig
index 4e7bb9d4..9a51e566 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -13,7 +13,7 @@
13{% block content %} 13{% block content %}
14 <div id="content"> 14 <div id="content">
15 <h2>{% trans "Bookmarklet" %}</h2> 15 <h2>{% trans "Bookmarklet" %}</h2>
16 <p>{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} <a href="http://inthepoche.com/?pages/Documentation" target="_blank">http://inthepoche.com/?pages/Documentation</a>.</p> 16 <p>{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a>.</p>
17 <p>{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}</p> 17 <p>{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}</p>
18 <p><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></p> 18 <p><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></p>
19 19
@@ -35,6 +35,15 @@
35 <input type="hidden" name="returnurl" value="{{ referer }}"> 35 <input type="hidden" name="returnurl" value="{{ referer }}">
36 <input type="hidden" name="token" value="{{ token }}"> 36 <input type="hidden" name="token" value="{{ token }}">
37 </form> 37 </form>
38
39 <h2>{% trans "Import" %}</h2>
40 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
41 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
42 <p><ul>
43 <li><a href="/?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
44 <li><a href="/?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li>
45 </ul></p>
46
38 <h2>{% trans "Export your poche datas" %}</h2> 47 <h2>{% trans "Export your poche datas" %}</h2>
39 <p><a href="?view=export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p> 48 <p><a href="?view=export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
40 </div> 49 </div>
diff --git a/tpl/export.html b/tpl/export.twig
index d22d05fc..d22d05fc 100644
--- a/tpl/export.html
+++ b/tpl/export.twig
diff --git a/tpl/home.twig b/tpl/home.twig
index 5752b2cf..49ef9050 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -15,15 +15,6 @@
15 <li><img src="./tpl/img/up.png" onclick="sort_links('{{ view }}', 'ta');" title="{% trans "by title asc" %}" /> {% trans "by title" %} <img src="./tpl/img/down.png" onclick="sort_links('{{ view }}', 'td');" title="{% trans "by title desc" %}" /></li> 15 <li><img src="./tpl/img/up.png" onclick="sort_links('{{ view }}', 'ta');" title="{% trans "by title asc" %}" /> {% trans "by title" %} <img src="./tpl/img/down.png" onclick="sort_links('{{ view }}', 'td');" title="{% trans "by title desc" %}" /></li>
16 </ul> 16 </ul>
17{% endblock %} 17{% endblock %}
18{% block notices %}
19 <div class="messages">
20 <ul>
21 {% for notice in notices %}
22 <li>{{ notice.value|e }}</li>
23 {% endfor %}
24 </ul>
25 </div>
26{% endblock %}
27{% block content %} 18{% block content %}
28 <div id="content"> 19 <div id="content">
29 {% for entry in entries %} 20 {% for entry in entries %}
diff --git a/tpl/layout.twig b/tpl/layout.twig
index 9dc83efe..cbe965fd 100644
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
@@ -17,7 +17,6 @@
17 <div id="main"> 17 <div id="main">
18 {% block menu %}{% endblock %} 18 {% block menu %}{% endblock %}
19 {% block precontent %}{% endblock %} 19 {% block precontent %}{% endblock %}
20 {% block messages %}{% endblock %}
21 {% block content %}{% endblock %} 20 {% block content %}{% endblock %}
22 {% block js %}{% endblock %} 21 {% block js %}{% endblock %}
23 </div> 22 </div>
diff --git a/tpl/login.twig b/tpl/login.twig
index fcb9b4d6..70c2190c 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -1,15 +1,6 @@
1{% extends "layout.twig" %} 1{% extends "layout.twig" %}
2 2
3{% block title %}{% trans "login to your poche" %}{% endblock %} 3{% block title %}{% trans "login to your poche" %}{% endblock %}
4{% block notices %}
5 <div class="messages">
6 <ul>
7 {% for notice in notices %}
8 <li>{{ notice.value|e }}</li>
9 {% endfor %}
10 </ul>
11 </div>
12{% endblock %}
13{% block content %} 4{% block content %}
14 <form method="post" action="?login" name="loginform"> 5 <form method="post" action="?login" name="loginform">
15 <fieldset class="w500p center"> 6 <fieldset class="w500p center">