aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-10-27 20:58:13 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-10-27 20:58:13 +0100
commitb40cd4e73f3befb00d0798cf0960557479f99b17 (patch)
tree513488c70cd1780d9a7432bbfbb2b9df10efe69a /themes/baggy
parent24479b479d6a9fc406c92def1f7609fbfa142bcd (diff)
parent1b6e21d7a657c87a48efe02a1191d06682c64829 (diff)
downloadwallabag-b40cd4e73f3befb00d0798cf0960557479f99b17.tar.gz
wallabag-b40cd4e73f3befb00d0798cf0960557479f99b17.tar.zst
wallabag-b40cd4e73f3befb00d0798cf0960557479f99b17.zip
Merge pull request #889 from wallabag/fix#871
Fix#871
Diffstat (limited to 'themes/baggy')
-rwxr-xr-xthemes/baggy/css/main.css1
-rwxr-xr-xthemes/baggy/edit-tags.twig4
-rwxr-xr-xthemes/baggy/home.twig5
3 files changed, 6 insertions, 4 deletions
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 7adde2fa..558fb208 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -92,6 +92,7 @@ form fieldset {
92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { 92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
93 border: 1px solid #999; 93 border: 1px solid #999;
94 padding: 0.5em 1em; 94 padding: 0.5em 1em;
95 margin-left: 5px;
95 min-width: 12em; 96 min-width: 12em;
96 color: #666; 97 color: #666;
97} 98}
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 2113e964..d7c15033 100755
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -13,14 +13,14 @@
13 <h2>{{ entry.title|raw }}</21> 13 <h2>{{ entry.title|raw }}</21>
14</div> 14</div>
15{% if tags is empty %} 15{% if tags is empty %}
16<div class="notags">no tags</div> 16<div class="notags">{% trans "no tags" %}</div>
17{% endif %} 17{% endif %}
18<ul> 18<ul>
19{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 19{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
20</ul> 20</ul>
21<form method="post" action="./?action=add_tag"> 21<form method="post" action="./?action=add_tag">
22 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 22 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
23 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" /> 23 <label for="value">{% trans "Add tags:" %}</label><input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
24 <input type="submit" value="Tag" /> 24 <input type="submit" value="Tag" />
25 <p>{% trans "Start typing for auto complete." %}<br> 25 <p>{% trans "Start typing for auto complete." %}<br>
26 {% trans "You can enter multiple tags, separated by commas." %}</p> 26 {% trans "You can enter multiple tags, separated by commas." %}</p>
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index e788b588..a870fc21 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -57,9 +57,10 @@
57 {% endfor %} 57 {% endfor %}
58 </div> 58 </div>
59 {{ block('pager') }} 59 {{ block('pager') }}
60 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %} 60 {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% endif %}{% endif %}
61 61
62 {% if search_term is defined %}<a title="{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}</a>{% endif %} 62 {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
63{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
63 64
64 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> 65 {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
65 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> 66 {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>