[add] maj theme courgette : ajout tag

11 files changed, 135 insertions, 7 deletions

diff --git a/themes/courgette/_menu.twig b/themes/courgette/_menu.twig
index 85487f73..5e737299 100755
--- a/themes/courgette/_menu.twig
+++ b/themes/courgette/_menu.twig
@@ -3,6 +3,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>
diff --git a/themes/courgette/view.twig b/themes/courgette/_view.twig
index e80829ef..e80829ef 100755
--- a/themes/courgette/view.twig
+++ b/themes/courgette/_view.twig
diff --git a/themes/courgette/css/.DS_Store b/themes/courgette/css/.DS_Store
deleted file mode 100644
index c788a093..00000000
--- a/themes/courgette/css/.DS_Store
+++ /dev/null
diff --git a/themes/courgette/css/font.css b/themes/courgette/css/font.css
index 7c16cce4..849ff85b 100755
--- a/themes/courgette/css/font.css
+++ b/themes/courgette/css/font.css
@@ -7,4 +7,16 @@
        url('../font/fontello.svg?97381924#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
-}
\ No newline at end of file
+}
+
+@font-face {
+  font-family: 'icomoon';
+  src:url('../font/icomoon.eot?-72nnzw');
+  src:url('../font/icomoon.eot?#iefix-72nnzw') format('embedded-opentype'),
+    url('../font/icomoon.woff?-72nnzw') format('woff'),
+    url('../font/comoon.ttf?-72nnzw') format('truetype'),
+    url('../font/icomoon.svg?-72nnzw#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
diff --git a/themes/courgette/css/style.css b/themes/courgette/css/style.css
index 2ba16b71..edd09c78 100755
--- a/themes/courgette/css/style.css
+++ b/themes/courgette/css/style.css
@@ -157,6 +157,8 @@ h1 a {
   transition-delay:1.55ms;
 }
 
+#article_toolbar li:nth-child(2) { display: none; }
+
 #menu:before {
   content: "\e801";
   display: block;
@@ -299,7 +301,7 @@ ul li {
   color:#000;
 }
 
-.tools a:before { display: block; font-family: 'fontello'; }
+.tools a:before { display: block; font-family: 'icomoon'; }
 
 
 .fav-off:before, .fav:before { content: '\e805'; } /* '' */
@@ -308,13 +310,13 @@ ul li {
   background: #FFF;
   color:#000;
 }
-.link:before { content: '\e800'; } /* '' */
-.delete:before { content: '\e803'; } /* '' */
-.reading-time:before { content: '\e802'; } /* '' */
+.link:before { content: '\e801'; } /* '' */
+.delete:before { content: '\e80c'; } /* '' */
+.reading-time:before { content: '\e803'; } /* '' */
 
 #article_toolbar a:before {
   display: block;
-  font-family: 'fontello'; 
+  font-family: 'icomoon'; 
 }
 
 #article_toolbar a {
@@ -343,7 +345,8 @@ ul li {
 .email:before { content: '\e80a'; } /* '' */
 .icon-check:before { content: '\e804'; } /* '' */
 .back:before { content: '\e806'; } /* '' */
-.bad-display:before { content: '\e808'; } /* '' */
+.flattr:before { content: '\e800'; } /* '' */
+.bad-display:before { content: '\e600'; } /* '' */
 .twitter:before { content: '\e807'; } /* '' */
 
 #article_toolbar .flattrli {
@@ -618,3 +621,64 @@ form button:hover, form button:focus, form input[type="submit"]:hover, form inpu
     position:static;
   }
 }
