aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mobin14309 -> 15691 bytes
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po30
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mobin14312 -> 15782 bytes
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po35
-rwxr-xr-xthemes/baggy/config.twig107
-rwxr-xr-xthemes/baggy/css/main.css23
-rwxr-xr-xthemes/baggy/home.twig16
7 files changed, 138 insertions, 73 deletions
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index 9193b6e7..12fef6c8 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 05832d0b..98c6a3e8 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -37,6 +37,12 @@ msgstr "Read the documentation"
37msgid "download the extension" 37msgid "download the extension"
38msgstr "Download the extension" 38msgstr "Download the extension"
39 39
40msgid "Firefox Add-On"
41msgstr "Firefox Add-On"
42
43msgid "Chrome Extension"
44msgstr "Chrome Extension"
45
40msgid "via F-Droid" 46msgid "via F-Droid"
41msgstr "via F-Droid" 47msgstr "via F-Droid"
42 48
@@ -140,14 +146,26 @@ msgstr "Repeat your new password:"
140msgid "Import" 146msgid "Import"
141msgstr "Import" 147msgstr "Import"
142 148
149msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
150msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format."
151
143msgid "" 152msgid ""
144"Please execute the import script locally as it can take a very long time." 153"Please execute the import script locally as it can take a very long time."
145msgstr "" 154msgstr ""
155
156msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."
157msgstr "Please select export file on your computer and press “Import” button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."
146"Please execute the import script locally as it can take a very long time." 158"Please execute the import script locally as it can take a very long time."
147 159
160msgid "You can click here to fetch content for articles with no content."
161msgstr "Fetch content for articles with no content"
162
148msgid "More info in the official documentation:" 163msgid "More info in the official documentation:"
149msgstr "More info in the official documentation:" 164msgstr "More info in the official documentation:"
150 165
166msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
167msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
168
151msgid "Import from Pocket" 169msgid "Import from Pocket"
152msgstr "Import from Pocket" 170msgstr "Import from Pocket"
153 171
@@ -176,12 +194,18 @@ msgstr "to download your database."
176msgid "to export your wallabag data." 194msgid "to export your wallabag data."
177msgstr "to export your wallabag data." 195msgstr "to export your wallabag data."
178 196
197msgid "Export JSON"
198msgstr "Export JSON"
199
179msgid "Cache" 200msgid "Cache"
180msgstr "Cache" 201msgstr "Cache"
181 202
182msgid "to delete cache." 203msgid "to delete cache."
183msgstr "to delete cache." 204msgstr "to delete cache."
184 205
206msgid "Delete Cache"
207msgstr "Delete Cache"
208
185msgid "You can enter multiple tags, separated by commas." 209msgid "You can enter multiple tags, separated by commas."
186msgstr "You can enter multiple tags, separated by commas." 210msgstr "You can enter multiple tags, separated by commas."
187 211
@@ -417,6 +441,9 @@ msgstr "by filling this field"
417msgid "bookmarklet: drag & drop this link to your bookmarks bar" 441msgid "bookmarklet: drag & drop this link to your bookmarks bar"
418msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" 442msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
419 443
444msgid "Drag &amp; drop this link to your bookmarks bar:"
445msgstr "Drag &amp; drop this link to your bookmarks bar:"
446
420msgid "your version" 447msgid "your version"
421msgstr "your version" 448msgstr "your version"
422 449
@@ -435,6 +462,9 @@ msgstr "latest dev version"
435msgid "a more recent development version is available." 462msgid "a more recent development version is available."
436msgstr "A more recent development version is available." 463msgstr "A more recent development version is available."
437 464
465msgid "You can clear cache to check the latest release."
466msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
467
438msgid "Please execute the import script locally, it can take a very long time." 468msgid "Please execute the import script locally, it can take a very long time."
439msgstr "" 469msgstr ""
440"Please execute the import script locally, it can take a very long time." 470"Please execute the import script locally, it can take a very long time."
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 91b9b5d0..a09b4f37 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index c2ae0ae4..25c3aa26 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -37,6 +37,12 @@ msgstr "Read the documentation"
37msgid "download the extension" 37msgid "download the extension"
38msgstr "Download the extension" 38msgstr "Download the extension"
39 39
40msgid "Firefox Add-On"
41msgstr "Firefox Add-On"
42
43msgid "Chrome Extension"
44msgstr "Chrome Extension"
45
40msgid "via F-Droid" 46msgid "via F-Droid"
41msgstr "via F-Droid" 47msgstr "via F-Droid"
42 48
@@ -79,6 +85,9 @@ msgstr "Latest dev version"
79msgid "A more recent development version is available." 85msgid "A more recent development version is available."
80msgstr "A more recent development version is available." 86msgstr "A more recent development version is available."
81 87
88msgid "You can clear cache to check the latest release."
89msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
90
82msgid "Feeds" 91msgid "Feeds"
83msgstr "Feeds" 92msgstr "Feeds"
84 93
@@ -140,14 +149,26 @@ msgstr "Repeat your new password:"
140msgid "Import" 149msgid "Import"
141msgstr "Import" 150msgstr "Import"
142 151
152msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
153msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any file in appropriate JSON or HTML format."
154
143msgid "" 155msgid ""
144"Please execute the import script locally as it can take a very long time." 156"Please execute the import script locally as it can take a very long time."
145msgstr "" 157msgstr ""
146"Please execute the import script locally as it can take a very long time." 158"Please execute the import script locally as it can take a very long time."
147 159
160msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."
161msgstr "Please select export file on your computer and press &ldquo;Import&rdquo; button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."
162
163msgid "You can click here to fetch content for articles with no content."
164msgstr "Fetch content for articles with no content"
165
148msgid "More info in the official documentation:" 166msgid "More info in the official documentation:"
149msgstr "More info in the official documentation:" 167msgstr "More info in the official documentation:"
150 168
169msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
170msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
171
151msgid "Import from Pocket" 172msgid "Import from Pocket"
152msgstr "Import from Pocket" 173msgstr "Import from Pocket"
153 174
@@ -176,12 +197,18 @@ msgstr "to download your database."
176msgid "to export your wallabag data." 197msgid "to export your wallabag data."
177msgstr "to export your wallabag data." 198msgstr "to export your wallabag data."
178 199
200msgid "Export JSON"
201msgstr "Export JSON"
202
179msgid "Cache" 203msgid "Cache"
180msgstr "Cache" 204msgstr "Cache"
181 205
182msgid "to delete cache." 206msgid "to delete cache."
183msgstr "to delete cache." 207msgstr "to delete cache."
184 208
209msgid "Delete Cache"
210msgstr "Delete Cache"
211
185msgid "You can enter multiple tags, separated by commas." 212msgid "You can enter multiple tags, separated by commas."
186msgstr "You can enter multiple tags, separated by commas." 213msgstr "You can enter multiple tags, separated by commas."
187 214
@@ -417,6 +444,9 @@ msgstr "by filling this field"
417msgid "bookmarklet: drag & drop this link to your bookmarks bar" 444msgid "bookmarklet: drag & drop this link to your bookmarks bar"
418msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" 445msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
419 446
447msgid "Drag &amp; drop this link to your bookmarks bar:"
448msgstr "Drag &amp; drop this link to your bookmarks bar:"
449
420msgid "your version" 450msgid "your version"
421msgstr "your version" 451msgstr "your version"
422 452
@@ -576,14 +606,13 @@ msgid "Type here your password"
576msgstr "Enter your password" 606msgstr "Enter your password"
577 607
578msgid "You are the only user, you cannot delete your own account." 608msgid "You are the only user, you cannot delete your own account."
579msgstr "You are the only user, you cannot delete your own account." 609msgstr "You cannot delete your account because you are the only user."
580 610
581msgid "" 611msgid ""
582"To completely remove wallabag, delete the wallabag folder on your web server " 612"To completely remove wallabag, delete the wallabag folder on your web server "
583"(and eventual databases)." 613"(and eventual databases)."
584msgstr "" 614msgstr ""
585"To completely remove wallabag, delete the wallabag folder on your web server " 615"To completely remove wallabag, delete the wallabag folder and database(s) from your web server."
586"(and eventual databases)."
587 616
588msgid "Enter your search here" 617msgid "Enter your search here"
589msgstr "Enter your search here" 618msgstr "Enter your search here"
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index d4958ccb..3dd38270 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -6,30 +6,29 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Saving articles" %}</h2> 8 <h2>{% trans "Saving articles" %}</h2>
9 <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
10 <p>
11 <form method="get" action="index.php">
12 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
13 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
14 <input type="submit" value="{% trans "bag it!" %}" />
15 </form>
16 </p>
17 <h3>Browser Plugins</h3>
10 <ul> 18 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
12 <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> 20 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
13 <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>
14 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
15 <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>
16 <li>
17 <form method="get" action="index.php">
18 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
19 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
20 <input type="submit" value="{% trans "bag it!" %}" />
21 </form>
22 </li>
23 <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>
24 </ul> 21 </ul>
25 22 <h3>Mobile Apps</h3>
26 <h2>{% trans "Upgrading wallabag" %}</h2>
27 <ul> 23 <ul>
28 <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li> 24 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
29 <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 %} ({% trans "Last check:" %} {{ check_time_prod }})</li> 25 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
30 {% 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 %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li> 26 <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
31 </ul> 27 </ul>
32 <p>{% trans "You can clear cache to check the latest release." %}</p> 28 <h3>{% trans "Bookmarklet" %}</h3>
29 <p>
30 {% trans "Drag &amp; 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>
31 </p>
33 32
34 <h2>{% trans "Feeds" %}</h2> 33 <h2>{% trans "Feeds" %}</h2>
35 {% if token == '' %} 34 {% if token == '' %}
@@ -40,9 +39,11 @@
40 <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=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
41 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li> 40 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
42 </ul> 41 </ul>
43 <p>{% trans "Your token:" %} <strong>{{token}}</strong></p> 42 <p class="more-info">
44 <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p> 43 {% trans "Your token:" %} <strong>{{token}}</strong><br>
45 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 44 {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
45 {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
46 </p>
46 {% endif %} 47 {% endif %}
47 48
48 <h2>{% trans "Change your theme" %}</h2> 49 <h2>{% trans "Change your theme" %}</h2>
@@ -83,30 +84,9 @@
83 <input type="hidden" name="token" value="{{ token }}"> 84 <input type="hidden" name="token" value="{{ token }}">
84 </form> 85 </form>
85 86
86 {% if http_auth == 0 %} 87 <h2><a name="import"></a>{% trans "Import" %}</h2>
87 <h2>{% trans "Change your password" %}</h2>
88 <form method="post" action="?config" name="loginform">
89 <fieldset class="w500p">
90 <div class="row">
91 <label class="col w150p" for="password">{% trans "New password:" %}</label>
92 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2">
93 </div>
94 <div class="row">
95 <label class="col w150p" for="password_repeat">{% trans "Repeat your new password:" %}</label>
96 <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="{% trans "Password" %}" tabindex="3">
97 </div>
98 <div class="row mts txtcenter">
99 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
100 </div>
101 </fieldset>
102 <input type="hidden" name="returnurl" value="{{ referer }}">
103 <input type="hidden" name="token" value="{{ token }}">
104 </form>
105 {% endif %}
106
107 <h2>{% trans "Import" %}</h2>
108 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p> 88 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
109 <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p> 89 <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
110 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data"> 90 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
111 <fieldset class="w500p"> 91 <fieldset class="w500p">
112 <div class="row"> 92 <div class="row">
@@ -119,19 +99,21 @@
119 </fieldset> 99 </fieldset>
120 </form> 100 </form>
121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> 101 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
122 102 <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
103
123 <h2>{% trans "Export your wallabag data" %}</h2> 104 <h2>{% trans "Export your wallabag data" %}</h2>
124 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> 105 <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
125 106 <span class="more-info">Data will be exported in a single JSON file.</span></p>
107
126 <h2>{% trans "Fancy an E-Book ?" %}</h2> 108 <h2>{% trans "Fancy an E-Book ?" %}</h2>
127 <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %} 109 <p><a href="./?epub&amp;method=all" title="Generate ePub">Download E-Book</a><br>
128 <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> 110 <span class="more-info">{% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% 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." %}</span></p>
129 111
130 <h2>{% trans "Cache" %}</h2> 112 <h2><a name="cache"></a>{% trans "Cache" %}</h2>
131 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p> 113 <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
114 <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
132 115
133 <h2>{% trans 'Add user' %}</h2> 116 <h2>{% trans 'Add user' %}</h2>
134 <p>{% trans 'Add a new user :' %}</p>
135 <form method="post" action="?newuser"> 117 <form method="post" action="?newuser">
136 <fieldset class="w500p"> 118 <fieldset class="w500p">
137 <div class="row"> 119 <div class="row">
@@ -147,7 +129,7 @@
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> 129 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
148 </div> 130 </div>
149 <div class="row mts txtcenter"> 131 <div class="row mts txtcenter">
150 <button type="submit">{% trans "Send" %}</button> 132 <button type="submit">{% trans "Add user" %}</button>
151 </div> 133 </div>
152 </fieldset> 134 </fieldset>
153 </form> 135 </form>
@@ -161,9 +143,18 @@
161 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}"> 143 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
162 </div> 144 </div>
163 <div class="row mts txtcenter"> 145 <div class="row mts txtcenter">
164 <button type="submit">{% trans "Send" %}</button> 146 <button type="submit">{% trans "Delete account" %}</button>
165 </div> 147 </div>
166 </form> 148 </form>
167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 149 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %} 150 <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
151
152 <h2>{% trans "Upgrading wallabag" %}</h2>
153 <ul>
154 <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
155 <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 %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
156 {% 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 %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
157 </ul>
158 <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
159
169{% endblock %} 160{% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index ce314860..f77021aa 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -70,7 +70,7 @@ h2, h3, h4 {
70 text-transform: uppercase; 70 text-transform: uppercase;
71} 71}
72 72
73p, li { 73p, li, label {
74 color: #666; 74 color: #666;
75} 75}
76 76
@@ -281,12 +281,12 @@ h2:after {
281#listmode a:hover { 281#listmode a:hover {
282 opacity: 1; 282 opacity: 1;
283} 283}
284.tablemode { 284#listmode.tablemode {
285 background-image: url("../img/baggy/table.png"); 285 background-image: url("../img/baggy/table.png");
286 background-repeat: no-repeat; 286 background-repeat: no-repeat;
287 background-position: bottom; 287 background-position: bottom;
288} 288}
289.listmode { 289#listmode.listmode {
290 background-image: url("../img/baggy/list.png"); 290 background-image: url("../img/baggy/list.png");
291 background-repeat: no-repeat; 291 background-repeat: no-repeat;
292 background-position: bottom; 292 background-position: bottom;
@@ -331,7 +331,7 @@ footer a {
331 margin-bottom: 2em; 331 margin-bottom: 2em;
332} 332}
333 333
334.estimatedTime a { 334.estimatedTime .reading-time {
335 color: #999; 335 color: #999;
336 font-style: italic; 336 font-style: italic;
337 font-weight: normal; 337 font-weight: normal;
@@ -418,6 +418,7 @@ footer a {
418.entrie h2 { 418.entrie h2 {
419 text-transform: none; 419 text-transform: none;
420 margin-bottom: 0; 420 margin-bottom: 0;
421 line-height: 1.2;
421} 422}
422 423
423 .entrie h2:after { 424 .entrie h2:after {
@@ -774,6 +775,16 @@ a.add-to-wallabag-link-after:after {
774 width: 100%; 775 width: 100%;
775} 776}
776 777
778.more-info {
779 font-size: 0.85em;
780 line-height: 1.5;
781 color: #aaa;
782}
783
784 .more-info a {
785 color: #aaa;
786 }
787
777/* ========================================================================== 788/* ==========================================================================
778 5 = Article 789 5 = Article
779 ========================================================================== */ 790 ========================================================================== */
@@ -799,6 +810,10 @@ blockquote {
799 margin: 0; 810 margin: 0;
800} 811}
801 812
813#article h1 {
814 text-align: left;
815}
816
802#article h2, #article h3, #article h4 { 817#article h2, #article h3, #article h4 {
803 text-transform: none; 818 text-transform: none;
804} 819}
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 03de6b9b..dec848f2 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -41,9 +41,9 @@
41 <div id="entry-{{ entry.id|e }}" class="entrie"> 41 <div id="entry-{{ entry.id|e }}" class="entrie">
42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> 42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
43 {% if entry.content| getReadingTime > 0 %} 43 {% if entry.content| getReadingTime > 0 %}
44 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div> 44 <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
45 {% else %} 45 {% else %}
46 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div> 46 <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} <small class="inferieur">&lt;</small> 1 min</span></div>
47 {% endif %} 47 {% endif %}
48 <ul class="tools links"> 48 <ul class="tools links">
49 <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li> 49 <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
@@ -57,14 +57,14 @@
57 {% endfor %} 57 {% endfor %}
58 </div> 58 </div>
59 {{ block('pager') }} 59 {{ block('pager') }}
60 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% 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 61
62 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}"> 62 {% if searchterm is defined %}<p><a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
63{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %} 63{% trans "Tag these results as" %} {{ searchterm }}</p></a>{% endif %}
64 64
65 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> 65 {% if tag %}<p><a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</p></a>
66 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> 66 {% elseif search_term is defined %}<p><a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</p></a>
67 {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} 67 {% else %}<p><a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a></p>{% endif %}
68 68
69 {% endif %} 69 {% endif %}
70{% endblock %} 70{% endblock %}