aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-05-29 18:54:06 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-05-29 18:54:06 +0200
commita9f5e572dde4f986a498d2fbe92a38a1b22f9595 (patch)
tree80b5bfc9836ae92cc4929a4d72ae0b2730e568bc /themes
parent96834a47b09985e1c82b82857fc108f20e8b8f2b (diff)
parent8038b38802769031e050c753fc0a388a2276629e (diff)
downloadwallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.tar.gz
wallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.tar.zst
wallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.zip
Merge pull request #712 from wallabag/dev1.7.0
1.7, call me "Premium version"
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/config.twig36
-rwxr-xr-xthemes/baggy/css/main.css29
-rwxr-xr-xthemes/baggy/css/print.css14
-rw-r--r--[-rwxr-xr-x]themes/baggy/fonts/icomoon.eotbin3724 -> 3896 bytes
-rw-r--r--[-rwxr-xr-x]themes/baggy/fonts/icomoon.svg17
-rw-r--r--[-rwxr-xr-x]themes/baggy/fonts/icomoon.ttfbin3560 -> 3732 bytes
-rw-r--r--[-rwxr-xr-x]themes/baggy/fonts/icomoon.woffbin3528 -> 3664 bytes
-rwxr-xr-xthemes/baggy/home.twig11
-rwxr-xr-xthemes/baggy/view.twig50
-rwxr-xr-xthemes/courgette/_view.twig1
-rwxr-xr-xthemes/courgette/config.twig37
-rwxr-xr-xthemes/courgette/home.twig9
-rw-r--r--themes/dark/img/dark/rss.pngbin0 -> 288 bytes
-rwxr-xr-x[-rw-r--r--]themes/default/_search-form.twig14
-rwxr-xr-xthemes/default/config.twig37
-rwxr-xr-x[-rw-r--r--]themes/default/css/style-default.css4
-rwxr-xr-xthemes/default/css/style.css34
-rwxr-xr-xthemes/default/home.twig9
-rwxr-xr-xthemes/default/img/default/print.pngbin0 -> 321 bytes
-rwxr-xr-xthemes/default/js/saveLink.js2
-rwxr-xr-xthemes/default/view.twig65
-rw-r--r--themes/dmagenta/img/dmagenta/rss.pngbin0 -> 288 bytes
-rw-r--r--themes/solarized-dark/img/solarized-dark/rss.pngbin0 -> 288 bytes
-rw-r--r--themes/solarized/img/solarized/rss.pngbin0 -> 288 bytes
24 files changed, 339 insertions, 30 deletions
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index d441de7c..46735f07 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -124,8 +124,44 @@
124 {% if constant('STORAGE') == 'sqlite' %} 124 {% if constant('STORAGE') == 'sqlite' %}
125 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %} 125 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
126 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> 126 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
127
128 <h2>{% trans "Fancy an E-Book ?" %}</h2>
129 <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)." %}
130 <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>
127 131
128 <h2>{% trans "Cache" %}</h2> 132 <h2>{% trans "Cache" %}</h2>
129 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p> 133 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
130 134
135 <h2>{% trans 'Add user' %}</h2>
136 <p>{% trans 'Add a new user :' %}</p>
137 <form method="post" action="?newuser">
138 <fieldset class="w500p">
139 <div class="row">
140 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
141 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
142 </div>
143 <div class="row">
144 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
145 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
146 </div>
147 <div class="row mts txtcenter">
148 <button type="submit">{% trans "Send" %}</button>
149 </div>
150 </fieldset>
151 </form>
152
153 <h2>{% trans "Delete account" %}</h2>
154 {% if not only_user %}<form method="post" action="?deluser">
155 <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>
156 <fieldset class="w500p">
157 <div class="row">
158 <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
159 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
160 </div>
161 <div class="row mts txtcenter">
162 <button type="submit">{% trans "Send" %}</button>
163 </div>
164 </form>
165 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
166 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %}
131{% endblock %} 167{% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 0991dbed..6d320cd2 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -537,7 +537,7 @@ footer a {
537} 537}
538 538
539/* ========================================================================== 539/* ==========================================================================
540 2.1 = "save a link" popup div related styles 540 2.1 = "save a link" related styles
541 ========================================================================== */ 541 ========================================================================== */
542 542
543#bagit-form, #search-form { 543#bagit-form, #search-form {
@@ -609,6 +609,25 @@ a#bagit-form-close:hover, a#search-form-close:hover {
609 padding: 0 3px 2px 3px; 609 padding: 0 3px 2px 3px;
610} 610}
611 611
612a.add-to-wallabag-link-after {
613 visibility: hidden;
614 position: absolute;
615 opacity: 0;
616 transition-duration: 2s;
617 transition-timing-function: ease-out;
618}
619
620#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
621 opacity: 1;
622 visibility: visible;
623 transition-duration: .3s;
624 transition-timing-function: ease-in;
625}
626
627a.add-to-wallabag-link-after:after {
628 content: "w";
629}
630
612#add-link-result { 631#add-link-result {
613 font-weight: bold; 632 font-weight: bold;
614 margin-top: 10px; 633 margin-top: 10px;
@@ -746,6 +765,9 @@ margin-top:1em;
746.icon-rss:before { 765.icon-rss:before {
747 content: "\e808"; 766 content: "\e808";
748} 767}
768.icon-print:before {
769 content: "\e80d";
770}
749 771
750/* ========================================================================== 772/* ==========================================================================
751 Icon selected 773 Icon selected
@@ -957,8 +979,8 @@ blockquote {
957 content: none; 979 content: none;
958 } 980 }
959 .logo { 981 .logo {
960 width: 1.5em; 982 width: 1.25em;
961 height: 1.5em; 983 height: 1.25em;
962 left: 0; 984 left: 0;
963 top: 0; 985 top: 0;
964 } 986 }
@@ -1008,6 +1030,7 @@ blockquote {
1008 margin-left: 1.5em; 1030 margin-left: 1.5em;
1009 padding-right: 1.5em; 1031 padding-right: 1.5em;
1010 position: static; 1032 position: static;
1033 margin-top: 3em;
1011 } 1034 }
1012 #article_toolbar .topPosF { 1035 #article_toolbar .topPosF {
1013 display: none; 1036 display: none;
diff --git a/themes/baggy/css/print.css b/themes/baggy/css/print.css
index 9aefa779..9dd6d295 100755
--- a/themes/baggy/css/print.css
+++ b/themes/baggy/css/print.css
@@ -17,6 +17,7 @@ img {
17 17
18/* Hide useless blocks */ 18/* Hide useless blocks */
19body > header, 19body > header,
20#article_toolbar,
20#links, 21#links,
21#sort, 22#sort,
22body > footer, 23body > footer,
@@ -46,3 +47,16 @@ abbr[title]:after {
46.pagination span.current { 47.pagination span.current {
47 border-style: dashed; 48 border-style: dashed;
48} 49}
50
51#main {
52 width: 100%;
53 padding: 0;
54 margin: 0;
55 margin-left: 0;
56 padding-right: 0;
57 padding-bottom: 0;
58}
59
60#article {
61 width: 100%;
62}
diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..56323516 100755..100644
--- a/themes/baggy/fonts/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
Binary files differ
diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..b4586136 100755..100644
--- a/themes/baggy/fonts/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
@@ -1,7 +1,21 @@
1<?xml version="1.0" standalone="no"?> 1<?xml version="1.0" standalone="no"?>
2<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3<svg xmlns="http://www.w3.org/2000/svg"> 3<svg xmlns="http://www.w3.org/2000/svg">
4<metadata>Generated by IcoMoon</metadata> 4<metadata>
5<json>
6{
7 "fontFamily": "icomoon",
8 "majorVersion": 1,
9 "minorVersion": 0,
10 "version": "Version 1.0",
11 "fontId": "icomoon",
12 "psName": "icomoon",
13 "subFamily": "Regular",
14 "fullName": "icomoon",
15 "description": "Generated by IcoMoon"
16}
17</json>
18</metadata>
5<defs> 19<defs>
6<font id="icomoon" horiz-adv-x="512"> 20<font id="icomoon" horiz-adv-x="512">
7<font-face units-per-em="512" ascent="480" descent="-32" /> 21<font-face units-per-em="512" ascent="480" descent="-32" />
@@ -23,4 +37,5 @@
23<glyph unicode="&#xe80a;" d="M475.648 50.432v219.136q-9.216-10.24-19.968-18.944-76.288-58.368-121.856-96.256-14.336-12.288-23.552-19.456t-24.576-13.824-29.184-6.656h-1.024q-13.312 0-29.184 6.656t-24.576 13.824-23.552 19.456q-45.056 37.888-121.856 96.256-10.752 8.704-19.968 18.944v-219.136q0-4.096 3.072-6.656t6.144-2.56h420.864q3.584 0 6.144 2.56t3.072 6.656zM475.648 350.464v7.168t-0.512 3.584-0.512 3.584-1.536 2.56-2.56 2.048-4.096 1.024h-420.864q-3.584 0-6.144-3.072t-3.072-6.144q0-48.128 41.984-81.408 55.296-43.52 114.688-90.624 2.048-1.024 10.24-8.192t12.8-10.752 12.8-9.216 14.336-7.68 12.288-2.56h1.024q5.632 0 12.288 2.56t14.336 7.68 12.8 9.216 12.8 10.752 10.24 8.192q59.392 47.104 114.688 90.624 15.36 12.288 28.672 33.28t13.312 37.376zM512 361.216v-310.784q0-18.944-13.312-32.256t-32.256-13.824h-420.864q-18.432 0-32.256 13.824t-13.312 32.256v310.784q0 18.944 13.312 32.256t32.256 13.312h420.864q18.944 0 32.256-13.312t13.312-32.256z" /> 37<glyph unicode="&#xe80a;" d="M475.648 50.432v219.136q-9.216-10.24-19.968-18.944-76.288-58.368-121.856-96.256-14.336-12.288-23.552-19.456t-24.576-13.824-29.184-6.656h-1.024q-13.312 0-29.184 6.656t-24.576 13.824-23.552 19.456q-45.056 37.888-121.856 96.256-10.752 8.704-19.968 18.944v-219.136q0-4.096 3.072-6.656t6.144-2.56h420.864q3.584 0 6.144 2.56t3.072 6.656zM475.648 350.464v7.168t-0.512 3.584-0.512 3.584-1.536 2.56-2.56 2.048-4.096 1.024h-420.864q-3.584 0-6.144-3.072t-3.072-6.144q0-48.128 41.984-81.408 55.296-43.52 114.688-90.624 2.048-1.024 10.24-8.192t12.8-10.752 12.8-9.216 14.336-7.68 12.288-2.56h1.024q5.632 0 12.288 2.56t14.336 7.68 12.8 9.216 12.8 10.752 10.24 8.192q59.392 47.104 114.688 90.624 15.36 12.288 28.672 33.28t13.312 37.376zM512 361.216v-310.784q0-18.944-13.312-32.256t-32.256-13.824h-420.864q-18.432 0-32.256 13.824t-13.312 32.256v310.784q0 18.944 13.312 32.256t32.256 13.312h420.864q18.944 0 32.256-13.312t13.312-32.256z" />
24<glyph unicode="&#xe80b;" d="M0 133.888l256 256 256-256-75.776-75.776-180.224 179.712-180.224-179.712z" /> 38<glyph unicode="&#xe80b;" d="M0 133.888l256 256 256-256-75.776-75.776-180.224 179.712-180.224-179.712z" />
25<glyph unicode="&#xe80c;" d="M25.6 279.296q62.464-35.84 168.96-35.84t168.96 35.84l-27.648-248.832q-1.024-7.168-17.92-18.432t-51.2-22.016-72.192-10.752-71.68 10.752-51.2 22.016-18.432 18.432zM275.456 432.896q48.128-9.216 80.896-28.16t32.768-36.352v-5.12q0-29.696-57.344-50.688t-137.216-20.992-137.216 20.992-57.344 50.688v5.12q0 17.408 32.768 36.352t80.896 28.16l21.504 24.576q11.264 13.312 35.84 13.312h47.104q26.624 0 35.84-13.312zM247.808 375.552h43.008q-47.104 56.32-53.248 64.512-7.168 8.192-16.384 8.192h-52.224q-11.264 0-16.384-8.192l-54.272-64.512h43.008l32.768 33.792h41.984z" horiz-adv-x="389" /> 39<glyph unicode="&#xe80c;" d="M25.6 279.296q62.464-35.84 168.96-35.84t168.96 35.84l-27.648-248.832q-1.024-7.168-17.92-18.432t-51.2-22.016-72.192-10.752-71.68 10.752-51.2 22.016-18.432 18.432zM275.456 432.896q48.128-9.216 80.896-28.16t32.768-36.352v-5.12q0-29.696-57.344-50.688t-137.216-20.992-137.216 20.992-57.344 50.688v5.12q0 17.408 32.768 36.352t80.896 28.16l21.504 24.576q11.264 13.312 35.84 13.312h47.104q26.624 0 35.84-13.312zM247.808 375.552h43.008q-47.104 56.32-53.248 64.512-7.168 8.192-16.384 8.192h-52.224q-11.264 0-16.384-8.192l-54.272-64.512h43.008l32.768 33.792h41.984z" horiz-adv-x="389" />
40<glyph unicode="&#xe80d;" d="M128 448h256v-64h-256zM480 352h-448c-17.6 0-32-14.4-32-32v-160c0-17.6 14.398-32 32-32h96v-128h256v128h96c17.6 0 32 14.4 32 32v160c0 17.6-14.4 32-32 32zM352 32h-192v160h192v-160zM487.2 304c0-12.813-10.387-23.2-23.199-23.2-12.813 0-23.201 10.387-23.201 23.2s10.388 23.2 23.201 23.2c12.813 0 23.199-10.387 23.199-23.2z" />
26</font></defs></svg> \ No newline at end of file 41</font></defs></svg> \ No newline at end of file
diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..bb1f21f8 100755..100644
--- a/themes/baggy/fonts/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
Binary files differ
diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..bab13779 100755..100644
--- a/themes/baggy/fonts/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
Binary files differ
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 5dd91307..3942d3bf 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -25,7 +25,7 @@
25 {% block pager %} 25 {% block pager %}
26 {% if nb_results > 1 %} 26 {% if nb_results > 1 %}
27 <div class="results"> 27 <div class="results">
28 <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div> 28 <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}</div>
29 {{ page_links | raw }} 29 {{ page_links | raw }}
30 </div> 30 </div>
31 {% elseif nb_results == 1 %} 31 {% elseif nb_results == 1 %}
@@ -56,7 +56,14 @@
56 56
57 {% endfor %} 57 {% endfor %}
58 </div> 58 </div>
59 {{ block('pager') }}
59 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %} 60 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
61
62 {% if search_term is defined %}<a title="{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}</a>{% endif %}
63
64 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
65 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
66 {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
67
60 {% endif %} 68 {% endif %}
61 {{ block('pager') }}
62{% endblock %} 69{% endblock %}
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index ffb512a3..af97407d 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -8,13 +8,15 @@
8 <ul class="links"> 8 <ul class="links">
9 <li class="topPosF"><a href="#top" title="{% trans "Back to top" %}" class="tool top icon icon-arrow-up-thick"><span>{% trans "Back to top" %}</span></a></li> 9 <li class="topPosF"><a href="#top" title="{% trans "Back to top" %}" class="tool top icon icon-arrow-up-thick"><span>{% trans "Back to top" %}</span></a></li>
10 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | getDomain }}</span></a></li> 10 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | getDomain }}</span></a></li>
11 <li><a title="{% trans "Mark as read" %}" class="tool icon icon-check {% 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> 11 <li><a title="{% trans "Mark as read" %}" class="tool icon icon-check {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li>
12 <li><a title="{% trans "Favorite" %}" class="tool icon icon-star {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "Toggle favorite" %}</span></a></li> 12 <li><a title="{% trans "Favorite" %}" class="tool icon icon-star {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li>
13 <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> 13 <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
14 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %} 14 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
15 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %} 15 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
16 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} 16 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
17 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %} 17 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %}
18 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
19 <li><a href="./?epub&amp;method=id&amp;id={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
18 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li> 20 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
19 </ul> 21 </ul>
20 </div> 22 </div>
@@ -32,6 +34,50 @@
32 <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> 34 <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
33 <script type="text/javascript"> 35 <script type="text/javascript">
34 $(document).ready(function() { 36 $(document).ready(function() {
37
38 // toggle read property of current article
39 $('#markAsRead').click(function(){
40 $("body").css("cursor", "wait");
41 $.ajax( { url: './?action=toggle_archive&id={{ entry.id|e }}' }).done(
42 function( data ) {
43 if ( data == '1' ) {
44 if ( $('#markAsRead').hasClass("archive-off") ) {
45 $('#markAsRead').removeClass("archive-off");
46 $('#markAsRead').addClass("archive");
47 }
48 else {
49 $('#markAsRead').removeClass("archive");
50 $('#markAsRead').addClass("archive-off");
51 }
52 }
53 else {
54 alert('Error! Pls check if you are logged in.');
55 }
56 });
57 $("body").css("cursor", "auto");
58 });
59
60 // toggle favorite property of current article
61 $('#setFav').click(function(){
62 $("body").css("cursor", "wait");
63 $.ajax( { url: './?action=toggle_fav&id={{ entry.id|e }}' }).done(
64 function( data ) {
65 if ( data == '1' ) {
66 if ( $('#setFav').hasClass("fav-off") ) {
67 $('#setFav').removeClass("fav-off");
68 $('#setFav').addClass("fav");
69 }
70 else {
71 $('#setFav').removeClass("fav");
72 $('#setFav').addClass("fav-off");
73 }
74 }
75 else {
76 alert('Error! Pls check if you are logged in.');
77 }
78 });
79 $("body").css("cursor", "auto");
80 });
35 81
36 $(window).scroll(function(e){ 82 $(window).scroll(function(e){
37 var scrollTop = $(window).scrollTop(); 83 var scrollTop = $(window).scrollTop();
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig
index 9f9ea4f6..25479a3d 100755
--- a/themes/courgette/_view.twig
+++ b/themes/courgette/_view.twig
@@ -12,6 +12,7 @@
12 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %} 12 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
13 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} 13 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
14 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %} 14 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %}
15 <li><a href="./?epub&amp;method=id&amp;id={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
15 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li> 16 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li>
16 </ul> 17 </ul>
17 </div> 18 </div>
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 6e1a9043..9ab58461 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -80,5 +80,42 @@
80 80
81 <h2>{% trans "Export your wallabag data" %}</h2> 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> 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 on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
86 <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>
87
88 <h2>{% trans 'Add user' %}</h2>
89 <p>{% trans 'Add a new user :' %}</p>
90 <form method="post" action="?newuser">
91 <fieldset class="w500p">
92 <div class="row">
93 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
94 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
95 </div>
96 <div class="row">
97 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
98 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
99 </div>
100 <div class="row mts txtcenter">
101 <button type="submit">{% trans "Send" %}</button>
102 </div>
103 </fieldset>
104 </form>
105
106 <h2>{% trans "Delete account" %}</h2>
107 {% if not only_user %}<form method="post" action="?deluser">
108 <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>
109 <fieldset class="w500p">
110 <div class="row">
111 <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
112 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
113 </div>
114 <div class="row mts txtcenter">
115 <button type="submit">{% trans "Send" %}</button>
116 </div>
117 </form>
118 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
119 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %}
83 </div> 120 </div>
84{% endblock %} 121{% endblock %}
diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig
index 6ba72d35..401f3f20 100755
--- a/themes/courgette/home.twig
+++ b/themes/courgette/home.twig
@@ -50,6 +50,13 @@
50 <p>{{ entry.content|striptags|slice(0, 300) }}...</p> 50 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
51 </div> 51 </div>
52 {% endfor %} 52 {% endfor %}
53 {% endif %} 53
54 {{ block('pager') }} 54 {{ block('pager') }}
55
56 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
57 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
58 {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
59
60 {% endif %}
61
55{% endblock %} \ No newline at end of file 62{% endblock %} \ No newline at end of file
diff --git a/themes/dark/img/dark/rss.png b/themes/dark/img/dark/rss.png
new file mode 100644
index 00000000..21bad1a1
--- /dev/null
+++ b/themes/dark/img/dark/rss.png
Binary files differ
diff --git a/themes/default/_search-form.twig b/themes/default/_search-form.twig
index 74f420d0..33bea20d 100644..100755
--- a/themes/default/_search-form.twig
+++ b/themes/default/_search-form.twig
@@ -7,17 +7,3 @@
7 </p> 7 </p>
8</form> 8</form>
9</div> 9</div>
10<script type="text/javascript">
11 $(document).ready(function() {
12
13 $("#search-form").hide();
14
15 $("#search").click(function(){
16 $("#search-form").toggle();
17 $("#search").toggleClass("current");
18 $("#search-arrow").toggleClass("arrow-down");
19 });
20
21
22 });
23</script> \ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index bb39dea2..160f6046 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -126,4 +126,41 @@
126 126
127 <h2>{% trans "Cache" %}</h2> 127 <h2>{% trans "Cache" %}</h2>
128 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p> 128 <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
129
130 <h2>{% trans "Fancy an E-Book ?" %}</h2>
131 <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)." %}
132 <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>
133
134 <h2>{% trans 'Add user' %}</h2>
135 <p>{% trans 'Add a new user :' %}</p>
136 <form method="post" action="?newuser">
137 <fieldset class="w500p">
138 <div class="row">
139 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
140 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
141 </div>
142 <div class="row">
143 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
144 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
145 </div>
146 <div class="row mts txtcenter">
147 <button type="submit">{% trans "Send" %}</button>
148 </div>
149 </fieldset>
150 </form>
151
152 <h2>{% trans "Delete account" %}</h2>
153 {% if not only_user %}<form method="post" action="?deluser">
154 <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>
155 <fieldset class="w500p">
156 <div class="row">
157 <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
158 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
159 </div>
160 <div class="row mts txtcenter">
161 <button type="submit">{% trans "Send" %}</button>
162 </div>
163 </form>
164 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
165 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %}
129{% endblock %} 166{% endblock %}
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 9dc7c0b0..889a9f5c 100644..100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -52,4 +52,8 @@ a.link span {
52 52
53a.bad-display span { 53a.bad-display span {
54 background-image: url('../img/default/bad-display.png'); 54 background-image: url('../img/default/bad-display.png');
55}
56
57a.print span {
58 background-image: url('../img/default/print.png');
55} \ No newline at end of file 59} \ No newline at end of file
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index e536ac6b..e58ef81a 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -331,7 +331,8 @@ a.email span,
331a.delete span, 331a.delete span,
332a.link span, 332a.link span,
333a.bad-display span, 333a.bad-display span,
334a.reading-time span { 334a.reading-time span,
335a.print span {
335 background-repeat: no-repeat; 336 background-repeat: no-repeat;
336} 337}
337 338
@@ -383,8 +384,8 @@ a#bagit-form-close {
383 background-color: #000; 384 background-color: #000;
384 color: #fff; 385 color: #fff;
385 padding: 0 4px 1px 3px; 386 padding: 0 4px 1px 3px;
386 font-weight: bold; 387 font-weight: bold;
387 font-size: 0.7em; 388 font-size: 0.7em;
388 border-radius: 4px; 389 border-radius: 4px;
389} 390}
390.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active { 391.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
@@ -393,6 +394,23 @@ a#bagit-form-close {
393.add-to-wallabag-link-after:visited { 394.add-to-wallabag-link-after:visited {
394 color: #999; 395 color: #999;
395} 396}
397a.add-to-wallabag-link-after {
398 visibility: hidden;
399 position: absolute;
400 opacity: 0;
401 transition-duration: 2s;
402 transition-timing-function: ease-out;
403}
404#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
405 opacity: 1;
406 visibility: visible;
407 transition-duration: .3s;
408 transition-timing-function: ease-in;
409}
410a.add-to-wallabag-link-after:after {
411 content: "w";
412}
413
396 414
397#add-link-result { 415#add-link-result {
398 display: inline; 416 display: inline;
@@ -402,3 +420,13 @@ a#bagit-form-close {
402.opacity03 { 420.opacity03 {
403 /*opacity: 0.3;*/ 421 /*opacity: 0.3;*/
404} 422}
423
424#readLeftPercent {
425 display: inline-block;
426 /* Show textual content */
427 overflow: visible;
428 text-align: left;
429 text-indent: 0;
430 color: black;
431 width: 50px;
432} \ No newline at end of file
diff --git a/themes/default/home.twig b/themes/default/home.twig
index d6cb98e8..e6c781f5 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -55,7 +55,14 @@
55 <p>{{ entry.content|striptags|slice(0, 300) }}...</p> 55 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
56 </div> 56 </div>
57 {% endfor %} 57 {% endfor %}
58 {% endif %} 58
59 {{ block('pager') }} 59 {{ block('pager') }}
60
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 %} 61 {% 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 %}
62
63 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
64 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
65 {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
66
67 {% endif %}
61{% endblock %} 68{% endblock %}
diff --git a/themes/default/img/default/print.png b/themes/default/img/default/print.png
new file mode 100755
index 00000000..83d6445b
--- /dev/null
+++ b/themes/default/img/default/print.png
Binary files differ
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index bee453c0..6dbce97e 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -88,7 +88,7 @@ $.fn.ready(function() {
88 ========================================================================== */ 88 ========================================================================== */
89 89
90 $("article a[href^='http']").after(function() { 90 $("article a[href^='http']").after(function() {
91 return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\">w</a> "; 91 return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\"></a> ";
92 }); 92 });
93 93
94 $(".add-to-wallabag-link-after").click(function(event){ 94 $(".add-to-wallabag-link-after").click(function(event){
diff --git a/themes/default/view.twig b/themes/default/view.twig
index cc491c77..b7d48c00 100755
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -7,14 +7,17 @@
7 <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li> 7 <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li>
8 <li><a href="#top" title="{% trans "Back to top" %}" class="tool top"><span>{% trans "Back to top" %}</span></a></li> 8 <li><a href="#top" title="{% trans "Back to top" %}" class="tool top"><span>{% trans "Back to top" %}</span></a></li>
9 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li> 9 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
10 <li><a title="{% trans "Mark as read" %}" class="tool {% 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> 10 <li><a title="{% trans "Mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li>
11 <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "Toggle favorite" %}</span></a></li> 11 <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li>
12 <li><a title="{% trans "Delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> 12 <li><a title="{% trans "Delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
13 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %} 13 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
14 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %} 14 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
15 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} 15 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
16 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %} 16 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %}
17 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
18 <li><a href="./?epub&amp;method=id&amp;id={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
17 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li> 19 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
20 {% if constant('SHOW_READPERCENT') == 1 %}<li><div id="readLeftPercent">0%</div></li>{% endif %}
18 </ul> 21 </ul>
19 </div> 22 </div>
20 <div id="article"> 23 <div id="article">
@@ -34,6 +37,60 @@
34 <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> 37 <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
35 <script type="text/javascript"> 38 <script type="text/javascript">
36 $(document).ready(function() { 39 $(document).ready(function() {
40
41 // toggle read property of current article
42 $('#markAsRead').click(function(){
43 $("body").css("cursor", "wait");
44 $.ajax( { url: './?action=toggle_archive&id={{ entry.id|e }}' }).done(
45 function( data ) {
46 if ( data == '1' ) {
47 if ( $('#markAsRead').hasClass("archive-off") ) {
48 $('#markAsRead').removeClass("archive-off");
49 $('#markAsRead').addClass("archive");
50 }
51 else {
52 $('#markAsRead').removeClass("archive");
53 $('#markAsRead').addClass("archive-off");
54 }
55 }
56 else {
57 alert('Error! Pls check if you are logged in.');
58 }
59 });
60 $("body").css("cursor", "auto");
61 });
62
63 // toggle favorite property of current article
64 $('#setFav').click(function(){
65 $("body").css("cursor", "wait");
66 $.ajax( { url: './?action=toggle_fav&id={{ entry.id|e }}' }).done(
67 function( data ) {
68 if ( data == '1' ) {
69 if ( $('#setFav').hasClass("fav-off") ) {
70 $('#setFav').removeClass("fav-off");
71 $('#setFav').addClass("fav");
72 }
73 else {
74 $('#setFav').removeClass("fav");
75 $('#setFav').addClass("fav-off");
76 }
77 }
78 else {
79 alert('Error! Pls check if you are logged in.');
80 }
81 });
82 $("body").css("cursor", "auto");
83 });
84
85 // set percent of read on startup
86 if ( $(document).height() <= $(window).innerHeight() ) {
87 pp = 100;
88 }
89 else {
90 pp = 0;
91 }
92 $('#readLeftPercent').text( pp + '%' );
93
37 94
38 $(window).scroll(function(e){ 95 $(window).scroll(function(e){
39 var scrollTop = $(window).scrollTop(); 96 var scrollTop = $(window).scrollTop();
@@ -41,6 +98,10 @@
41 var scrollPercent = (scrollTop) / (docHeight); 98 var scrollPercent = (scrollTop) / (docHeight);
42 var scrollPercentRounded = Math.round(scrollPercent*100)/100; 99 var scrollPercentRounded = Math.round(scrollPercent*100)/100;
43 savePercent({{ entry.id|e }}, scrollPercentRounded); 100 savePercent({{ entry.id|e }}, scrollPercentRounded);
101
102 // change percent of read on scroll
103 pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() ));
104 $('#readLeftPercent').text( pp + '%' );
44 }); 105 });
45 106
46 retrievePercent({{ entry.id|e }}); 107 retrievePercent({{ entry.id|e }});
diff --git a/themes/dmagenta/img/dmagenta/rss.png b/themes/dmagenta/img/dmagenta/rss.png
new file mode 100644
index 00000000..21bad1a1
--- /dev/null
+++ b/themes/dmagenta/img/dmagenta/rss.png
Binary files differ
diff --git a/themes/solarized-dark/img/solarized-dark/rss.png b/themes/solarized-dark/img/solarized-dark/rss.png
new file mode 100644
index 00000000..21bad1a1
--- /dev/null
+++ b/themes/solarized-dark/img/solarized-dark/rss.png
Binary files differ
diff --git a/themes/solarized/img/solarized/rss.png b/themes/solarized/img/solarized/rss.png
new file mode 100644
index 00000000..21bad1a1
--- /dev/null
+++ b/themes/solarized/img/solarized/rss.png
Binary files differ