aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-02-21 15:57:10 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-02-21 15:57:10 +0100
commit99679d06884120c57f43b44e55e03595f1f87bed (patch)
treea3f2a1aa1afdaeca1386d0c6e8a75344fd2241fb /themes/baggy
parent655214ab30ee84884dc408488b85586f36263fcb (diff)
parentd3b47e94705e17b3ba3529cbb1dc6efe69c5d2b7 (diff)
downloadwallabag-99679d06884120c57f43b44e55e03595f1f87bed.tar.gz
wallabag-99679d06884120c57f43b44e55e03595f1f87bed.tar.zst
wallabag-99679d06884120c57f43b44e55e03595f1f87bed.zip
Merge pull request #481 from wallabag/dev1.5.2
1.5.2
Diffstat (limited to 'themes/baggy')
-rw-r--r--themes/baggy/_head.twig3
-rw-r--r--themes/baggy/_menu.twig5
-rw-r--r--themes/baggy/config.twig6
-rwxr-xr-xthemes/baggy/css/font.css6
-rwxr-xr-xthemes/baggy/css/main.css16
-rwxr-xr-xthemes/baggy/css/messages.css8
-rw-r--r--themes/baggy/edit-tags.twig7
-rwxr-xr-xthemes/baggy/fonts/icomoon.eot (renamed from themes/baggy/font/icomoon.eot)bin3724 -> 3724 bytes
-rwxr-xr-xthemes/baggy/fonts/icomoon.svg (renamed from themes/baggy/font/icomoon.svg)0
-rwxr-xr-xthemes/baggy/fonts/icomoon.ttf (renamed from themes/baggy/font/icomoon.ttf)bin3560 -> 3560 bytes
-rwxr-xr-xthemes/baggy/fonts/icomoon.woff (renamed from themes/baggy/font/icomoon.woff)bin3528 -> 3528 bytes
-rw-r--r--themes/baggy/fonts/ptsans.woffbin0 -> 24816 bytes
-rw-r--r--themes/baggy/home.twig5
-rw-r--r--themes/baggy/login.twig2
-rw-r--r--themes/baggy/tag.twig34
15 files changed, 37 insertions, 55 deletions
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> 2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> 3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png"> 4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
5 <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
6 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all"> 5 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all"> 6 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all"> 7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
10 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
11 <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
12 <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script> 11 <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
13 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script> \ No newline at end of file 12 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig
index 3e7a2cbf..e9cd9d4a 100644
--- a/themes/baggy/_menu.twig
+++ b/themes/baggy/_menu.twig
@@ -4,6 +4,9 @@
4 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li> 4 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
5 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li> 5 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
6 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li> 6 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
7 <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a></li>
7 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li> 8 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
8 <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li> 9 <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
9 </ul> \ No newline at end of file 10 </ul>
11
12 {% include '_pocheit-form.twig' %}
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 598409b9..b37ac115 100644
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -14,8 +14,8 @@
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">
17 <label class="addurl" for="plainurl">{% trans "By filling this field" %}:</label> 17 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
18 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 18 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
19 <input type="submit" value="{% trans "bag it!" %}" /> 19 <input type="submit" value="{% trans "bag it!" %}" />
20 </form> 20 </form>
21 </li> 21 </li>
@@ -69,7 +69,7 @@
69 <label class="col w150p" for="language">{% trans "Language:" %}</label> 69 <label class="col w150p" for="language">{% trans "Language:" %}</label>
70 <select class="col" id="language" name="language"> 70 <select class="col" id="language" name="language">
71 {% for language in languages %} 71 {% for language in languages %}
72 <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option> 72 <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
73 {% endfor %} 73 {% endfor %}
74 </select> 74 </select>
75 </div> 75 </div>
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
1@font-face {
2 font-family: 'PT Sans';
3 font-style: normal;
4 font-weight: 700;
5 src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
6}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 45211a87..3e128b08 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -254,6 +254,7 @@ footer {
254 color: #999; 254 color: #999;
255 font-size: 0.8em; 255 font-size: 0.8em;
256 font-style: italic; 256 font-style: italic;
257 z-index: 20;
257} 258}
258 259
259footer a { 260footer a {
@@ -473,11 +474,11 @@ footer a {
473 474
474@font-face { 475@font-face {
475 font-family: 'icomoon'; 476 font-family: 'icomoon';
476 src:url('../font/icomoon.eot?-s0mcsx'); 477 src:url('../fonts/icomoon.eot?-s0mcsx');
477 src:url('../font/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), 478 src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
478 url('../font/icomoon.woff?-s0mcsx') format('woff'), 479 url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
479 url('../font/icomoon.ttf?-s0mcsx') format('truetype'), 480 url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
480 url('../font/icomoon.svg?-s0mcsx#icomoon') format('svg'); 481 url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
481 font-weight: normal; 482 font-weight: normal;
482 font-style: normal; 483 font-style: normal;
483} 484}
@@ -563,7 +564,8 @@ footer a {
563 ========================================================================== */ 564 ========================================================================== */
564 565
565.messages { 566.messages {
566 text-align: center; 567 text-align: left;
568 margin-top: 1em;
567} 569}
568 570
569.messages > * { display: inline-block;} 571.messages > * { display: inline-block;}
@@ -818,4 +820,4 @@ blockquote {
818 #article_toolbar a { 820 #article_toolbar a {
819 padding: 0.3em 0.4em 0.2em; 821 padding: 0.3em 0.4em 0.2em;
820 } 822 }
821} \ No newline at end of file 823}
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 0cd89a9e..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
1.messages.error { 1.messages.error.install {
2 border: 1px solid #c42608; 2 border: 1px solid #c42608;
3 color: #c00 !important; 3 color: #c00 !important;
4 background: #fff0ef; 4 background: #fff0ef;
5 text-align: left; 5 text-align: left;
6} 6}
7 7
8.messages.notice { 8.messages.notice.install {
9 border: 1px solid #ebcd41; 9 border: 1px solid #ebcd41;
10 color: #000; 10 color: #000;
11 background: #fffcd3; 11 background: #fffcd3;
12 text-align: left; 12 text-align: left;
13} 13}
14 14
15.messages.success { 15.messages.success.install {
16 border: 1px solid #6dc70c; 16 border: 1px solid #6dc70c;
17 background: #e0fbcc; 17 background: #e0fbcc !important;
18 text-align: left; 18 text-align: left;
19} \ No newline at end of file 19} \ No newline at end of file
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 9f11a2c3..9e9012ee 100644
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -4,6 +4,9 @@
4{% include '_menu.twig' %} 4{% include '_menu.twig' %}
5{% endblock %} 5{% endblock %}
6{% block content %} 6{% block content %}
7<div id="article">
8 <h2>{{ entry.title|raw }}</21>
9</div>
7{% if tags is empty %} 10{% if tags is empty %}
8<div class="notags">no tags</div> 11<div class="notags">no tags</div>
9{% endif %} 12{% endif %}
@@ -11,10 +14,10 @@
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 %} 14{% 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> 15</ul>
13<form method="post" action="./?action=add_tag"> 16<form method="post" action="./?action=add_tag">
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 enter multiple tags, separated by commas." %}</p>
16 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 17 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
18 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
17 <input type="submit" value="Tag" /> 19 <input type="submit" value="Tag" />
20 <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
18</form> 21</form>
19<a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a> 22<a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
20{% endblock %} 23{% endblock %}
diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..02f53b36 100755
--- a/themes/baggy/font/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
Binary files differ
diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..d9c35b98 100755
--- a/themes/baggy/font/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..3860dd04 100755
--- a/themes/baggy/font/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
Binary files differ
diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..c3a91ed7 100755
--- a/themes/baggy/font/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
Binary files differ
diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/fonts/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
--- /dev/null
+++ b/themes/baggy/fonts/ptsans.woff
Binary files differ
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 33afdbbd..4f9db063 100644
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -12,6 +12,9 @@
12{% include '_menu.twig' %} 12{% include '_menu.twig' %}
13{% endblock %} 13{% endblock %}
14{% block content %} 14{% block content %}
15 {% if tag %}
16 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
17 {% endif %}
15 {% if entries is empty %} 18 {% if entries is empty %}
16 <div class="messages warning"><p>{% trans "No articles found." %}</p></div> 19 <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
17 {% else %} 20 {% else %}
@@ -40,7 +43,7 @@
40 </ul> 43 </ul>
41 <p>{{ entry.content|striptags|slice(0, 300) }}...</p> 44 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
42 </div> 45 </div>
43 46
44 {% endfor %} 47 {% endfor %}
45 </div> 48 </div>
46 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %} 49 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index e4751a41..645db376 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -24,7 +24,7 @@
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="row mts txtcenter"> 26 <div class="row mts txtcenter">
27 <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button> 27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
28 </div> 28 </div>
29 </fieldset> 29 </fieldset>
30 <input type="hidden" name="returnurl" value="{{ referer }}"> 30 <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/themes/baggy/tag.twig b/themes/baggy/tag.twig
deleted file mode 100644
index 141ac909..00000000
--- a/themes/baggy/tag.twig
+++ /dev/null
@@ -1,34 +0,0 @@
1{% extends "layout.twig" %}
2{% block title %}tag {% endblock %}
3{% block menu %}
4{% include '_menu.twig' %}
5{% endblock %}
6{% block content %}
7 <h3>{% trans "Tag" %} {{ tag.value }}</h3>
8 {% if entries is empty %}
9 <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
10 {% else %}
11 {% block pager %}
12 {% if nb_results > 1 %}
13 <div class="results">
14 <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
15 {{ page_links | raw }}
16 </div>
17 {% endif %}
18 {% endblock %}
19 <div class="list-entries">
20 {% for entry in entries %}
21 <div id="entry-{{ entry.id|e }}" class="entrie">
22 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
23 <ul class="tools links">
24 <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
25 <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
26 <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
27 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
28 </ul>
29 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
30 </div>
31 {% endfor %}
32 </div>
33 {% endif %}
34{% endblock %} \ No newline at end of file