diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-02-18 19:17:31 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-18 19:17:31 +0100 |
commit | 4b1fa4c2febc7abbc6da3d65e4e760949a55843c (patch) | |
tree | a93ec906dbb03ec70e9cdc5dc876392c6d758e97 /themes/baggy | |
parent | 364953ede585b75fb29dc94b1c5f853053eaed0b (diff) | |
parent | df89c6f71adebfdb754ec3eb2fd775d8efbdb280 (diff) | |
download | wallabag-4b1fa4c2febc7abbc6da3d65e4e760949a55843c.tar.gz wallabag-4b1fa4c2febc7abbc6da3d65e4e760949a55843c.tar.zst wallabag-4b1fa4c2febc7abbc6da3d65e4e760949a55843c.zip |
Merge pull request #1081 from wallabag/dev1.9
Version 1.9.0
Diffstat (limited to 'themes/baggy')
23 files changed, 221 insertions, 96 deletions
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index be11673f..a88d4186 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig | |||
@@ -1,16 +1,39 @@ | |||
1 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" /> | 1 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152"> |
2 | <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> | 2 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152"> |
3 | <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> | 3 | |
4 | <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png"> | 4 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144"> |
5 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144"> | ||
6 | |||
7 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120"> | ||
8 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120"> | ||
9 | |||
10 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114"> | ||
11 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114"> | ||
12 | |||
13 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76"> | ||
14 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76"> | ||
15 | |||
16 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72"> | ||
17 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72"> | ||
18 | |||
19 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57"> | ||
20 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57"> | ||
21 | |||
22 | <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png"> | ||
23 | <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png"> | ||
24 | |||
25 | <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico" sizes="16x16"> | ||
26 | |||
5 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all"> | 27 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all"> |
6 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all"> | 28 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all"> |
7 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all"> | 29 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all"> |
8 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> | 30 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> |
9 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> | 31 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> |
10 | <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script> | 32 | |
11 | <script src="{{ poche_url }}themes/default/js/autoClose.js"></script> | 33 | <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script> |
34 | <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script> | ||
12 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> | 35 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> |
13 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> | 36 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> |
14 | <script src="{{ poche_url }}themes/default/js/saveLink.js"></script> | 37 | <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script> |
15 | <script src="{{ poche_url }}themes/default/js/popupForm.js"></script> | 38 | <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script> |
16 | <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> | 39 | <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> |
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index bf2ae903..85d33873 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig | |||
@@ -4,6 +4,10 @@ | |||
4 | <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">×</a> | 4 | <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">×</a> |
5 | <input type="hidden" name="autoclose" value="1" /> | 5 | <input type="hidden" name="autoclose" value="1" /> |
6 | <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> | 6 | <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> |
7 | <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="tool icon icon-tags"> | ||
8 | <span>Add tags</span> | ||
9 | </div> | ||
10 | <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/> | ||
7 | <span id="add-link-result"></span> | 11 | <span id="add-link-result"></span> |
8 | <input type="submit" value="{% trans "save link!" %}" /> | 12 | <input type="submit" value="{% trans "save link!" %}" /> |
9 | </form> | 13 | </form> |
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig index 7e19a900..93c96df2 100755 --- a/themes/baggy/about.twig +++ b/themes/baggy/about.twig | |||
@@ -7,9 +7,11 @@ | |||
7 | {% block content %} | 7 | {% block content %} |
8 | <h2>{% trans "About wallabag" %}</h2> | 8 | <h2>{% trans "About wallabag" %}</h2> |
9 | 9 | ||
10 | <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p> | ||
11 | |||
10 | <dl> | 12 | <dl> |
11 | <dt>{% trans "Project website" %}</dt> | 13 | <dt>{% trans "Project website" %}</dt> |
12 | <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd> | 14 | <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> |
13 | 15 | ||
14 | <dt>{% trans "Main developer" %}</dt> | 16 | <dt>{% trans "Main developer" %}</dt> |
15 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans "website" %}</a></dd> | 17 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans "website" %}</a></dd> |
@@ -18,7 +20,7 @@ | |||
18 | <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd> | 20 | <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd> |
19 | 21 | ||
20 | <dt>{% trans "Bug reports" %}</dt> | 22 | <dt>{% trans "Bug reports" %}</dt> |
21 | <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd> | 23 | <dd><a href="https://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd> |
22 | 24 | ||
23 | <dt>{% trans "License" %}</dt> | 25 | <dt>{% trans "License" %}</dt> |
24 | <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd> | 26 | <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd> |
@@ -27,16 +29,24 @@ | |||
27 | <dd>{{ constant('POCHE') }}</dd> | 29 | <dd>{{ constant('POCHE') }}</dd> |
28 | </dl> | 30 | </dl> |
29 | 31 | ||
30 | <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p> | 32 | <h2>{% trans "Getting help" %}</h2> |
33 | |||
34 | <dl> | ||
35 | <dt>{% trans "Documentation" %}</dt> | ||
36 | <dd><a href="docs/">Offline documentation</a> and <a href="https://doc.wallabag.org/">online documentation</a> (up to date)</dd> | ||
37 | |||
38 | <dt>{% trans "Support" %}</dt> | ||
39 | <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd> | ||
40 | </dl> | ||
31 | 41 | ||
32 | <h2>{% trans "Helping wallabag" %}</h2> | 42 | <h2>{% trans "Helping wallabag" %}</h2> |
33 | 43 | ||
34 | <p>{% trans "wallabag is free and opensource. You can help us:" %}</p> | 44 | <p>{% trans "wallabag is free and opensource. You can help us:" %}</p> |
35 | 45 | ||
36 | <dl> | 46 | <dl> |
37 | <dt><a href="http://www.wallabag.org">{% trans "via Paypal" %}</a></dt> | 47 | <dt><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb">{% trans "via Paypal" %}</a></dt> |
38 | 48 | ||
39 | <dt><a href="http://www.wallabag.org">{% trans "via Flattr" %}</a></dt> | 49 | <dt><a href="https://flattr.com/thing/1265480">{% trans "via Flattr" %}</a></dt> |
40 | </dl> | 50 | </dl> |
41 | 51 | ||
42 | <h2>{% trans "Credits" %}</h2> | 52 | <h2>{% trans "Credits" %}</h2> |
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 2b967cd4..94257616 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig | |||
@@ -23,11 +23,11 @@ | |||
23 | <ul> | 23 | <ul> |
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> | 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> |
25 | <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li> | 25 | <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></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> | 26 | <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans "download the application" %}</a></li> |
27 | </ul> | 27 | </ul> |
28 | <h3>{% trans "Bookmarklet" %}</h3> | 28 | <h3>{% trans "Bookmarklet" %}</h3> |
29 | <p> | 29 | <p> |
30 | {% trans "Drag & drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" 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> | 30 | {% trans "Drag & drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" 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&autoclose=true&url='%20+%20btoa(url),'_blank');})();void(0);}">{% trans "bag it!" %}</a> |
31 | </p> | 31 | </p> |
32 | 32 | ||
33 | <h2>{% trans "Feeds" %}</h2> | 33 | <h2>{% trans "Feeds" %}</h2> |
@@ -106,8 +106,14 @@ | |||
106 | <span class="more-info">Data will be exported in a single JSON file.</span></p> | 106 | <span class="more-info">Data will be exported in a single JSON file.</span></p> |
107 | 107 | ||
108 | <h2>{% trans "Fancy an E-Book ?" %}</h2> | 108 | <h2>{% trans "Fancy an E-Book ?" %}</h2> |
109 | <p><a href="./?epub&method=all" title="Generate ePub">Download E-Book</a><br> | 109 | <p>{% trans "Click to get all your articles in one ebook :" %} |
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> | 110 | <ul> |
111 | <li><a href="./?epub&method=all" title="{% trans 'Generate ePub file' %}">ePub 3</a></li> | ||
112 | <li><a href="./?mobi&method=all" title="{% trans 'Generate Mobi file' %}">Mobi</a></li> | ||
113 | <li><a href="./?pdf&method=all" title="{% trans 'Generate PDF file' %}">PDF</a></li> | ||
114 | </ul> | ||
115 | |||
116 | <span class="more-info">{% 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> | ||
111 | 117 | ||
112 | <h2><a name="cache"></a>{% trans "Cache" %}</h2> | 118 | <h2><a name="cache"></a>{% trans "Cache" %}</h2> |
113 | <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br> | 119 | <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br> |
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 028c8b4e..b93a78b8 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css | |||
@@ -15,11 +15,11 @@ html { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | body { | 17 | body { |
18 | background: #EEE; | 18 | background-color: #EEE; |
19 | } | 19 | } |
20 | 20 | ||
21 | .login { | 21 | .login { |
22 | background: #333; | 22 | background-color: #333; |
23 | } | 23 | } |
24 | 24 | ||
25 | .login #main { | 25 | .login #main { |
@@ -28,7 +28,7 @@ body { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | .login form { | 30 | .login form { |
31 | background: #FFF; | 31 | background-color: #FFF; |
32 | padding: 1.5em; | 32 | padding: 1.5em; |
33 | box-shadow: 0 1px 8px rgba(0,0,0,0.9); | 33 | box-shadow: 0 1px 8px rgba(0,0,0,0.9); |
34 | width: 20em; | 34 | width: 20em; |
@@ -51,7 +51,7 @@ body { | |||
51 | 51 | ||
52 | ::selection { | 52 | ::selection { |
53 | color: #FFF; | 53 | color: #FFF; |
54 | background: #000; | 54 | background-color: #000; |
55 | } | 55 | } |
56 | 56 | ||
57 | .desktopHide { | 57 | .desktopHide { |
@@ -129,7 +129,7 @@ form .row { | |||
129 | 129 | ||
130 | form button, input[type="submit"] { | 130 | form button, input[type="submit"] { |
131 | cursor:pointer; | 131 | cursor:pointer; |
132 | background: #000; | 132 | background-color: #000; |
133 | color: #FFF; | 133 | color: #FFF; |
134 | border:0; | 134 | border:0; |
135 | padding: 0.5em 1em; | 135 | padding: 0.5em 1em; |
@@ -138,7 +138,7 @@ form button, input[type="submit"] { | |||
138 | } | 138 | } |
139 | 139 | ||
140 | form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus { | 140 | form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus { |
141 | background: #FFF; | 141 | background-color: #FFF; |
142 | color: #000; | 142 | color: #000; |
143 | -webkit-transition: all 0.5s ease; | 143 | -webkit-transition: all 0.5s ease; |
144 | -moz-transition: all 0.5s ease; | 144 | -moz-transition: all 0.5s ease; |
@@ -155,7 +155,7 @@ h2:after { | |||
155 | content: ""; | 155 | content: ""; |
156 | height: 4px; | 156 | height: 4px; |
157 | width: 70px; | 157 | width: 70px; |
158 | background: #000; | 158 | background-color: #000; |
159 | display: block; | 159 | display: block; |
160 | } | 160 | } |
161 | 161 | ||
@@ -176,7 +176,7 @@ h2:after { | |||
176 | width: 10em; | 176 | width: 10em; |
177 | left: 0; | 177 | left: 0; |
178 | text-align: right; | 178 | text-align: right; |
179 | background: #333; | 179 | background-color: #333; |
180 | padding-top: 9.5em; | 180 | padding-top: 9.5em; |
181 | height: 100%; | 181 | height: 100%; |
182 | box-shadow:inset -4px 0 20px rgba(0,0,0,0.6); | 182 | box-shadow:inset -4px 0 20px rgba(0,0,0,0.6); |
@@ -208,7 +208,7 @@ h2:after { | |||
208 | } | 208 | } |
209 | 209 | ||
210 | #links > li > a:hover, #links > li > a:focus { | 210 | #links > li > a:hover, #links > li > a:focus { |
211 | background: #999; | 211 | background-color: #999; |
212 | color: #000; | 212 | color: #000; |
213 | } | 213 | } |
214 | 214 | ||
@@ -344,7 +344,7 @@ footer a { | |||
344 | } | 344 | } |
345 | 345 | ||
346 | .entrie { | 346 | .entrie { |
347 | background: #FFF; | 347 | background-color: #FFF; |
348 | letter-spacing:normal; | 348 | letter-spacing:normal; |
349 | box-shadow: 0 3px 7px rgba(0,0,0,0.3); | 349 | box-shadow: 0 3px 7px rgba(0,0,0,0.3); |
350 | display: inline-block; | 350 | display: inline-block; |
@@ -391,7 +391,7 @@ footer a { | |||
391 | width: 100%; | 391 | width: 100%; |
392 | bottom: 0; | 392 | bottom: 0; |
393 | left: 0; | 393 | left: 0; |
394 | background: #000; | 394 | background-color: #000; |
395 | -webkit-transition: all 0.5s ease; | 395 | -webkit-transition: all 0.5s ease; |
396 | -moz-transition: all 0.5s ease; | 396 | -moz-transition: all 0.5s ease; |
397 | -ms-transition: all 0.5s ease; | 397 | -ms-transition: all 0.5s ease; |
@@ -557,7 +557,7 @@ footer a { | |||
557 | } | 557 | } |
558 | 558 | ||
559 | .popup-form form { | 559 | .popup-form form { |
560 | background: #FFF; | 560 | background-color: #FFF; |
561 | position: absolute; | 561 | position: absolute; |
562 | top: 0; | 562 | top: 0; |
563 | left: 0; | 563 | left: 0; |
@@ -574,7 +574,7 @@ footer a { | |||
574 | 574 | ||
575 | .closeMessage, | 575 | .closeMessage, |
576 | .close-button { | 576 | .close-button { |
577 | background: #000; | 577 | background-color: #000; |
578 | color: #FFF; | 578 | color: #FFF; |
579 | font-size: 1.2em; | 579 | font-size: 1.2em; |
580 | line-height: 1.6; | 580 | line-height: 1.6; |
@@ -587,7 +587,7 @@ footer a { | |||
587 | .closeMessage:focus, | 587 | .closeMessage:focus, |
588 | .close-button:hover, | 588 | .close-button:hover, |
589 | .close-button:focus { | 589 | .close-button:focus { |
590 | background: #999; | 590 | background-color: #999; |
591 | color: #000; | 591 | color: #000; |
592 | } | 592 | } |
593 | 593 | ||
@@ -657,15 +657,16 @@ a.add-to-wallabag-link-after:after { | |||
657 | @font-face { | 657 | @font-face { |
658 | font-family: 'icomoon'; | 658 | font-family: 'icomoon'; |
659 | src:url('../fonts/icomoon.eot?-s0mcsx'); | 659 | src:url('../fonts/icomoon.eot?-s0mcsx'); |
660 | src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), | 660 | src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), |
661 | url('../fonts/icomoon.woff?-s0mcsx') format('woff'), | 661 | url('../fonts/icomoon.woff?-s0mcsx') format('woff'), |
662 | url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'), | 662 | url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'), |
663 | url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg'); | 663 | url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg'); |
664 | font-weight: normal; | 664 | font-weight: normal; |
665 | font-style: normal; | 665 | font-style: normal; |
666 | } | 666 | } |
667 | 667 | ||
668 | .icon span { | 668 | .icon span, |
669 | .icon-image span { | ||
669 | position: absolute; | 670 | position: absolute; |
670 | top: -9999px; | 671 | top: -9999px; |
671 | } | 672 | } |
@@ -735,6 +736,40 @@ a.add-to-wallabag-link-after:after { | |||
735 | .icon-print:before { | 736 | .icon-print:before { |
736 | content: "\e80d"; | 737 | content: "\e80d"; |
737 | } | 738 | } |
739 | .icon-random:before { | ||
740 | content: "\e915"; | ||
741 | } | ||
742 | .icon-reload:before { | ||
743 | content: "\ea2e"; | ||
744 | } | ||
745 | .icon-evernote:before { | ||
746 | content: "\e603"; | ||
747 | } | ||
748 | .icon-tags:before { | ||
749 | content: "\e936"; | ||
750 | } | ||
751 | |||
752 | |||
753 | /* .icon-image class, for image-based icons | ||
754 | ========================================================================== */ | ||
755 | |||
756 | .icon-image { | ||
757 | background-size: 16px 16px; | ||
758 | background-repeat: no-repeat; | ||
759 | background-position: center; | ||
760 | padding-right: 1em !important; | ||
761 | padding-left: 1em !important; | ||
762 | } | ||
763 | |||
764 | /* Carrot (http://carrot.org) */ | ||
765 | .icon-image--carrot { | ||
766 | background-image: url('../../_global/img/icons/carrot-icon--white.png'); | ||
767 | } | ||
768 | |||
769 | /* Diaspora */ | ||
770 | .icon-image--diaspora { | ||
771 | background-image: url('../../_global/img/icons/diaspora-icon--black.png'); | ||
772 | }} | ||
738 | 773 | ||
739 | /* ========================================================================== | 774 | /* ========================================================================== |
740 | Icon selected | 775 | Icon selected |
@@ -805,7 +840,7 @@ a.add-to-wallabag-link-after:after { | |||
805 | 840 | ||
806 | blockquote { | 841 | blockquote { |
807 | border:1px solid #999; | 842 | border:1px solid #999; |
808 | background: #FFF; | 843 | background-color: #FFF; |
809 | padding: 1em; | 844 | padding: 1em; |
810 | margin: 0; | 845 | margin: 0; |
811 | } | 846 | } |
@@ -838,14 +873,14 @@ blockquote { | |||
838 | } | 873 | } |
839 | 874 | ||
840 | #article_toolbar a { | 875 | #article_toolbar a { |
841 | background: #000; | 876 | background-color: #000; |
842 | padding: 0.3em 0.5em 0.2em; | 877 | padding: 0.3em 0.5em 0.2em; |
843 | color: #FFF; | 878 | color: #FFF; |
844 | text-decoration: none; | 879 | text-decoration: none; |
845 | } | 880 | } |
846 | 881 | ||
847 | #article_toolbar a:hover, #article_toolbar a:focus { | 882 | #article_toolbar a:hover, #article_toolbar a:focus { |
848 | background: #999; | 883 | background-color: #999; |
849 | } | 884 | } |
850 | 885 | ||
851 | .shaarli:before { | 886 | .shaarli:before { |
@@ -868,7 +903,7 @@ blockquote { | |||
868 | } | 903 | } |
869 | 904 | ||
870 | .icon-rss { | 905 | .icon-rss { |
871 | background: #000; | 906 | background-color: #000; |
872 | color: #FFF; | 907 | color: #FFF; |
873 | padding: 0.2em 0.5em; | 908 | padding: 0.2em 0.5em; |
874 | } | 909 | } |
@@ -883,7 +918,7 @@ blockquote { | |||
883 | } | 918 | } |
884 | 919 | ||
885 | .list-tags .icon-rss:hover, .list-tags .icon-rss:focus { | 920 | .list-tags .icon-rss:hover, .list-tags .icon-rss:focus { |
886 | background: #FFF; | 921 | background-color: #FFF; |
887 | color: #000; | 922 | color: #000; |
888 | text-decoration: none; | 923 | text-decoration: none; |
889 | } | 924 | } |
@@ -944,7 +979,7 @@ pre code { | |||
944 | margin-left: 0; | 979 | margin-left: 0; |
945 | } | 980 | } |
946 | body > header { | 981 | body > header { |
947 | background: #333; | 982 | background-color: #333; |
948 | position: fixed; | 983 | position: fixed; |
949 | top: 0; | 984 | top: 0; |
950 | width: 100%; | 985 | width: 100%; |
@@ -990,11 +1025,11 @@ pre code { | |||
990 | width: 2.5em; | 1025 | width: 2.5em; |
991 | height: 2.5em; | 1026 | height: 2.5em; |
992 | cursor: pointer; | 1027 | cursor: pointer; |
993 | background: #999; | 1028 | background-color: #999; |
994 | font-size: 1.2em; | 1029 | font-size: 1.2em; |
995 | } | 1030 | } |
996 | .desktopHide:hover, .desktopHide:focus { | 1031 | .desktopHide:hover, .desktopHide:focus { |
997 | background: #FFF; | 1032 | background-color: #FFF; |
998 | } | 1033 | } |
999 | #links { | 1034 | #links { |
1000 | display: none; | 1035 | display: none; |
@@ -1046,4 +1081,3 @@ pre code { | |||
1046 | width: 100%; | 1081 | width: 100%; |
1047 | } | 1082 | } |
1048 | } | 1083 | } |
1049 | |||
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index d7c15033..15f15560 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig | |||
@@ -5,9 +5,9 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | 7 | ||
8 | <script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> | 8 | <script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script> |
9 | <script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script> | 9 | <script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script> |
10 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> | 10 | <link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all"> |
11 | 11 | ||
12 | <div id="article"> | 12 | <div id="article"> |
13 | <h2>{{ entry.title|raw }}</21> | 13 | <h2>{{ entry.title|raw }}</21> |
diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot index 56323516..3d4d14ae 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 b4586136..19fcfa1f 100644 --- a/themes/baggy/fonts/icomoon.svg +++ b/themes/baggy/fonts/icomoon.svg | |||
@@ -1,41 +1,39 @@ | |||
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> | 4 | <metadata>Generated by IcoMoon</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> | ||
19 | <defs> | 5 | <defs> |
20 | <font id="icomoon" horiz-adv-x="512"> | 6 | <font id="icomoon" horiz-adv-x="1024"> |
21 | <font-face units-per-em="512" ascent="480" descent="-32" /> | 7 | <font-face units-per-em="1024" ascent="960" descent="-64" /> |
22 | <missing-glyph horiz-adv-x="512" /> | 8 | <missing-glyph horiz-adv-x="1024" /> |
23 | <glyph unicode=" " d="" horiz-adv-x="256" /> | 9 | <glyph unicode=" " d="" horiz-adv-x="512" /> |
24 | <glyph unicode="" d="M256 389.333c-94.272 0-170.667-76.416-170.667-170.666s76.394-170.667 170.667-170.667 170.667 76.416 170.667 170.667-76.394 170.666-170.667 170.666zM335.082 169.749c8.341-8.341 8.341-21.824 0-30.166-4.16-4.16-9.622-6.25-15.082-6.25s-10.923 2.091-15.082 6.25l-48.918 48.918-48.917-48.918c-4.16-4.16-9.621-6.25-15.083-6.25s-10.923 2.091-15.083 6.25c-8.341 8.341-8.341 21.824 0 30.166l48.917 48.918-48.917 48.917c-8.341 8.341-8.341 21.824 0 30.166s21.824 8.341 30.166 0l48.917-48.917 48.918 48.917c8.341 8.341 21.824 8.341 30.166 0s8.341-21.824 0-30.166l-48.918-48.917 48.918-48.918z" /> | 10 | <glyph unicode="" d="M512 778.666c-188.544 0-341.334-152.832-341.334-341.332s152.788-341.334 341.334-341.334 341.334 152.832 341.334 341.334-152.788 341.332-341.334 341.332zM670.164 339.498c16.682-16.682 16.682-43.648 0-60.332-8.32-8.32-19.244-12.5-30.164-12.5s-21.846 4.182-30.164 12.5l-97.836 97.836-97.834-97.836c-8.32-8.32-19.242-12.5-30.166-12.5s-21.846 4.182-30.166 12.5c-16.682 16.682-16.682 43.648 0 60.332l97.834 97.836-97.834 97.834c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0l97.834-97.834 97.836 97.834c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332l-97.836-97.834 97.836-97.836z" /> |
25 | <glyph unicode="" d="M245.333 73.109c-37.035 0-71.85 14.421-98.048 40.598-26.176 26.197-40.618 61.014-40.618 98.070s14.442 71.872 40.618 98.070c8.341 8.341 21.824 8.341 30.166 0s8.341-21.824 0-30.166c-18.133-18.154-28.118-42.261-28.118-67.904s9.984-49.771 28.118-67.904c18.133-18.134 42.219-28.096 67.882-28.096s49.749 9.984 67.883 28.096c18.154 18.134 28.118 42.24 28.118 67.904s-9.984 49.771-28.118 67.904c-8.341 8.341-8.341 21.824 0 30.166s21.824 8.341 30.166 0c26.176-26.219 40.618-61.035 40.618-98.070s-14.442-71.872-40.618-98.070c-26.197-26.176-61.014-40.597-98.048-40.597zM245.333 234.667c-11.797 0-21.333 9.558-21.333 21.333v106.667c0 11.776 9.536 21.333 21.334 21.333s21.334-9.558 21.334-21.333v-106.667c0-11.776-9.536-21.333-21.334-21.333z" /> | 11 | <glyph unicode="" d="M490.666 146.218c-74.070 0-143.7 28.842-196.096 81.196-52.352 52.394-81.236 122.028-81.236 196.14s28.884 143.744 81.236 196.14c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332c-36.266-36.308-56.236-84.522-56.236-135.808s19.968-99.542 56.236-135.808c36.266-36.268 84.438-56.192 135.764-56.192s99.498 19.968 135.766 56.192c36.308 36.268 56.236 84.48 56.236 135.808s-19.968 99.542-56.236 135.808c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0c52.352-52.438 81.236-122.070 81.236-196.14s-28.884-143.744-81.236-196.14c-52.394-52.352-122.028-81.194-196.096-81.194zM490.666 469.334c-23.594 0-42.666 19.116-42.666 42.666v213.334c0 23.552 19.072 42.666 42.668 42.666s42.668-19.116 42.668-42.666v-213.334c0-23.552-19.072-42.666-42.668-42.666z" /> |
26 | <glyph unicode="" d="M256 401.664l-136.832-136.832c-16.662-16.661-16.662-43.67 0-60.331s43.669-16.661 60.331 0l33.834 33.835v-154.496c0-23.552 19.094-42.666 42.667-42.666 23.552 0 42.666 19.115 42.666 42.666v154.496l33.834-33.835c8.341-8.341 19.243-12.502 30.166-12.502s21.824 4.16 30.166 12.502c16.661 16.661 16.661 43.67 0 60.331l-136.832 136.832z" /> | 12 | <glyph unicode="" d="M512 803.328l-273.664-273.664c-33.324-33.322-33.324-87.34 0-120.662s87.338-33.322 120.662 0l67.668 67.67v-308.992c0-47.104 38.188-85.332 85.334-85.332 47.104 0 85.332 38.23 85.332 85.332v308.992l67.668-67.67c16.682-16.682 38.486-25.004 60.332-25.004s43.648 8.32 60.332 25.004c33.322 33.322 33.322 87.34 0 120.662l-273.664 273.664z" /> |
27 | <glyph unicode="" d="M0 25.856v263.168q0 91.648 43.52 142.336t132.608 50.688h280.576q-2.56-2.56-26.624-27.136t-51.2-51.712-55.808-55.808-48.64-47.616-21.504-18.944q-7.68 0-7.68 8.192v79.872h-24.576q-30.208 0-48.128-3.072t-32.256-13.312-19.968-29.184-6.144-49.152v-134.144zM34.304-34.048q2.56 2.56 27.136 27.136t51.2 51.712 55.808 56.32 48.64 47.616 20.992 18.432q7.68 0 7.68-8.192v-79.872h24.576q59.392 0 82.944 18.432t23.040 76.288v134.144l114.688 114.176v-263.168q0-91.648-43.008-142.336t-133.12-50.688h-280.576z" horiz-adv-x="491" /> | 13 | <glyph unicode="" d="M887.757 752.282c0 58.88-88.678 65.382-88.678 65.382l-208.333 13.107c0 0-4.454 56.678-46.541 76.39-42.086 19.61-88.371 13.619-121.651 13.312-33.28-0.358-41.114-42.752-41.114-82.79 0-39.987 0.717-86.221 0.717-115.2 0-52.122-22.886-74.189-80.179-74.189h-118.118c-33.024 2.099-58.726-3.277-58.726-30.003 0-26.778 38.861-254.618 92.211-307.2 30.976-30.515 220.416-51.917 260.301-51.917s26.573 117.811 37.683 117.811c11.11 0 23.245-66.509 86.118-82.074 62.771-15.718 146.637-12.8 151.091-57.498 5.786-58.982 11.11-135.27-27.699-140.698l-87.859-3.482c-60.211 4.301-44.032 70.093-17.459 70.093s39.885 0.973 39.885 0.973l3.328 71.987c0 0-137.882 16.282-143.718-76.698-5.376-84.992 9.216-125.082 19.917-133.786 10.701-8.806 29.235-25.805 198.093-25.805 237.926 0 150.733 693.402 150.733 752.282zM790.528 444.416c-9.318-10.035-43.11 16.384-75.366 16.384-32.307 0-67.123-17.101-75.315-5.786-8.192 11.213 7.475 101.888 68.301 101.888s91.802-102.605 82.381-112.486zM297.165 759.501c0 11.725 2.97 152.781 2.97 152.781l-179.456-176.128c0 0 124.006 0 148.378 0 24.371 0.051 28.109 11.725 28.109 23.347z" /> |
28 | <glyph unicode="" d="M150.528 104.192q7.168 7.168 17.408 7.168t18.432-7.168q16.384-17.408 0-35.84l-21.504-20.48q-28.672-28.672-67.584-28.672-39.936 0-68.608 28.672t-28.672 67.584q0 39.936 28.672 68.608l75.776 75.776q35.84 34.816 73.728 39.424t65.536-22.016q8.192-8.192 8.192-18.432t-8.192-18.432q-18.432-16.384-35.84 0-25.6 24.576-67.584-17.408l-75.776-74.752q-13.312-13.312-13.312-32.768t13.312-31.744q13.312-13.312 32.256-13.312t32.256 13.312zM380.928 398.080q28.672-28.672 28.672-67.584 0-39.936-28.672-68.608l-80.896-80.896q-37.888-36.864-76.8-36.864-31.744 0-57.344 25.6-7.168 7.168-7.168 17.408t7.168 18.432q7.168 7.168 17.92 7.168t17.92-7.168q25.6-24.576 62.464 12.288l80.896 79.872q14.336 14.336 14.336 32.768 0 19.456-14.336 31.744-12.288 13.312-28.672 15.872t-30.72-10.752l-25.6-25.6q-8.192-7.168-18.432-7.168t-17.408 7.168q-17.408 17.408 0 35.84l25.6 25.6q27.648 27.648 65.024 26.112t66.048-31.232z" horiz-adv-x="410" /> | 14 | <glyph unicode="" d="M0 51.712v526.336q0 183.296 87.040 284.672t265.216 101.376h561.152q-5.12-5.12-53.248-54.272t-102.4-103.424-111.616-111.616-97.28-95.232-43.008-37.888q-15.36 0-15.36 16.384v159.744h-49.152q-60.416 0-96.256-6.144t-64.512-26.624-39.936-58.368-12.288-98.304v-268.288zM68.608-68.096q5.12 5.12 54.272 54.272t102.4 103.424 111.616 112.64 97.28 95.232 41.984 36.864q15.36 0 15.36-16.384v-159.744h49.152q118.784 0 165.888 36.864t46.080 152.576v268.288l229.376 228.352v-526.336q0-183.296-86.016-284.672t-266.24-101.376h-561.152z" horiz-adv-x="982" /> |
29 | <glyph unicode="" d="M438.784 96v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 12.8t12.8 5.632h401.92q7.68 0 13.312-5.632t5.12-12.8zM438.784 242.432v-36.864q0-7.168-5.12-12.8t-13.312-5.12h-401.92q-7.68 0-12.8 5.12t-5.632 12.8v36.864q0 7.168 5.632 12.8t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-12.8zM438.784 388.352v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 13.312t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-13.312z" horiz-adv-x="439" /> | 15 | <glyph unicode="" d="M301.056 208.384q14.336 14.336 34.816 14.336t36.864-14.336q32.768-34.816 0-71.68l-43.008-40.96q-57.344-57.344-135.168-57.344-79.872 0-137.216 57.344t-57.344 135.168q0 79.872 57.344 137.216l151.552 151.552q71.68 69.632 147.456 78.848t131.072-44.032q16.384-16.384 16.384-36.864t-16.384-36.864q-36.864-32.768-71.68 0-51.2 49.152-135.168-34.816l-151.552-149.504q-26.624-26.624-26.624-65.536t26.624-63.488q26.624-26.624 64.512-26.624t64.512 26.624zM761.856 796.16q57.344-57.344 57.344-135.168 0-79.872-57.344-137.216l-161.792-161.792q-75.776-73.728-153.6-73.728-63.488 0-114.688 51.2-14.336 14.336-14.336 34.816t14.336 36.864q14.336 14.336 35.84 14.336t35.84-14.336q51.2-49.152 124.928 24.576l161.792 159.744q28.672 28.672 28.672 65.536 0 38.912-28.672 63.488-24.576 26.624-57.344 31.744t-61.44-21.504l-51.2-51.2q-16.384-14.336-36.864-14.336t-34.816 14.336q-34.816 34.816 0 71.68l51.2 51.2q55.296 55.296 130.048 52.224t132.096-62.464z" horiz-adv-x="820" /> |
30 | <glyph unicode="" d="M235.52 459.52q97.28 0 166.4-69.12t69.12-166.4-69.12-166.4-166.4-69.12-166.4 69.12-69.12 166.4 69.12 166.4 166.4 69.12zM235.52 39.68q76.8 0 130.56 54.272t53.76 130.048q0 76.8-53.76 130.56t-130.56 53.76q-75.776 0-130.048-53.76t-54.272-130.56q0-75.776 54.272-130.048t130.048-54.272zM253.952 357.12v-124.928l76.8-76.8-25.6-25.6-87.040 87.040v140.288h35.84z" horiz-adv-x="471" /> | 16 | <glyph unicode="" d="M877.568 192v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 25.6t25.6 11.264h803.84q15.36 0 26.624-11.264t10.24-25.6zM877.568 484.864v-73.728q0-14.336-10.24-25.6t-26.624-10.24h-803.84q-15.36 0-25.6 10.24t-11.264 25.6v73.728q0 14.336 11.264 25.6t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-25.6zM877.568 776.704v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 26.624t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-26.624z" horiz-adv-x="878" /> |
31 | <glyph unicode="" d="M127.488 44.8q-17.408 0-28.672 14.336l-92.16 120.832q-8.192 12.288-6.144 26.624t13.312 23.552 26.112 7.168 24.064-14.336l60.416-78.848 151.552 242.688q8.192 12.288 22.016 15.36t27.136-4.096q12.288-8.192 15.36-22.016t-4.096-27.136l-179.2-286.72q-10.24-16.384-28.672-16.384z" horiz-adv-x="342" /> | 17 | <glyph unicode="" d="M471.040 919.040q194.56 0 332.8-138.24t138.24-332.8-138.24-332.8-332.8-138.24-332.8 138.24-138.24 332.8 138.24 332.8 332.8 138.24zM471.040 79.36q153.6 0 261.12 108.544t107.52 260.096q0 153.6-107.52 261.12t-261.12 107.52q-151.552 0-260.096-107.52t-108.544-261.12q0-151.552 108.544-260.096t260.096-108.544zM507.904 714.24v-249.856l153.6-153.6-51.2-51.2-174.080 174.080v280.576h71.68z" horiz-adv-x="942" /> |
32 | <glyph unicode="" d="M225.28 449.28l61.44-172.032h163.84l-134.144-100.352 48.128-178.176-139.264 106.496-139.264-106.496 48.128 178.176-134.144 100.352h163.84z" horiz-adv-x="451" /> | 18 | <glyph unicode="" d="M254.976 89.6q-34.816 0-57.344 28.672l-184.32 241.664q-16.384 24.576-12.288 53.248t26.624 47.104 52.224 14.336 48.128-28.672l120.832-157.696 303.104 485.376q16.384 24.576 44.032 30.72t54.272-8.192q24.576-16.384 30.72-44.032t-8.192-54.272l-358.4-573.44q-20.48-32.768-57.344-32.768z" horiz-adv-x="684" /> |
33 | <glyph unicode="" d="M460.8 49.92q-44.032 77.824-106.496 100.864t-168.96 23.040v-111.616l-185.344 171.008 185.344 164.864v-98.304q46.080 0 86.016-13.824t67.072-35.84 49.152-48.64 35.328-53.248 22.528-48.64 12.288-35.328z" horiz-adv-x="461" /> | 19 | <glyph unicode="" d="M450.56 898.56l122.88-344.064h327.68l-268.288-200.704 96.256-356.352-278.528 212.992-278.528-212.992 96.256 356.352-268.288 200.704h327.68z" horiz-adv-x="902" /> |
34 | <glyph unicode="" d="M471.040 370.432q-18.432-27.648-48.128-50.176v-12.288q0-66.56-30.72-128t-95.232-103.936-148.48-42.496q-81.92 0-148.48 43.008 7.168-1.024 23.552-1.024 67.584 0 119.808 40.96-31.744 1.024-56.32 19.456t-33.792 48.128q5.12-2.048 17.408-2.048 13.312 0 25.6 3.072-33.792 7.168-55.296 33.792t-21.504 61.44v1.024q18.432-10.24 43.008-12.288-43.008 29.696-43.008 80.896 0 24.576 13.312 48.128 78.848-96.256 199.68-100.352-3.072 9.216-3.072 21.504 0 39.936 28.16 68.096t69.12 28.16q41.984 0 69.632-29.696 30.72 6.144 61.44 22.528-10.24-33.792-41.984-53.248 28.672 4.096 55.296 15.36z" horiz-adv-x="471" /> | 20 | <glyph unicode="" d="M921.6 99.84q-88.064 155.648-212.992 201.728t-337.92 46.080v-223.232l-370.688 342.016 370.688 329.728v-196.608q92.16 0 172.032-27.648t134.144-71.68 98.304-97.28 70.656-106.496 45.056-97.28 24.576-70.656z" horiz-adv-x="922" /> |
35 | <glyph unicode="" d="M109.568 96q0-23.040-15.872-38.912t-38.912-15.872-38.912 15.872-15.872 38.912 15.872 38.912 38.912 15.872 38.912-15.872 15.872-38.912zM256 60.672q0.512-7.68-4.608-13.312-5.632-6.144-13.824-6.144h-38.4q-7.168 0-12.288 4.608t-5.632 11.776q-6.144 65.536-52.736 112.128t-112.128 52.736q-7.168 0.512-11.776 5.632t-4.608 12.288v38.4q0 8.192 6.144 13.312 4.608 5.12 12.288 5.12h1.536q45.568-3.584 87.040-23.040t74.24-51.712q32.256-32.256 51.712-74.24t23.040-87.552zM402.432 60.16q0.512-7.68-5.12-13.312-5.12-5.632-13.312-5.632h-40.96q-7.168 0-12.8 5.12t-5.632 11.776q-3.072 61.44-28.672 116.736t-66.048 96.256-96.256 66.048-116.224 29.184q-7.168 0-12.288 5.632t-5.12 12.288v40.96q0 7.68 5.632 13.312 5.12 5.12 12.8 5.12h0.512q75.264-4.096 143.36-34.304t121.856-83.968q53.248-53.248 83.968-121.856t34.304-143.36z" horiz-adv-x="402" /> | 21 | <glyph unicode="" d="M942.080 740.864q-36.864-55.296-96.256-100.352v-24.576q0-133.12-61.44-256t-190.464-207.872-296.96-84.992q-163.84 0-296.96 86.016 14.336-2.048 47.104-2.048 135.168 0 239.616 81.92-63.488 2.048-112.64 38.912t-67.584 96.256q10.24-4.096 34.816-4.096 26.624 0 51.2 6.144-67.584 14.336-110.592 67.584t-43.008 122.88v2.048q36.864-20.48 86.016-24.576-86.016 59.392-86.016 161.792 0 49.152 26.624 96.256 157.696-192.512 399.36-200.704-6.144 18.432-6.144 43.008 0 79.872 56.32 136.192t138.24 56.32q83.968 0 139.264-59.392 61.44 12.288 122.88 45.056-20.48-67.584-83.968-106.496 57.344 8.192 110.592 30.72z" horiz-adv-x="942" /> |
36 | <glyph unicode="" d="M0 314.112l75.776 75.776 180.224-179.712 180.224 179.712 75.776-75.776-256-256-75.776 75.776z" /> | 22 | <glyph unicode="" d="M219.136 192q0-46.080-31.744-77.824t-77.824-31.744-77.824 31.744-31.744 77.824 31.744 77.824 77.824 31.744 77.824-31.744 31.744-77.824zM512 121.344q1.024-15.36-9.216-26.624-11.264-12.288-27.648-12.288h-76.8q-14.336 0-24.576 9.216t-11.264 23.552q-12.288 131.072-105.472 224.256t-224.256 105.472q-14.336 1.024-23.552 11.264t-9.216 24.576v76.8q0 16.384 12.288 26.624 9.216 10.24 24.576 10.24h3.072q91.136-7.168 174.080-46.080t148.48-103.424q64.512-64.512 103.424-148.48t46.080-175.104zM804.864 120.32q1.024-15.36-10.24-26.624-10.24-11.264-26.624-11.264h-81.92q-14.336 0-25.6 10.24t-11.264 23.552q-6.144 122.88-57.344 233.472t-132.096 192.512-192.512 132.096-232.448 58.368q-14.336 0-24.576 11.264t-10.24 24.576v81.92q0 15.36 11.264 26.624 10.24 10.24 25.6 10.24h1.024q150.528-8.192 286.72-68.608t243.712-167.936q106.496-106.496 167.936-243.712t68.608-286.72z" horiz-adv-x="804" /> |
37 | <glyph unicode="" 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" /> | 23 | <glyph unicode="" d="M0 628.224l151.552 151.552 360.448-359.424 360.448 359.424 151.552-151.552-512-512-151.552 151.552z" /> |
38 | <glyph unicode="" d="M0 133.888l256 256 256-256-75.776-75.776-180.224 179.712-180.224-179.712z" /> | 24 | <glyph unicode="" d="M951.296 100.864v438.272q-18.432-20.48-39.936-37.888-152.576-116.736-243.712-192.512-28.672-24.576-47.104-38.912t-49.152-27.648-58.368-13.312h-2.048q-26.624 0-58.368 13.312t-49.152 27.648-47.104 38.912q-90.112 75.776-243.712 192.512-21.504 17.408-39.936 37.888v-438.272q0-8.192 6.144-13.312t12.288-5.12h841.728q7.168 0 12.288 5.12t6.144 13.312zM951.296 700.928v14.336t-1.024 7.168-1.024 7.168-3.072 5.12-5.12 4.096-8.192 2.048h-841.728q-7.168 0-12.288-6.144t-6.144-12.288q0-96.256 83.968-162.816 110.592-87.040 229.376-181.248 4.096-2.048 20.48-16.384t25.6-21.504 25.6-18.432 28.672-15.36 24.576-5.12h2.048q11.264 0 24.576 5.12t28.672 15.36 25.6 18.432 25.6 21.504 20.48 16.384q118.784 94.208 229.376 181.248 30.72 24.576 57.344 66.56t26.624 74.752zM1024 722.432v-621.568q0-37.888-26.624-64.512t-64.512-27.648h-841.728q-36.864 0-64.512 27.648t-26.624 64.512v621.568q0 37.888 26.624 64.512t64.512 26.624h841.728q37.888 0 64.512-26.624t26.624-64.512z" /> |
39 | <glyph unicode="" 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" /> | 25 | <glyph unicode="" d="M0 267.776l512 512 512-512-151.552-151.552-360.448 359.424-360.448-359.424z" /> |
40 | <glyph unicode="" 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 | <glyph unicode="" d="M51.2 558.592q124.928-71.68 337.92-71.68t337.92 71.68l-55.296-497.664q-2.048-14.336-35.84-36.864t-102.4-44.032-144.384-21.504-143.36 21.504-102.4 44.032-36.864 36.864zM550.912 865.792q96.256-18.432 161.792-56.32t65.536-72.704v-10.24q0-59.392-114.688-101.376t-274.432-41.984-274.432 41.984-114.688 101.376v10.24q0 34.816 65.536 72.704t161.792 56.32l43.008 49.152q22.528 26.624 71.68 26.624h94.208q53.248 0 71.68-26.624zM495.616 751.104h86.016q-94.208 112.64-106.496 129.024-14.336 16.384-32.768 16.384h-104.448q-22.528 0-32.768-16.384l-108.544-129.024h86.016l65.536 67.584h83.968z" horiz-adv-x="778" /> |
27 | <glyph unicode="" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" /> | ||
28 | <glyph unicode="" d="M896 704v128h-896v-704c0-35.346 28.654-64 64-64h864c53.022 0 96 42.978 96 96v544h-128zM832 128h-768v640h768v-640zM128 640h640v-64h-640zM512 512h256v-64h-256zM512 384h256v-64h-256zM512 256h192v-64h-192zM128 512h320v-320h-320z" /> | ||
29 | <glyph unicode="" d="M959.884 832c0.040-0.034 0.082-0.076 0.116-0.116v-767.77c-0.034-0.040-0.076-0.082-0.116-0.116h-895.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.772c0.034 0.040 0.076 0.082 0.114 0.114h895.77zM960 896h-896c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h896c35.2 0 64 28.8 64 64v768c0 35.2-28.8 64-64 64v0zM832 672c0-53.020-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM896 128h-768v128l224 384 256-320h64l224 192z" /> | ||
30 | <glyph unicode="" d="M960 960h64v-736c0-88.366-100.29-160-224-160s-224 71.634-224 160c0 88.368 100.29 160 224 160 62.684 0 119.342-18.4 160-48.040v368.040l-512-113.778v-494.222c0-88.366-100.288-160-224-160s-224 71.634-224 160c0 88.368 100.288 160 224 160 62.684 0 119.342-18.4 160-48.040v624.040l576 128z" /> | ||
31 | <glyph unicode="" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" /> | ||
32 | <glyph unicode="" d="M864 768h-512c-88 0-160-72-160-160v-512c0-88 72-160 160-160h512c88 0 160 72 160 160v512c0 88-72 160-160 160zM416 64c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM416 448c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM608 256c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM800 64c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM800 448c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM828.76 832c-14.93 72.804-79.71 128-156.76 128h-512c-88 0-160-72-160-160v-512c0-77.046 55.196-141.83 128-156.76v636.76c0 35.2 28.8 64 64 64h636.76z" /> | ||
33 | <glyph unicode="" d="M1232 960h-384c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l476.118 476.118c18.666 18.666 33.94 55.54 33.94 81.94v384c0 26.4-21.6 48-48 48zM992 576c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM128 416l544 544h-80c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l30.058 30.058-416 416z" horiz-adv-x="1280" /> | ||
34 | <glyph unicode="" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM320 448c0 106.040 85.96 192 192 192s192-85.96 192-192-85.96-192-192-192-192 85.96-192 192zM925.98 276.524v0l-177.42 73.49c12.518 30.184 19.44 63.276 19.44 97.986s-6.922 67.802-19.44 97.986l177.42 73.49c21.908-52.822 34.020-110.73 34.020-171.476s-12.114-118.654-34.020-171.476v0zM683.478 861.98v0 0l-73.49-177.42c-30.184 12.518-63.276 19.44-97.988 19.44s-67.802-6.922-97.986-19.44l-73.49 177.422c52.822 21.904 110.732 34.018 171.476 34.018 60.746 0 118.654-12.114 171.478-34.020zM98.020 619.476l177.422-73.49c-12.518-30.184-19.442-63.276-19.442-97.986s6.922-67.802 19.44-97.986l-177.42-73.49c-21.906 52.822-34.020 110.73-34.020 171.476s12.114 118.654 34.020 171.476zM340.524 34.020l73.49 177.42c30.184-12.518 63.276-19.44 97.986-19.44s67.802 6.922 97.986 19.44l73.49-177.42c-52.822-21.904-110.73-34.020-171.476-34.020-60.744 0-118.654 12.114-171.476 34.020z" /> | ||
35 | <glyph unicode="" d="M480 960v0c265.096 0 480-173.914 480-388.448s-214.904-388.448-480-388.448c-25.458 0-50.446 1.62-74.834 4.71-103.106-102.694-222.172-121.108-341.166-123.814v25.134c64.252 31.354 116 88.466 116 153.734 0 9.106-0.712 18.048-2.030 26.794-108.558 71.214-177.97 179.988-177.97 301.89 0 214.534 214.904 388.448 480 388.448zM996 89.314c0-55.942 36.314-104.898 92-131.772v-21.542c-103.126 2.318-197.786 18.102-287.142 106.126-21.14-2.65-42.794-4.040-64.858-4.040-95.47 0-183.408 25.758-253.614 69.040 144.674 0.506 281.26 46.854 384.834 130.672 52.208 42.252 93.394 91.826 122.414 147.348 30.766 58.866 46.366 121.582 46.366 186.406 0 10.448-0.45 20.836-1.258 31.168 72.57-59.934 117.258-141.622 117.258-231.676 0-104.488-60.158-197.722-154.24-258.764-1.142-7.496-1.76-15.16-1.76-22.966z" horiz-adv-x="1152" /> | ||
36 | <glyph unicode="" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" /> | ||
37 | <glyph unicode="" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512-0.002c-62.958 0-122.872 13.012-177.23 36.452l233.148 262.29c5.206 5.858 8.082 13.422 8.082 21.26v96c0 17.674-14.326 32-32 32-112.99 0-232.204 117.462-233.374 118.626-6 6.002-14.14 9.374-22.626 9.374h-128c-17.672 0-32-14.328-32-32v-192c0-12.122 6.848-23.202 17.69-28.622l110.31-55.156v-187.886c-116.052 80.956-192 215.432-192 367.664 0 68.714 15.49 133.806 43.138 192h116.862c8.488 0 16.626 3.372 22.628 9.372l128 128c6 6.002 9.372 14.14 9.372 22.628v77.412c40.562 12.074 83.518 18.588 128 18.588 70.406 0 137.004-16.26 196.282-45.2-4.144-3.502-8.176-7.164-12.046-11.036-36.266-36.264-56.236-84.478-56.236-135.764s19.97-99.5 56.236-135.764c36.434-36.432 85.218-56.264 135.634-56.26 3.166 0 6.342 0.080 9.518 0.236 13.814-51.802 38.752-186.656-8.404-372.334-0.444-1.744-0.696-3.488-0.842-5.224-81.324-83.080-194.7-134.656-320.142-134.656z" /> | ||
38 | <glyph unicode="" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" /> | ||
41 | </font></defs></svg> \ No newline at end of file | 39 | </font></defs></svg> \ No newline at end of file |
diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf index bb1f21f8..923f56d8 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 bab13779..a2e86d36 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 dec848f2..93d2815b 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 }} »{% endtrans %}{% endif %}</div> | 28 | <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} <a href="?action=random" class="icon icon-random"><span> {% trans "random" %}</span></a></div> |
29 | {{ page_links | raw }} | 29 | {{ page_links | raw }} |
30 | </div> | 30 | </div> |
31 | {% elseif nb_results == 1 %} | 31 | {% elseif nb_results == 1 %} |
@@ -58,13 +58,24 @@ | |||
58 | </div> | 58 | </div> |
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 | 62 | ||
62 | {% if searchterm is defined %}<p><a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}"> | 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 /> |
63 | {% trans "Tag these results as" %} {{ searchterm }}</p></a>{% endif %} | 64 | |
64 | 65 | {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %} | |
65 | {% if tag %}<p><a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&method=tag&value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</p></a> | 66 | |
66 | {% elseif search_term is defined %}<p><a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&method=search&value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</p></a> | 67 | {% if tag %} |
67 | {% else %}<p><a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&method=category&value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a></p>{% endif %} | 68 | {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&method=tag&value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %} |
68 | 69 | {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&method=tag&value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %} | |
70 | {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&method=tag&value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %} | ||
71 | {% elseif searchterm is defined %} | ||
72 | {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&method=search&value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %} | ||
73 | {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&method=search&value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %} | ||
74 | {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&method=search&value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %} | ||
75 | {% else %} | ||
76 | {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&method=category&value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %} | ||
77 | {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&method=category&value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %} | ||
78 | {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&method=category&value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %} | ||
69 | {% endif %} | 79 | {% endif %} |
80 | {% endif %} | ||
70 | {% endblock %} | 81 | {% endblock %} |
diff --git a/themes/baggy/img/apple-touch-icon-114.png b/themes/baggy/img/apple-touch-icon-114.png deleted file mode 100755 index 0e96edd5..00000000 --- a/themes/baggy/img/apple-touch-icon-114.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-120.png b/themes/baggy/img/apple-touch-icon-120.png deleted file mode 100755 index dc5aab1c..00000000 --- a/themes/baggy/img/apple-touch-icon-120.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-144.png b/themes/baggy/img/apple-touch-icon-144.png deleted file mode 100755 index 1d005db6..00000000 --- a/themes/baggy/img/apple-touch-icon-144.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-152.png b/themes/baggy/img/apple-touch-icon-152.png deleted file mode 100755 index f915231f..00000000 --- a/themes/baggy/img/apple-touch-icon-152.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-57.png b/themes/baggy/img/apple-touch-icon-57.png deleted file mode 100755 index 5aa19ed9..00000000 --- a/themes/baggy/img/apple-touch-icon-57.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-72.png b/themes/baggy/img/apple-touch-icon-72.png deleted file mode 100755 index b8b48e1b..00000000 --- a/themes/baggy/img/apple-touch-icon-72.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon-76.png b/themes/baggy/img/apple-touch-icon-76.png deleted file mode 100755 index 9f9dba27..00000000 --- a/themes/baggy/img/apple-touch-icon-76.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/apple-touch-icon.png b/themes/baggy/img/apple-touch-icon.png deleted file mode 100755 index 9cf29e2b..00000000 --- a/themes/baggy/img/apple-touch-icon.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/img/favicon.ico b/themes/baggy/img/favicon.ico deleted file mode 100755 index 0346558b..00000000 --- a/themes/baggy/img/favicon.ico +++ /dev/null | |||
Binary files differ | |||
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig index 58290e9c..d941ca93 100644 --- a/themes/baggy/login.twig +++ b/themes/baggy/login.twig | |||
@@ -26,6 +26,11 @@ | |||
26 | <div class="row mts txtcenter"> | 26 | <div class="row mts txtcenter"> |
27 | <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button> | 27 | <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button> |
28 | </div> | 28 | </div> |
29 | {% if constant('ALLOW_REGISTER') == 1 %} | ||
30 | <div class="register"> | ||
31 | <a href="?registerform">{% trans "Register" %}</a> | ||
32 | </div> | ||
33 | {% endif %} | ||
29 | </fieldset> | 34 | </fieldset> |
30 | <input type="hidden" name="returnurl" value="{{ referer }}"> | 35 | <input type="hidden" name="returnurl" value="{{ referer }}"> |
31 | <input type="hidden" name="token" value="{{ token }}"> | 36 | <input type="hidden" name="token" value="{{ token }}"> |
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig new file mode 100644 index 00000000..e2c56c73 --- /dev/null +++ b/themes/baggy/register.twig | |||
@@ -0,0 +1,28 @@ | |||
1 | {% extends "layout-login.twig" %} | ||
2 | {% block content %} | ||
3 | |||
4 | <form method="post" action="?register"> | ||
5 | <h2>{% trans 'Add user' %}</h2> | ||
6 | <fieldset class="w500p"> | ||
7 | <div class="row"> | ||
8 | <label class="col w150p" for="newusername">{% trans 'Login' %}</label> | ||
9 | <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required> | ||
10 | </div> | ||
11 | <div class="row"> | ||
12 | <label class="col w150p" for="password4newuser">{% trans "Password" %}</label> | ||
13 | <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required> | ||
14 | </div> | ||
15 | <div class="row"> | ||
16 | <label class="col w150p" for="newuseremail">{% trans 'Email (not required)' %}</label> | ||
17 | <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> | ||
18 | </div> | ||
19 | <div class="row mts txtcenter"> | ||
20 | <button type="submit">{% trans "Register" %}</button> | ||
21 | </div> | ||
22 | <div class="register"> | ||
23 | <a href="?">{% trans "Back" %}</a> | ||
24 | </div> | ||
25 | </fieldset> | ||
26 | </form> | ||
27 | |||
28 | {% endblock %} \ No newline at end of file | ||
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 53a9ee69..7320057f 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig | |||
@@ -13,11 +13,17 @@ | |||
13 | <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 "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> |
14 | <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> | 14 | <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> |
15 | {% 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_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 %} |
16 | {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&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_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title }}&body={{ content|striptags|slice(0, 700) }}%2E%2E%2E%0A%0A{% trans "Read the rest at" %} {{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %} |
17 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} | 17 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} |
18 | {% 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('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool evernote icon icon-evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% endif %} |
19 | {% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %} | ||
20 | {% 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 %} | ||
21 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %} | ||
19 | {% 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 %} | 22 | {% 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 %} |
20 | <li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li> | 23 | {% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload icon icon-reload" href="./?action=reload_article&id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %} |
24 | {% if constant('EPUB') == 1 %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} | ||
25 | {% if constant('MOBI') == 1 %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | ||
26 | {% if constant('PDF') == 1 %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} | ||
21 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&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> | 27 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&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> |
22 | </ul> | 28 | </ul> |
23 | </div> | 29 | </div> |
@@ -32,7 +38,7 @@ | |||
32 | {{ content | raw }} | 38 | {{ content | raw }} |
33 | </article> | 39 | </article> |
34 | </div> | 40 | </div> |
35 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> | 41 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> |
36 | <script type="text/javascript"> | 42 | <script type="text/javascript"> |
37 | $(document).ready(function() { | 43 | $(document).ready(function() { |
38 | 44 | ||