aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-01 11:27:10 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-01 11:27:10 +0100
commitb05f482dd219acd5f5c7e9669ad8bd168ba224c6 (patch)
tree4c89e1dc27201b34e35a8d9e3e8e461531978443 /themes
parent3dcd85c075998ecdf2d54c5661c42e24080067d5 (diff)
parentbc6f5a8086b331bf21cdfcac799788264d8cd3b2 (diff)
downloadwallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.gz
wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.zst
wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.zip
Merge branch 'dev' into reloadarticle
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/home.twig6
-rwxr-xr-xthemes/courgette/config.twig127
-rwxr-xr-xthemes/default/home.twig8
3 files changed, 11 insertions, 130 deletions
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index abebe455..93515080 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -59,7 +59,11 @@
59 {{ block('pager') }} 59 {{ block('pager') }}
60 {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %} 60 {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %}
61 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br /> 61 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br />
62 62
63 {% if searchterm is defined %}<a title="{% trans "Delete results matching" %} {{ searchterm }}" href="./?action=delete&search={{ searchterm }}">{% trans "Delete results matching" %} {{ searchterm }}</a>{% endif %}<br />
64
65 {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
66
63 {% if tag %} 67 {% if tag %}
64 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %} 68 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
65 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %} 69 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
deleted file mode 100755
index 6b0fa308..00000000
--- a/themes/courgette/config.twig
+++ /dev/null
@@ -1,127 +0,0 @@
1{% extends "layout.twig" %}
2
3{% block title %}{% trans "config" %}{% endblock %}
4{% block menu %}
5{% include '_menu.twig' %}
6{% endblock %}
7{% block content %}
8 <div id="config">
9 <h2>{% trans "Poching a link" %}</h2>
10 <p>{% trans "There are several ways to save an article:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p>
11 <ul>
12 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
13 <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
14 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" 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>
15 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
16 <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
17 <li>
18 <form method="get" action="index.php">
19 <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
20 <input required placeholder="Ex:mywebsite.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
21 <input type="submit" value="{% trans "bag it!" %}" />
22 </form>
23 </li>
24 <li>{% trans "bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
25 </ul>
26
27 <h2>{% trans "Upgrading wallabag" %}</h2>
28 <ul>
29 <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
30 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
31 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
32 </ul>
33
34 <h2>{% trans "Change your theme" %}</h2>
35 <form method="post" action="?updatetheme" name="changethemeform">
36 <fieldset class="w500p">
37 <div class="row">
38 <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
39 <select class="col" id="theme" name="theme">
40 {% for key, theme in themes %}
41 <option value="{{ key }}" {{ theme.current ? 'selected' : '' }}>{{ theme.name }}</option>
42 {% endfor %}
43 </select>
44 </div>
45 <div class="row mts txtcenter">
46 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
47 </div>
48 </fieldset>
49 <input type="hidden" name="returnurl" value="{{ referer }}">
50 <input type="hidden" name="token" value="{{ token }}">
51 </form>
52
53 <h2>{% trans "Change your password" %}</h2>
54 <form method="post" action="?config" name="loginform">
55 <fieldset class="w500p">
56 <div class="row">
57 <label class="col w150p" for="password">{% trans "New password:" %}</label>
58 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2">
59 </div>
60 <div class="row">
61 <label class="col w150p" for="password_repeat">{% trans "Repeat your new password:" %}</label>
62 <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="{% trans "Password" %}" tabindex="3">
63 </div>
64 <div class="row mts txtcenter">
65 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
66 </div>
67 </fieldset>
68 <input type="hidden" name="returnurl" value="{{ referer }}">
69 <input type="hidden" name="token" value="{{ token }}">
70 </form>
71
72 <h2>{% trans "Import" %}</h2>
73 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
74 <p>{% trans "More infos in the official doc:" %} <a href="http://doc.wallabag.org">wallabag.org</a></p>
75 <ul>
76 <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>
77 <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>
78 <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>
79 </ul>
80
81 <h2>{% trans "Export your wallabag data" %}</h2>
82 <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
83
84 <h2>{% trans "Fancy an E-Book ?" %}</h2>
85 <p>{% trans "Click to get all your articles in one ebook :" %}
86 <ul>
87 <li><a href="./?epub&amp;method=all" title="Generate ePub file">ePub 3</a></li>
88 <li><a href="./?mobi&amp;method=all" title="Generate Mobi file">Mobi</a></li>
89 <li><a href="./?pdf&amp;method=all" title="Generate PDF file">PDF</a></li>
90 </ul>
91
92 <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
93
94 <h2>{% trans 'Add user' %}</h2>
95 <p>{% trans 'Add a new user :' %}</p>
96 <form method="post" action="?newuser">
97 <fieldset class="w500p">
98 <div class="row">
99 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
100 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
101 </div>
102 <div class="row">
103 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
104 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
105 </div>
106 <div class="row mts txtcenter">
107 <button type="submit">{% trans "Send" %}</button>
108 </div>
109 </fieldset>
110 </form>
111
112 <h2>{% trans "Delete account" %}</h2>
113 {% if not only_user %}<form method="post" action="?deluser">
114 <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
115 <fieldset class="w500p">
116 <div class="row">
117 <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
118 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
119 </div>
120 <div class="row mts txtcenter">
121 <button type="submit">{% trans "Send" %}</button>
122 </div>
123 </form>
124 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
125 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %}
126 </div>
127{% endblock %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index c5db5802..b9000559 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -59,7 +59,11 @@
59 {{ block('pager') }} 59 {{ block('pager') }}
60 {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %} 60 {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %}
61 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br /> 61 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br />
62 62
63 {% if searchterm is defined %}<a title="{% trans "Delete results matching" %} {{ searchterm }}" href="./?action=delete&search={{ searchterm }}">{% trans "Delete results matching" %} {{ searchterm }}</a>{% endif %}<br />
64
65 {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
66
63 {% if tag %} 67 {% if tag %}
64 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %} 68 {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
65 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %} 69 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
@@ -73,6 +77,6 @@
73 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %} 77 {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %}
74 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %} 78 {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %}
75 {% endif %} 79 {% endif %}
76 80
77 {% endif %} 81 {% endif %}
78{% endblock %} 82{% endblock %}