aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/_head.twig3
-rw-r--r--tpl/config.twig25
-rw-r--r--tpl/css/print.css19
-rw-r--r--tpl/css/style-light.css4
-rw-r--r--tpl/css/style.css160
-rw-r--r--tpl/error.twig5
-rw-r--r--tpl/home.twig16
-rw-r--r--tpl/img/light/shaarli.pngbin0 -> 729 bytes
-rw-r--r--tpl/layout.twig10
-rw-r--r--tpl/login.twig2
-rw-r--r--tpl/view.twig38
11 files changed, 161 insertions, 121 deletions
diff --git a/tpl/_head.twig b/tpl/_head.twig
index 60ef8883..cab317a8 100644
--- a/tpl/_head.twig
+++ b/tpl/_head.twig
@@ -6,6 +6,7 @@
6 <link rel="stylesheet" href="./tpl/css/style.css" media="all"> 6 <link rel="stylesheet" href="./tpl/css/style.css" media="all">
7 <link rel="stylesheet" href="./tpl/css/style-{{ constant('THEME') }}.css" media="all" title="{{ constant('THEME') }} theme"> 7 <link rel="stylesheet" href="./tpl/css/style-{{ constant('THEME') }}.css" media="all" title="{{ constant('THEME') }} theme">
8 <link rel="stylesheet" href="./tpl/css/messages.css" media="all"> 8 <link rel="stylesheet" href="./tpl/css/messages.css" media="all">
9 <link rel="stylesheet" href="./tpl/css/print.css" media="print">
9 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> 10 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
10 <script src="./tpl/js/jquery-2.0.3.min.js"></script> 11 <script src="./tpl/js/jquery-2.0.3.min.js"></script>
11 <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(".top_link").css({position:"fixed",right:"15px",bottom:"15px",display:"none",padding:"20px",background:"#ccc","-moz-border-radius":"40px","-webkit-border-radius":"40px","border-radius":"40px",opacity:"0.9","z-index":"2000"});$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script> \ No newline at end of file 12 <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script> \ No newline at end of file
diff --git a/tpl/config.twig b/tpl/config.twig
index 5324cda7..c838c319 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -11,18 +11,21 @@
11 </ul> 11 </ul>
12{% endblock %} 12{% endblock %}
13{% block content %} 13{% block content %}
14 <h2>{% trans "Bookmarklet" %}</h2> 14 <h2>{% trans "Poching a link" %}</h2>
15 <p>{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a>.</p> 15 <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p>
16 <p>{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}</p> 16 <ul>
17 <p class="txtcenter"><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></p> 17 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
18 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
19 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
20 <li>bookmarklet: drag & drop this link to your bookmarks bar <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
21 </ul>
18 22
19 <h2>{% trans "Updating poche" %}</h2> 23 <h2>{% trans "Updating poche" %}</h2>
20 <p><ul> 24 <ul>
21 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li> 25 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
22 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li> 26 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
23 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %} 27 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
24 </ul> 28 </ul>
25 </p>
26 29
27 <h2>{% trans "Change your password" %}</h2> 30 <h2>{% trans "Change your password" %}</h2>
28 <form method="post" action="?config" name="loginform"> 31 <form method="post" action="?config" name="loginform">
@@ -46,11 +49,11 @@
46 <h2>{% trans "Import" %}</h2> 49 <h2>{% trans "Import" %}</h2>
47 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 50 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
48 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p> 51 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
49 <p><ul> 52 <ul>
50 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li> 53 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ constant('IMPORT_POCKET_FILE')}}" file on your server)</li>
51 <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li> 54 <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "{{constant('IMPORT_READABILITY_FILE')}}" file on your server)</li>
52 <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li> 55 <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "{{constant('IMPORT_INSTAPAPER_FILE')}}" file on your server)</li>
53 </ul></p> 56 </ul>
54 57
55 <h2>{% trans "Export your poche datas" %}</h2> 58 <h2>{% trans "Export your poche datas" %}</h2>
56 <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p> 59 <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
diff --git a/tpl/css/print.css b/tpl/css/print.css
new file mode 100644
index 00000000..a3b0a599
--- /dev/null
+++ b/tpl/css/print.css
@@ -0,0 +1,19 @@
1body > header,
2body > footer,
3a.top_link,
4div.tools,
5header div
6{
7 display: none !important;
8}
9
10article
11{
12 border: none !important;
13}
14
15div.vieworiginal a::after
16{
17 margin-left: 5px;
18 content: "("attr(href)")";
19}
diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css
index 9ea7955a..e2788a1c 100644
--- a/tpl/css/style-light.css
+++ b/tpl/css/style-light.css
@@ -44,6 +44,10 @@ a.twitter span {
44 background: url('../img/light/twitter.png') no-repeat; 44 background: url('../img/light/twitter.png') no-repeat;
45} 45}
46 46
47a.shaarli span {
48 background: url('../img/light/shaarli.png') no-repeat;
49}
50
47a.email span { 51a.email span {
48 background: url('../img/light/envelop.png') no-repeat; 52 background: url('../img/light/envelop.png') no-repeat;
49} 53}
diff --git a/tpl/css/style.css b/tpl/css/style.css
index e2a512f7..7633534c 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -1,7 +1,8 @@
1body { 1body {
2 font-size: 16px; 2 font-size: 16px;
3 font-family: 'Roboto', sans-serif; 3 font-family: 'Roboto', Verdana, Geneva, sans-serif;
4 margin: 10px; 4 margin: 10px;
5 color: #000;
5} 6}
6 7
7header { 8header {
@@ -12,52 +13,67 @@ header h1 {
12 font-size: 1.3em; 13 font-size: 1.3em;
13} 14}
14 15
16a, a:hover, a:visited {
17 color: #000;
18}
19
15.bouton { 20.bouton {
16 border-radius: 2px; 21 background-color: #000;
22 color: #fff;
23 border: none;
24 border-radius: 2px;
25}
26.bouton:hover {
27 background-color: #222;
28 color: #f1f1f1;
29 cursor: pointer;
17} 30}
18 31
19#main { 32#main {
20 margin: 0 auto; 33 margin: 0 auto;
21} 34}
22 35
23#main ul#links { 36#main #links {
24 padding: 0; 37 padding: 0;
25 list-style-type: none; 38 list-style-type: none;
26 text-align: center; 39 text-align: center;
27 font-size: 0.9em; 40 font-size: 0.9em;
28} 41}
29 42
30#main ul#links li { 43#main #links li {
31 display: inline; 44 display: inline;
32} 45}
33 46
34#main ul#links li a.current { 47#main #links li .current {
48 background-color: #000;
49 color: #fff;
35 -webkit-border-radius: 2px; 50 -webkit-border-radius: 2px;
36 border-radius: 2px; 51 border-radius: 2px;
37} 52}
38 53
39#main ul#sort { 54#main #sort {
40 padding: 0; 55 padding: 0;
41 list-style-type: none; 56 list-style-type: none;
42 text-align: center; 57 text-align: center;
43 opacity: 0.5; 58 opacity: 0.5;
44} 59}
45 60
46#main ul#sort li { 61#main #sort li {
47 display: inline; 62 display: inline;
48 font-size: 0.9em; 63 font-size: 0.9em;
49} 64}
50 65
51#main ul#sort img:hover { 66#main #sort img:hover {
52 cursor: pointer; 67 cursor: pointer;
53} 68}
54 69
55 70#links a {
56#links a{
57 text-decoration: none; 71 text-decoration: none;
58 padding: 5px 10px; 72 padding: 5px 10px;
59} 73}
60#links a:hover{ 74#links a:hover {
75 background-color: #040707;
76 color: #F1F1F1;
61 -webkit-border-radius: 2px; 77 -webkit-border-radius: 2px;
62 border-radius: 2px; 78 border-radius: 2px;
63} 79}
@@ -65,7 +81,7 @@ header h1 {
65/*** ***/ 81/*** ***/
66/*** LINKS DISPLAY ***/ 82/*** LINKS DISPLAY ***/
67 83
68#main a.tool { 84#main .tool {
69 text-decoration: none; 85 text-decoration: none;
70 cursor: pointer; 86 cursor: pointer;
71} 87}
@@ -80,17 +96,23 @@ header h1 {
80} 96}
81 97
82#main #content .entrie { 98#main #content .entrie {
83 border-bottom: 1px dashed #222222; 99 border-bottom: 1px dashed #222;
84} 100}
85 101
86#main .entrie ul.tools { 102#main .entrie .tools {
87 list-style-type: none; 103 list-style-type: none;
88} 104}
89 105
90#main .entrie ul.tools li { 106#main .entrie .tools + p {
91 /*display: inline;*/ 107 min-height: 5.5em;
92} 108}
93 109
110/*
111#main .entrie .tools li {
112 display: inline;
113}
114*/
115
94.tools { 116.tools {
95 float: right; 117 float: right;
96 text-align: right; 118 text-align: right;
@@ -98,7 +120,8 @@ header h1 {
98} 120}
99 121
100.tools p { 122.tools p {
101 font-size: 0.8em;} 123 font-size: 0.8em;
124}
102 125
103/* 126/*
104.tools ul { 127.tools ul {
@@ -110,22 +133,32 @@ header h1 {
110 line-height: 20px; 133 line-height: 20px;
111} 134}
112 135
113.tools a.tool { 136.tools .tool {
114 cursor: pointer; 137 cursor: pointer;
115}*/ 138}*/
116 139
117#main .entrie .tools a.tool span, #article .tools a.tool span { 140#main .entrie .tools .tool span, #article .tools .tool span {
118 display: inline-block; 141 display: inline-block;
119 width: 16px; 142 width: 16px;
120 height: 16px; 143 height: 16px;
144 /* Hide textual content */
145 text-indent: -9999px;
146 text-align: left;
147 overflow: hidden;
121} 148}
122 149
150
123/*** ***/ 151/*** ***/
124/*** ARTICLE PAGE ***/ 152/*** ARTICLE PAGE ***/
125 153
126#article { 154#article {
127 margin: 0 auto; 155 margin: 0 auto;
128} 156}
157
158#article header, #article article {
159 border-bottom: 1px solid #222;
160}
161
129#article header { 162#article header {
130 text-align: left; 163 text-align: left;
131} 164}
@@ -136,7 +169,7 @@ header h1 {
136 169
137.vieworiginal a, .vieworiginal a:hover, .vieworiginal a:visited { 170.vieworiginal a, .vieworiginal a:hover, .vieworiginal a:visited {
138 text-decoration: none; 171 text-decoration: none;
139 color: #888888; 172 color: #888;
140} 173}
141 174
142.backhome { 175.backhome {
@@ -146,54 +179,16 @@ header h1 {
146#article .tools { 179#article .tools {
147 position: relative; 180 position: relative;
148 display: inline; 181 display: inline;
149 top: 0px; 182 top: 0;
150 right: 0px; 183 right: 0;
151 width: 100%; 184 width: 100%;
152} 185}
153 186
154#article .tools ul li{ 187#article .tools ul li {
155 display: inline; 188 display: inline;
156} 189}
157 190
158 191
159/*** GENERAL ***/
160body {
161 color: #000;
162}
163
164a, a:hover, a:visited {
165 color: #000;
166}
167
168.bouton {
169 background-color: #000;
170 color: #fff;
171 border: none;
172}
173.bouton:hover {
174 background-color: #222222;
175 color: #F1F1F1;
176}
177
178#main ul#links li a.current {
179 background-color: #000;
180 color: #fff;
181}
182
183#links a:hover{
184 background-color: #040707;
185 color: #F1F1F1;
186}
187
188
189/*** ***/
190/*** ARTICLE PAGE ***/
191
192#article header, #article article {
193 border-bottom: 1px solid #222222;
194}
195
196
197/* Pagination */ 192/* Pagination */
198.pagination { 193.pagination {
199 clear: both; 194 clear: both;
@@ -202,42 +197,63 @@ a, a:hover, a:visited {
202 text-align: right; 197 text-align: right;
203} 198}
204.pagination a { 199.pagination a {
205 border: 1px solid #D5D5D5; 200 border: 1px solid #d5d5d5;
206 color: #333; 201 color: #333;
207 font-size: 11px; 202 font-size: 11px;
208 font-weight: bold; 203 font-weight: bold;
209 height: 25px; 204 height: 25px;
210 padding: 4px 8px; 205 padding: 4px 8px;
211 text-decoration: none; 206 text-decoration: none;
212 margin:2px; 207 margin: 2px;
213} 208}
214.pagination a:hover, .pagination a:active { 209.pagination a:hover, .pagination a:active {
215 background:#efefef; 210 background-color: #efefef;
216} 211}
217.pagination span.current { 212.pagination .current {
218 background-color: #ccc; 213 background-color: #ccc;
219 border: 1px solid #D5D5D5; 214 border: 1px solid #d5d5d5;
220 color: #000; 215 color: #000;
221 font-size: 11px; 216 font-size: 11px;
222 font-weight: bold; 217 font-weight: bold;
223 height: 25px; 218 height: 25px;
224 padding: 4px 8px; 219 padding: 4px 8px;
225 text-decoration: none; 220 text-decoration: none;
226 margin:2px; 221 margin: 2px;
227} 222}
228.pagination span.disabled { 223.pagination .disabled {
229 border: 1px solid #EEEEEE; 224 border: 1px solid #eee;
230 color: #DDDDDD; 225 color: #ddd;
231 margin:2px; 226 margin: 2px;
232 padding: 4px 8px; 227 padding: 4px 8px;
233 font-size: 11px; 228 font-size: 11px;
234 font-weight: bold; 229 font-weight: bold;
235} 230}
236 231
232#bookmarklet {
233 padding: 5px;
234 border: 1px dashed #808080;
235 background: #fff;
236 cursor: move;
237}
238
239.top_link {
240 position: fixed;
241 right: 15px;
242 bottom: 15px;
243 display: none;
244 padding: 20px;
245 background: #ccc;
246 -moz-border-radius: 40px;
247 -webkit-border-radius: 40px;
248 border-radius: 40px;
249 opacity: 0.9;
250 z-index: 2000;
251}
252
237footer { 253footer {
238 clear: both; 254 clear: both;
239} 255}
240 256
241.reading-time { 257.reading-time {
242 font-size: 0.8em; 258 font-size: 0.8em;
243} \ No newline at end of file 259}
diff --git a/tpl/error.twig b/tpl/error.twig
index 84c3bc1c..14c49925 100644
--- a/tpl/error.twig
+++ b/tpl/error.twig
@@ -1,7 +1,6 @@
1{% extends "layout.twig" %} 1{% extends "layout.twig" %}
2{% block title %}{% trans "error" %}{% endblock %} 2{% block title %}{% trans "plop" %}{% endblock %}
3{% block content %} 3{% block content %}
4 <h1>error</h1> 4 {{ msg|raw }}
5 <p>{{ msg|raw }}</p>
6 <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p> 5 <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p>
7{% endblock %} \ No newline at end of file 6{% endblock %} \ No newline at end of file
diff --git a/tpl/home.twig b/tpl/home.twig
index 03f9f70d..a2fa9a93 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -5,22 +5,20 @@
5{% endblock %} 5{% endblock %}
6{% block precontent %} 6{% block precontent %}
7 <ul id="sort"> 7 <ul id="sort">
8 <li><a href="./?sort=ia&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> 8 <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
9 <li><a href="./?sort=ta&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> 9 <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
10 </ul> 10 </ul>
11{% endblock %} 11{% endblock %}
12{% block content %} 12{% block content %}
13 {{ page_links | raw }} 13 {{ page_links | raw }}
14 {% for entry in entries %} 14 {% for entry in entries %}
15 <div id="entry-{{ entry.id|e }}" class="entrie"> 15 <div id="entry-{{ entry.id|e }}" class="entrie">
16 <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2> 16 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
17 <ul class="tools"> 17 <ul class="tools">
18 <li> 18 <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
19 <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li> 19 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
20 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li> 20 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
21 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li> 21 <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
22 <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
23 </li>
24 </ul> 22 </ul>
25 <p>{{ entry.content|striptags|slice(0, 300) }}...</p> 23 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
26 <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p> 24 <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p>
diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png
new file mode 100644
index 00000000..1eb30f60
--- /dev/null
+++ b/tpl/img/light/shaarli.png
Binary files differ
diff --git a/tpl/layout.twig b/tpl/layout.twig
index b86983da..07ca231c 100644
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
@@ -1,13 +1,15 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]--> 2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]> <html class="no-js ie7 ie67 ie678" lang="en"> <![endif]--> 3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]> <html class="no-js ie8 ie678" lang="en"> <![endif]--> 4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> 5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html> 6<html>
7 <head> 7 <head>
8 <meta name="viewport" content="initial-scale=1.0"> 8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8"> 9 <meta charset="utf-8">
10 <!--[if IE]>
10 <meta http-equiv="X-UA-Compatible" content="IE=10"> 11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
11 <title>{% block title %}{% endblock %} - poche</title> 13 <title>{% block title %}{% endblock %} - poche</title>
12{% include '_head.twig' %} 14{% include '_head.twig' %}
13{% include '_bookmarklet.twig' %} 15{% include '_bookmarklet.twig' %}
diff --git a/tpl/login.twig b/tpl/login.twig
index 0ae130bc..b24674e2 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -23,7 +23,7 @@
23 </div> 23 </div>
24 </div> 24 </div>
25 <div class="row mts txtcenter"> 25 <div class="row mts txtcenter">
26 <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button> 26 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
27 </div> 27 </div>
28 </fieldset> 28 </fieldset>
29 <input type="hidden" name="returnurl" value="{{ referer }}"> 29 <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/tpl/view.twig b/tpl/view.twig
index 2cbb9ca9..28508772 100644
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -1,21 +1,20 @@
1{% extends "layout.twig" %} 1{% extends "layout.twig" %}
2{% block title %}{% trans "home" %}{% endblock %} 2{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
3{% block content %} 3{% block content %}
4 <div id="article"> 4 <div id="article">
5 <div class="tools"> 5 <div class="tools">
6 <ul class="tools"> 6 <ul class="tools">
7 <li> 7 <li><a href="./" title="{% trans "back to home" %}" class="tool back"><span>{% trans "back to home" %}</span></a></li>
8 <li><a href="./" title="{% trans "back to home" %}" class="tool back"><span></span></a></li> 8 <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
9 <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li> 9 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
10 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li> 10 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
11 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li> 11 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span>{% trans "tweet" %}</span></a></li>{% endif %}
12 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></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@getpoche" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
13 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></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 </li>
15 </ul> 14 </ul>
16 </div> 15 </div>
17 <header class="mbm"> 16 <header class="mbm">
18 <h1>{{ entry.title|e }}</h1> 17 <h1>{{ entry.title|raw }}</h1>
19 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div> 18 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div>
20 </header> 19 </header>
21 <article> 20 <article>
@@ -24,17 +23,16 @@
24 </article> 23 </article>
25 <div class="tools"> 24 <div class="tools">
26 <ul class="tools"> 25 <ul class="tools">
27 <li> 26 <li><a href="./?" title="{% trans "back to home" %}" class="tool back"><span>{% trans "back to home" %}</span></a></li>
28 <li><a href="./?" title="{% trans "back to home" %}" class="tool back"><span></span></a></li> 27 <li><a href="#top" title="{% trans "back to top" %}" class="tool top"><span>{% trans "back to top" %}</span></a></li>
29 <li><a href="#top" title="{% trans "back to top" %}" class="tool top"><span></span></a></li> 28 <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
30 <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li> 29 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
31 <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li> 30 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
32 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li> 31 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span>{% trans "tweet" %}</span></a></li>{% endif %}
33 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></span></a></li>{% endif %} 32 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@getpoche" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
34 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></span></a></li>{% endif %} 33 {% 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 %}
35 </li>
36 </ul> 34 </ul>
37 <p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong display in poche&body={{ entry.url|e }}">{% trans "contact us by mail" %}</a></p> 35 <p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong%20display%20in%20poche&amp;body={{ entry.url|url_encode }}">{% trans "contact us by mail" %}</a></p>
38 </div> 36 </div>
39 </div> 37 </div>
40{% endblock %} \ No newline at end of file 38{% endblock %} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 03:42:59 +0000