Events filters

diff --git a/app/static/src/sass/global/_buttons.scss b/app/static/src/sass/global/_buttons.scss
index 38bc02a999babac6a6b5136fd462c85a040207c4..39808c051c443b34aff1e676bf601b320d9a96ab 100755 (executable)
--- a/app/static/src/sass/global/_buttons.scss
+++ b/app/static/src/sass/global/_buttons.scss
@@ -11,7 +11,7 @@ $module: ".button";
     @include font-size(l);
     @include line-height(1);
     @include typeface(sans-serif);
-    @include padding(.25 1 .5 1);
+    @include padding(.25 1 .25 1);
     //@include margin(0);
     font-weight: weight(light);
 
@@ -77,4 +77,22 @@ $module: ".button";
         @include margin(0 0 1 0);
     }
 
+    &--tournees {
+
+        color: white;
+        @include line-height(1);
+        @include padding(.25 .5 .25 .5);
+        background: $color-black;
+        text-transform: uppercase;
+        font-weight: weight(regular);
+        border: 1px solid $color-black;
+
+        &:hover {
+            background-color: $color-main;
+            color: $color-black;
+            border: 1px solid $color-main;
+        }
+
+    }
+
 }

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index d0c1035bb1e3e44f62900b8bc9baf04e3f199af9..906ebeb7e562e87a867eeb3980cc798f488598f9 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -74,10 +74,12 @@
                         {% keywords_for mezzanine_agenda.event as tags %}
                         {% all_events as all_events %}
                         {% if tags %}
-                            <a href="{% url 'event_list' %}" class="button{% if not tag %} button--black{% else %} button--white{% endif %}">{% trans "All events" %}</a>
+                            {% comment %}
+                                <a href="{% url 'event_list' %}" class="button{% if not tag %} button--black{% else %} button--white{% endif %}">{% trans "All events" %}</a>
+                            {% endcomment %}
                             {% for t in tags %}
-                                <a href="{% url "event_list_tag" t.slug %}" class="button{% if tag == t %} button--black{% else %} button--white{% endif %}{% if t|tag_is_excluded %} button--excluded{% endif %}">
-                                    {{ t }}
+                                <a href="{% if tag == t %}{% url 'event_list' %}{% else %}{% url "event_list_tag" t.slug %}{% endif %}" class="button{% if tag == t %} button--black{% else %} button--white{% endif %}{% if t|tag_is_excluded %} button--tournees{% endif %}">
+                                    {{ t }} {% if tag == t %}<i class="fa fa-times"></i>{% endif %}
                                 </a>
                             {% endfor %}
                         {% endif %}