aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-01-07 04:20:23 -0800
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-01-07 04:20:23 -0800
commitb4b22940dfbb8b56422e244272d22b7741e6ce7c (patch)
tree4ab486d3f7dc77a3fab521faff8e72da8dd3de0b /themes
parent60fc4f4b1ab37fbfe9021f3fa1395d66a4424ed2 (diff)
parente1cf0fda27df031e478e55d6df08823d42fe2220 (diff)
downloadwallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.gz
wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.zst
wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.zip
Merge pull request #387 from inthepoche/dev1.3.1
poche 1.3.1
Diffstat (limited to 'themes')
-rw-r--r--themes/README.md2
-rw-r--r--themes/default/_top.twig2
-rw-r--r--themes/default/config.twig22
-rw-r--r--themes/default/css/print.css4
-rw-r--r--themes/default/edit-tags.twig10
-rw-r--r--themes/default/img/apple-touch-icon-144x144-precomposed.pngbin7349 -> 2361 bytes
-rw-r--r--themes/default/img/apple-touch-icon-72x72-precomposed.pngbin6168 -> 1375 bytes
-rw-r--r--themes/default/img/apple-touch-icon.pngbin5803 -> 1174 bytes
-rw-r--r--themes/default/img/logo.pngbin1350 -> 0 bytes
-rw-r--r--themes/default/img/logo.svg8
10 files changed, 30 insertions, 18 deletions
diff --git a/themes/README.md b/themes/README.md
index 9e5d6560..b5d925b4 100644
--- a/themes/README.md
+++ b/themes/README.md
@@ -24,7 +24,7 @@ That's all !
24 24
25## create a theme 25## create a theme
26 26
27Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme 27Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
28 28
29## send a theme 29## send a theme
30 30
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
index b5f65028..083be152 100644
--- a/themes/default/_top.twig
+++ b/themes/default/_top.twig
@@ -1,6 +1,6 @@
1 <header class="w600p center mbm"> 1 <header class="w600p center mbm">
2 <h1> 2 <h1>
3 {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.png" alt="logo poche" />{% endblock %} 3 {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="logo poche" />{% endblock %}
4 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a> 4 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
5 {% endif %} 5 {% endif %}
6 </h1> 6 </h1>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index c01556ba..10df726e 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -6,11 +6,11 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Poching links" %}</h2> 8 <h2>{% trans "Poching links" %}</h2>
9 <p>{% trans "There are several ways to poche a link::" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
12 <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li> 12 <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
13 <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li> 13 <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
14 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li> 14 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
15 <li> 15 <li>
16 <form method="get" action="index.php"> 16 <form method="get" action="index.php">
@@ -31,12 +31,12 @@
31 31
32 <h2>{% trans "Feeds" %}</h2> 32 <h2>{% trans "Feeds" %}</h2>
33 {% if token == '' %} 33 {% if token == '' %}
34 <p>{% trans "The token is empty, you have to generate it to use feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p> 34 <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
35 {% else %} 35 {% else %}
36 <ul> 36 <ul>
37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li> 37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li> 38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li> 39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
40 </ul> 40 </ul>
41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
42 {% endif %} 42 {% endif %}
@@ -101,12 +101,12 @@
101 {% endif %} 101 {% endif %}
102 102
103 <h2>{% trans "Import" %}</h2> 103 <h2>{% trans "Import" %}</h2>
104 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 104 <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/">inthepoche.com</a></p> 105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
106 <ul> 106 <ul>
107 <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li> 107 <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
108 <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li> 108 <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
109 <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li> 109 <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
110 </ul> 110 </ul>
111 111
112 <h2>{% trans "Export your poche data" %}</h2> 112 <h2>{% trans "Export your poche data" %}</h2>
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 99c00bdf..625478e1 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -33,6 +33,10 @@ article {
33 border: none !important; 33 border: none !important;
34} 34}
35 35
36pre code {
37 line-height: 1.6em;
38}
39
36/* Add URL after links */ 40/* Add URL after links */
37.vieworiginal a:after { 41.vieworiginal a:after {
38 content: " (" attr(href) ")"; 42 content: " (" attr(href) ")";
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 7116bba9..53852d39 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -11,10 +11,10 @@ no tags
11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
12</ul> 12</ul>
13<form method="post" action="./?action=add_tag"> 13<form method="post" action="./?action=add_tag">
14 <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" /> 14 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
15 <p>{% trans "you can type several tags, separated by comma" %}</p> 15 <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
16 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 16 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
17 <input type="submit" value="add tags" /> 17 <input type="submit" value="Tag" />
18</form> 18</form>
19<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a> 19<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
20{% endblock %} \ No newline at end of file 20{% endblock %}
diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png
index 557b479c..9e951230 100644
--- a/themes/default/img/apple-touch-icon-144x144-precomposed.png
+++ b/themes/default/img/apple-touch-icon-144x144-precomposed.png
Binary files differ
diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png
index e167d3a4..263419b1 100644
--- a/themes/default/img/apple-touch-icon-72x72-precomposed.png
+++ b/themes/default/img/apple-touch-icon-72x72-precomposed.png
Binary files differ
diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png
index 4d222fba..ac8a1cf0 100644
--- a/themes/default/img/apple-touch-icon.png
+++ b/themes/default/img/apple-touch-icon.png
Binary files differ
diff --git a/themes/default/img/logo.png b/themes/default/img/logo.png
deleted file mode 100644
index 5305c77d..00000000
--- a/themes/default/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/themes/default/img/logo.svg b/themes/default/img/logo.svg
new file mode 100644
index 00000000..865da440
--- /dev/null
+++ b/themes/default/img/logo.svg
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
3 <circle cx="32" cy="32" r="29.5" style="fill:#000" />
4 <path d="m 16,18 33,0 0,26 -16.5,6 -16.5,-6 z" fill="#fff" />
5 <rect width="9" height="2.5" x="17.5" y="24.5" fill="#000" />
6 <rect width="9" height="2.5" x="28" y="24.5" fill="#000" />
7 <rect width="9" height="2.5" x="38.5" y="24.5" fill="#000" />
8</svg>