From 68e20616663e048d47297ff251f64081b1d1fe3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 13:02:58 +0100
Subject: [add] tags displaying

---
 themes/default/css/style.css | 6 ++++++
 themes/default/view.twig     | 3 +++
 2 files changed, 9 insertions(+)

(limited to 'themes/default')

diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 670eb50f..2088ee2e 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -176,6 +176,12 @@ a:visited {
     text-decoration: none;
 }
 
+#article .tags {
+    font-size: 0.8em;
+    color: #888;
+    padding-bottom: 5px;
+}
+
 .backhome {
     display: inline;
 }
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 1e54ae38..5a7c9165 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -20,6 +20,9 @@
             <header class="mbm">
                 <h1>{{ entry.title|raw }}</h1>
             </header>
+            <aside class="tags">
+                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="#" title="{% trans "edit tags" %}">✎</a>
+            </aside>
             <article>
                 {{ content | raw }}
             </article>
-- 
cgit v1.2.3


From 2e2ebe5ec767dcbee90394d12b03298592c87805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 13:15:06 +0100
Subject: [add] create tags page

---
 themes/default/_menu.twig | 1 +
 themes/default/tags.twig  | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 themes/default/tags.twig

(limited to 'themes/default')

diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
index 699d6a0c..02bec1dc 100644
--- a/themes/default/_menu.twig
+++ b/themes/default/_menu.twig
@@ -2,6 +2,7 @@
                 <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li>
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
+                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             </ul>
\ No newline at end of file
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
new file mode 100644
index 00000000..9421fe3e
--- /dev/null
+++ b/themes/default/tags.twig
@@ -0,0 +1,8 @@
+{% extends "layout.twig" %}
+{% block title %}tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 6cab59c3409f4edc9b309b76295cb4061bff3fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 14:03:14 +0100
Subject: [add] edit tags page

---
 themes/default/edit-tags.twig | 18 ++++++++++++++++++
 themes/default/view.twig      |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 themes/default/edit-tags.twig

(limited to 'themes/default')

diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
new file mode 100644
index 00000000..0bd1aba7
--- /dev/null
+++ b/themes/default/edit-tags.twig
@@ -0,0 +1,18 @@
+{% extends "layout.twig" %}
+{% block title %}edit tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% if tags is empty %}
+no tags
+{% endif %}
+<ul>
+{% for tag in tags %}<li>{{ tag.value }} <a href="#">✘</a></li>{% endfor %}
+</ul>
+<form method="post" action="#">
+    <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" />
+    {% trans "you can type several tags, separated by comma" %}<br />
+    <input type="submit" value="add tags" />
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 5a7c9165..9f9e23c8 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="#" title="{% trans "edit tags" %}">✎</a>
+                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="./?&amp;view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}
-- 
cgit v1.2.3


From 4886ed6d3637df0b3e16e672d58d4ef8f17dc432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 14:22:29 +0100
Subject: [add] page which lists entries for a tag

---
 themes/default/tag.twig  | 33 +++++++++++++++++++++++++++++++++
 themes/default/tags.twig |  2 +-
 themes/default/view.twig |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 themes/default/tag.twig

(limited to 'themes/default')

diff --git a/themes/default/tag.twig b/themes/default/tag.twig
new file mode 100644
index 00000000..364c7cd4
--- /dev/null
+++ b/themes/default/tag.twig
@@ -0,0 +1,33 @@
+{% extends "layout.twig" %}
+{% block title %}tag {% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+    <h3>{% trans "Tag" %} {{ tag.value }}</h3>
+    {% if entries is empty %}
+    <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
+    {% else %}
+        {% block pager %}
+            {% if nb_results > 1 %}
+        <div class="results">
+            <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                {{ page_links | raw }}
+        </div>
+            {% endif %}
+        {% endblock %}
+        {% for entry in entries %}
+    <div id="entry-{{ entry.id|e }}" class="entrie">
+        <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
+        <ul class="tools">
+            <li><a title="{% trans "toggle mark as read" %}" class="tool {% 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>
+            <li><a title="{% trans "toggle favorite" %}" class="tool {% 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>
+            <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+            <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
+            <li><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="reading-time"><span>{{ entry.content| getReadingTime }} min</span></a></li>
+        </ul>
+        <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
+    </div>
+        {% endfor %}
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
index 9421fe3e..e179143d 100644
--- a/themes/default/tags.twig
+++ b/themes/default/tags.twig
@@ -4,5 +4,5 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-{% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}
+{% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}
 {% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 9f9e23c8..7e096a95 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="./?&amp;view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
+                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}
-- 
cgit v1.2.3


From f778e47283c9691d2992045e0fbcdfc6685f157f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 14:37:42 +0100
Subject: [add] rss for tag

---
 themes/default/img/default/rss.png | Bin 0 -> 288 bytes
 themes/default/tags.twig           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 themes/default/img/default/rss.png

(limited to 'themes/default')

diff --git a/themes/default/img/default/rss.png b/themes/default/img/default/rss.png
new file mode 100644
index 00000000..21bad1a1
Binary files /dev/null and b/themes/default/img/default/rss.png differ
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
index e179143d..cff6b1d7 100644
--- a/themes/default/tags.twig
+++ b/themes/default/tags.twig
@@ -4,5 +4,5 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-{% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}
+{% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From c432fa1674fbe2b190cf0d0bab2e90302a61e98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 6 Dec 2013 15:07:51 +0100
Subject: [add] assign and remove a tag to an entry

---
 themes/default/edit-tags.twig | 8 +++++---
 themes/default/view.twig      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 0bd1aba7..7116bba9 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -8,11 +8,13 @@
 no tags
 {% endif %}
 <ul>
-{% for tag in tags %}<li>{{ tag.value }} <a href="#">✘</a></li>{% endfor %}
+{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
-<form method="post" action="#">
+<form method="post" action="./?action=add_tag">
     <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" />
-    {% trans "you can type several tags, separated by comma" %}<br />
+    <p>{% trans "you can type several tags, separated by comma" %}</p>
+    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
     <input type="submit" value="add tags" />
 </form>
+<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a>
 {% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 7e096a95..64672b61 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
+                tags: {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}
-- 
cgit v1.2.3