aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-01-02 21:54:50 -0800
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-01-02 21:54:50 -0800
commitd7ad5d65600c3fae03fd2d35f19bee5e044a72d9 (patch)
treefbe3312cb41e95ed493266e3bacdcaeb2e1306fa /themes
parent2eb111a300c481bbbf0a00eedec1db99253b4d0a (diff)
parentaeea7c6af02d02cfed077eeab1b7fe34a4d4c5db (diff)
downloadwallabag-d7ad5d65600c3fae03fd2d35f19bee5e044a72d9.tar.gz
wallabag-d7ad5d65600c3fae03fd2d35f19bee5e044a72d9.tar.zst
wallabag-d7ad5d65600c3fae03fd2d35f19bee5e044a72d9.zip
Merge pull request #379 from williamtheaker/dev
Minor changes to tag edit and config pages
Diffstat (limited to 'themes')
-rw-r--r--themes/default/config.twig22
-rw-r--r--themes/default/edit-tags.twig10
2 files changed, 16 insertions, 16 deletions
diff --git a/themes/default/config.twig b/themes/default/config.twig
index c01556ba..10df726e 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -6,11 +6,11 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Poching links" %}</h2> 8 <h2>{% trans "Poching links" %}</h2>
9 <p>{% trans "There are several ways to poche a link::" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
12 <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li> 12 <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
13 <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li> 13 <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
14 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li> 14 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
15 <li> 15 <li>
16 <form method="get" action="index.php"> 16 <form method="get" action="index.php">
@@ -31,12 +31,12 @@
31 31
32 <h2>{% trans "Feeds" %}</h2> 32 <h2>{% trans "Feeds" %}</h2>
33 {% if token == '' %} 33 {% if token == '' %}
34 <p>{% trans "The token is empty, you have to generate it to use feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p> 34 <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
35 {% else %} 35 {% else %}
36 <ul> 36 <ul>
37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li> 37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li> 38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li> 39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
40 </ul> 40 </ul>
41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
42 {% endif %} 42 {% endif %}
@@ -101,12 +101,12 @@
101 {% endif %} 101 {% endif %}
102 102
103 <h2>{% trans "Import" %}</h2> 103 <h2>{% trans "Import" %}</h2>
104 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 104 <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/">inthepoche.com</a></p> 105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
106 <ul> 106 <ul>
107 <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li> 107 <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
108 <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li> 108 <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
109 <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li> 109 <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
110 </ul> 110 </ul>
111 111
112 <h2>{% trans "Export your poche data" %}</h2> 112 <h2>{% trans "Export your poche data" %}</h2>
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 7116bba9..53852d39 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -11,10 +11,10 @@ no tags
11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
12</ul> 12</ul>
13<form method="post" action="./?action=add_tag"> 13<form method="post" action="./?action=add_tag">
14 <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" /> 14 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
15 <p>{% trans "you can type several tags, separated by comma" %}</p> 15 <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
16 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 16 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
17 <input type="submit" value="add tags" /> 17 <input type="submit" value="Tag" />
18</form> 18</form>
19<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a> 19<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
20{% endblock %} \ No newline at end of file 20{% endblock %}