aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-02-21 13:44:30 +0100
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>2014-02-21 13:44:30 +0100
commite7345a2c4feaa64c8582844425f388e57f1f933d (patch)
tree5f2b7fa7917186052519193542f126692031d095 /themes/baggy
parent3ade95a3d79d356ff4979eeaa6cf1fe3c6da1794 (diff)
parent032e0ca13ab8ebf99b5169f6f733db4184cdde6c (diff)
downloadwallabag-e7345a2c4feaa64c8582844425f388e57f1f933d.tar.gz
wallabag-e7345a2c4feaa64c8582844425f388e57f1f933d.tar.zst
wallabag-e7345a2c4feaa64c8582844425f388e57f1f933d.zip
Merge branch 'dev' of git://github.com/mariroz/wallabag into dev
Diffstat (limited to 'themes/baggy')
-rw-r--r--themes/baggy/_menu.twig5
-rwxr-xr-xthemes/baggy/css/main.css5
-rw-r--r--themes/baggy/edit-tags.twig7
-rw-r--r--themes/baggy/home.twig5
-rw-r--r--themes/baggy/tag.twig34
5 files changed, 16 insertions, 40 deletions
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/css/main.css b/themes/baggy/css/main.css
index 45211a87..3b8220d9 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -563,7 +563,8 @@ footer a {
563 ========================================================================== */ 563 ========================================================================== */
564 564
565.messages { 565.messages {
566 text-align: center; 566 text-align: left;
567 margin-top: 1em;
567} 568}
568 569
569.messages > * { display: inline-block;} 570.messages > * { display: inline-block;}
@@ -818,4 +819,4 @@ blockquote {
818 #article_toolbar a { 819 #article_toolbar a {
819 padding: 0.3em 0.4em 0.2em; 820 padding: 0.3em 0.4em 0.2em;
820 } 821 }
821} \ No newline at end of file 822}
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/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/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