+
+
+.w600p {
+  width: 70%;
+  margin: auto;
+}
+
+.tagForm {
+  margin: 1em 0;
+}
+
+.tagForm p {
+  font-style: italic;
+  margin: 0;
+  font-size: 0.8em;
+  color: #999;
+}
+
+.tagForm label {
+  width: auto;
+  margin-right: 1em;
+}
+
+.back:before {
+  font-family: "icomoon";
+}
+
+.back.link {
+  color: #000;
+  text-decoration: none;
+}
+
+.back.link:before {
+  margin-right: 0.5em;
+}
+
+.tag-list a {
+  color: #000;
+  text-decoration: none;
+}
+
+.tag-list li {
+  display: inline-block;
+  margin-right: 1em;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+.tag {
+  background: #000;
+  color: #FFF;
+  padding: 0.5em 1em;
+  text-decoration: none;
+}
+
+.tag:hover, .tag:focus {
+  background: #FFF;
+  color: #000;
+}
\ No newline at end of file
diff --git a/themes/courgette/edit-tags.twig b/themes/courgette/edit-tags.twig
new file mode 100644
index 00000000..bcddbe46
--- /dev/null
+++ b/themes/courgette/edit-tags.twig
@@ -0,0 +1,20 @@
+{% extends "layout.twig" %}
+{% block title %}edit tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% if tags is empty %}
+<em>no tags</em>
+{% endif %}
+<ul class='tag-list'>
+{% 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="./?action=add_tag" class="tagForm">
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
+    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <input type="submit" value="Tag" />
+</form>
+<a class="back link" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
+{% endblock %}
diff --git a/themes/courgette/font/icomoon.eot b/themes/courgette/font/icomoon.eot
new file mode 100755
index 00000000..ff2d109d
--- /dev/null
+++ b/themes/courgette/font/icomoon.eot
diff --git a/themes/courgette/font/icomoon.svg b/themes/courgette/font/icomoon.svg
new file mode 100755
index 00000000..8968452d
--- /dev/null
+++ b/themes/courgette/font/icomoon.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M256 389.333c-94.272 0-170.667-76.416-170.667-170.666s76.394-170.667 170.667-170.667 170.667 76.416 170.667 170.667-76.394 170.666-170.667 170.666zM335.082 169.749c8.341-8.341 8.341-21.824 0-30.166-4.16-4.16-9.622-6.25-15.082-6.25s-10.923 2.091-15.082 6.25l-48.918 48.918-48.917-48.918c-4.16-4.16-9.621-6.25-15.083-6.25s-10.923 2.091-15.083 6.25c-8.341 8.341-8.341 21.824 0 30.166l48.917 48.918-48.917 48.917c-8.341 8.341-8.341 21.824 0 30.166s21.824 8.341 30.166 0l48.917-48.917 48.918 48.917c8.341 8.341 21.824 8.341 30.166 0s8.341-21.824 0-30.166l-48.918-48.917 48.918-48.918z" />
+<glyph unicode="&#xe800;" d="M0 25.856v263.168q0 91.648 43.52 142.336t132.608 50.688h280.576q-2.56-2.56-26.624-27.136t-51.2-51.712-55.808-55.808-48.64-47.616-21.504-18.944q-7.68 0-7.68 8.192v79.872h-24.576q-30.208 0-48.128-3.072t-32.256-13.312-19.968-29.184-6.144-49.152v-134.144zM34.304-34.048q2.56 2.56 27.136 27.136t51.2 51.712 55.808 56.32 48.64 47.616 20.992 18.432q7.68 0 7.68-8.192v-79.872h24.576q59.392 0 82.944 18.432t23.040 76.288v134.144l114.688 114.176v-263.168q0-91.648-43.008-142.336t-133.12-50.688h-280.576z" horiz-adv-x="491" />
+<glyph unicode="&#xe801;" d="M150.528 104.192q7.168 7.168 17.408 7.168t18.432-7.168q16.384-17.408 0-35.84l-21.504-20.48q-28.672-28.672-67.584-28.672-39.936 0-68.608 28.672t-28.672 67.584q0 39.936 28.672 68.608l75.776 75.776q35.84 34.816 73.728 39.424t65.536-22.016q8.192-8.192 8.192-18.432t-8.192-18.432q-18.432-16.384-35.84 0-25.6 24.576-67.584-17.408l-75.776-74.752q-13.312-13.312-13.312-32.768t13.312-31.744q13.312-13.312 32.256-13.312t32.256 13.312zM380.928 398.080q28.672-28.672 28.672-67.584 0-39.936-28.672-68.608l-80.896-80.896q-37.888-36.864-76.8-36.864-31.744 0-57.344 25.6-7.168 7.168-7.168 17.408t7.168 18.432q7.168 7.168 17.92 7.168t17.92-7.168q25.6-24.576 62.464 12.288l80.896 79.872q14.336 14.336 14.336 32.768 0 19.456-14.336 31.744-12.288 13.312-28.672 15.872t-30.72-10.752l-25.6-25.6q-8.192-7.168-18.432-7.168t-17.408 7.168q-17.408 17.408 0 35.84l25.6 25.6q27.648 27.648 65.024 26.112t66.048-31.232z" horiz-adv-x="410" />
+<glyph unicode="&#xe802;" d="M438.784 96v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 12.8t12.8 5.632h401.92q7.68 0 13.312-5.632t5.12-12.8zM438.784 242.432v-36.864q0-7.168-5.12-12.8t-13.312-5.12h-401.92q-7.68 0-12.8 5.12t-5.632 12.8v36.864q0 7.168 5.632 12.8t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-12.8zM438.784 388.352v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 13.312t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-13.312z" horiz-adv-x="439" />
+<glyph unicode="&#xe803;" d="M235.52 459.52q97.28 0 166.4-69.12t69.12-166.4-69.12-166.4-166.4-69.12-166.4 69.12-69.12 166.4 69.12 166.4 166.4 69.12zM235.52 39.68q76.8 0 130.56 54.272t53.76 130.048q0 76.8-53.76 130.56t-130.56 53.76q-75.776 0-130.048-53.76t-54.272-130.56q0-75.776 54.272-130.048t130.048-54.272zM253.952 357.12v-124.928l76.8-76.8-25.6-25.6-87.040 87.040v140.288h35.84z" horiz-adv-x="471" />
+<glyph unicode="&#xe804;" d="M127.488 44.8q-17.408 0-28.672 14.336l-92.16 120.832q-8.192 12.288-6.144 26.624t13.312 23.552 26.112 7.168 24.064-14.336l60.416-78.848 151.552 242.688q8.192 12.288 22.016 15.36t27.136-4.096q12.288-8.192 15.36-22.016t-4.096-27.136l-179.2-286.72q-10.24-16.384-28.672-16.384z" horiz-adv-x="342" />
+<glyph unicode="&#xe805;" d="M225.28 449.28l61.44-172.032h163.84l-134.144-100.352 48.128-178.176-139.264 106.496-139.264-106.496 48.128 178.176-134.144 100.352h163.84z" horiz-adv-x="451" />
+<glyph unicode="&#xe806;" d="M460.8 49.92q-44.032 77.824-106.496 100.864t-168.96 23.040v-111.616l-185.344 171.008 185.344 164.864v-98.304q46.080 0 86.016-13.824t67.072-35.84 49.152-48.64 35.328-53.248 22.528-48.64 12.288-35.328z" horiz-adv-x="461" />
+<glyph unicode="&#xe807;" d="M471.040 370.432q-18.432-27.648-48.128-50.176v-12.288q0-66.56-30.72-128t-95.232-103.936-148.48-42.496q-81.92 0-148.48 43.008 7.168-1.024 23.552-1.024 67.584 0 119.808 40.96-31.744 1.024-56.32 19.456t-33.792 48.128q5.12-2.048 17.408-2.048 13.312 0 25.6 3.072-33.792 7.168-55.296 33.792t-21.504 61.44v1.024q18.432-10.24 43.008-12.288-43.008 29.696-43.008 80.896 0 24.576 13.312 48.128 78.848-96.256 199.68-100.352-3.072 9.216-3.072 21.504 0 39.936 28.16 68.096t69.12 28.16q41.984 0 69.632-29.696 30.72 6.144 61.44 22.528-10.24-33.792-41.984-53.248 28.672 4.096 55.296 15.36z" horiz-adv-x="471" />
+<glyph unicode="&#xe809;" d="M0 314.112l75.776 75.776 180.224-179.712 180.224 179.712 75.776-75.776-256-256-75.776 75.776z" />
+<glyph unicode="&#xe80a;" d="M475.648 50.432v219.136q-9.216-10.24-19.968-18.944-76.288-58.368-121.856-96.256-14.336-12.288-23.552-19.456t-24.576-13.824-29.184-6.656h-1.024q-13.312 0-29.184 6.656t-24.576 13.824-23.552 19.456q-45.056 37.888-121.856 96.256-10.752 8.704-19.968 18.944v-219.136q0-4.096 3.072-6.656t6.144-2.56h420.864q3.584 0 6.144 2.56t3.072 6.656zM475.648 350.464v7.168t-0.512 3.584-0.512 3.584-1.536 2.56-2.56 2.048-4.096 1.024h-420.864q-3.584 0-6.144-3.072t-3.072-6.144q0-48.128 41.984-81.408 55.296-43.52 114.688-90.624 2.048-1.024 10.24-8.192t12.8-10.752 12.8-9.216 14.336-7.68 12.288-2.56h1.024q5.632 0 12.288 2.56t14.336 7.68 12.8 9.216 12.8 10.752 10.24 8.192q59.392 47.104 114.688 90.624 15.36 12.288 28.672 33.28t13.312 37.376zM512 361.216v-310.784q0-18.944-13.312-32.256t-32.256-13.824h-420.864q-18.432 0-32.256 13.824t-13.312 32.256v310.784q0 18.944 13.312 32.256t32.256 13.312h420.864q18.944 0 32.256-13.312t13.312-32.256z" />
+<glyph unicode="&#xe80b;" d="M0 133.888l256 256 256-256-75.776-75.776-180.224 179.712-180.224-179.712z" />
+<glyph unicode="&#xe80c;" d="M25.6 279.296q62.464-35.84 168.96-35.84t168.96 35.84l-27.648-248.832q-1.024-7.168-17.92-18.432t-51.2-22.016-72.192-10.752-71.68 10.752-51.2 22.016-18.432 18.432zM275.456 432.896q48.128-9.216 80.896-28.16t32.768-36.352v-5.12q0-29.696-57.344-50.688t-137.216-20.992-137.216 20.992-57.344 50.688v5.12q0 17.408 32.768 36.352t80.896 28.16l21.504 24.576q11.264 13.312 35.84 13.312h47.104q26.624 0 35.84-13.312zM247.808 375.552h43.008q-47.104 56.32-53.248 64.512-7.168 8.192-16.384 8.192h-52.224q-11.264 0-16.384-8.192l-54.272-64.512h43.008l32.768 33.792h41.984z" horiz-adv-x="389" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/themes/courgette/font/icomoon.ttf b/themes/courgette/font/icomoon.ttf
new file mode 100755
index 00000000..52463a87
--- /dev/null
+++ b/themes/courgette/font/icomoon.ttf
diff --git a/themes/courgette/font/icomoon.woff b/themes/courgette/font/icomoon.woff
new file mode 100755
index 00000000..ddb96f29
--- /dev/null
+++ b/themes/courgette/font/icomoon.woff
diff --git a/themes/courgette/tags.twig b/themes/courgette/tags.twig
new file mode 100644
index 00000000..9dfdab52
--- /dev/null
+++ b/themes/courgette/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 class="tag" 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