diff options
author | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-03-10 16:28:47 +0200 |
---|---|---|
committer | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-03-10 16:28:47 +0200 |
commit | fb26cc9375ce9ef8df748eb473eb6e58884421c6 (patch) | |
tree | 3b1ac9bf4b1eb95c4ca91c02b447350516b8ad84 /themes/baggy | |
parent | 17b2afefad1947042cc9fbbb841c3a023d00d96d (diff) | |
download | wallabag-fb26cc9375ce9ef8df748eb473eb6e58884421c6.tar.gz wallabag-fb26cc9375ce9ef8df748eb473eb6e58884421c6.tar.zst wallabag-fb26cc9375ce9ef8df748eb473eb6e58884421c6.zip |
a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542
Diffstat (limited to 'themes/baggy')
-rwxr-xr-x[-rw-r--r--] | themes/baggy/edit-tags.twig | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | themes/baggy/tags.twig | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 9e9012ee..65ac996a 100644..100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig | |||
@@ -4,6 +4,11 @@ | |||
4 | {% include '_menu.twig' %} | 4 | {% include '_menu.twig' %} |
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | |||
8 | <script src="{{ poche_url }}/themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> | ||
9 | <script src="{{ poche_url }}/themes/default/js/autoCompleteTags.js"></script> | ||
10 | <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> | ||
11 | |||
7 | <div id="article"> | 12 | <div id="article"> |
8 | <h2>{{ entry.title|raw }}</21> | 13 | <h2>{{ entry.title|raw }}</21> |
9 | </div> | 14 | </div> |
@@ -17,7 +22,8 @@ | |||
17 | <input type="hidden" name="entry_id" value="{{ entry_id }}" /> | 22 | <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" /> | 23 | <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" /> |
19 | <input type="submit" value="Tag" /> | 24 | <input type="submit" value="Tag" /> |
20 | <p>{% trans "You can enter multiple tags, separated by commas." %}</p> | 25 | <p>{% trans "Start typing for auto complete." %}<br> |
26 | {% trans "You can enter multiple tags, separated by commas." %}</p> | ||
21 | </form> | 27 | </form> |
22 | <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a> | 28 | <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a> |
23 | {% endblock %} | 29 | {% endblock %} |
diff --git a/themes/baggy/tags.twig b/themes/baggy/tags.twig index 9df44bb7..9bb93a45 100644..100755 --- a/themes/baggy/tags.twig +++ b/themes/baggy/tags.twig | |||
@@ -6,7 +6,7 @@ | |||
6 | {% block content %} | 6 | {% block content %} |
7 | <h2>{% trans "Tags" %}</h2> | 7 | <h2>{% trans "Tags" %}</h2> |
8 | <ul class="list-tags"> | 8 | <ul class="list-tags"> |
9 | {% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> | 9 | {% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&type=tag&user_id={{ user_id }}&tag_id={{ tag.id }}&token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }}) |
10 | </li> | 10 | </li> |
11 | {% endfor %} | 11 | {% endfor %} |
12 | </ul> | 12 | </ul> |