aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl/config.twig
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-23 23:18:36 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-23 23:18:36 +0200
commit38b418b7d63783fa0c7b920b7de6a1f6930fc7cb (patch)
tree3d2a95c3c74130c31ee3e21d540ccae0504ee17c /tpl/config.twig
parentd29b3e5f9e195b99d3891acd8537f8f4680e430f (diff)
parentfa5f9764ae370d6eb5efd6b05bf8e257aae9899d (diff)
downloadwallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.gz
wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.zst
wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.zip
resolve conflicts
Diffstat (limited to 'tpl/config.twig')
-rw-r--r--tpl/config.twig29
1 files changed, 13 insertions, 16 deletions
diff --git a/tpl/config.twig b/tpl/config.twig
index 8851c3dc..e8563721 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -11,24 +11,21 @@
11 </ul> 11 </ul>
12{% endblock %} 12{% endblock %}
13{% block content %} 13{% block content %}
14
15 <h2>{% trans "Poching a link" %}</h2> 14 <h2>{% trans "Poching a link" %}</h2>
16 <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p> 15 <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p>
17 <p> 16 <ul>
18 <ul> 17 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
19 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li> 18 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
20 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li> 19 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
21 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li> 20 <li>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" 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></li>
22 <li>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" 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></li> 21 </ul>
23 </ul> 22
24 </p>
25 <h2>{% trans "Updating poche" %}</h2> 23 <h2>{% trans "Updating poche" %}</h2>
26 <p><ul> 24 <ul>
27 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li> 25 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
28 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li> 26 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
29 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %} 27 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
30 </ul> 28 </ul>
31 </p>
32 29
33 <h2>{% trans "Change your password" %}</h2> 30 <h2>{% trans "Change your password" %}</h2>
34 <form method="post" action="?config" name="loginform"> 31 <form method="post" action="?config" name="loginform">
@@ -52,11 +49,11 @@
52 <h2>{% trans "Import" %}</h2> 49 <h2>{% trans "Import" %}</h2>
53 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 50 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
54 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p> 51 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
55 <p><ul> 52 <ul>
56 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li> 53 <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
57 <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li> 54 <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li>
58 <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li> 55 <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li>
59 </ul></p> 56 </ul>
60 57
61 <h2>{% trans "Export your poche datas" %}</h2> 58 <h2>{% trans "Export your poche datas" %}</h2>
62 <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p> 59 <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>