diff options
Diffstat (limited to 'templates/category')
| -rw-r--r-- | templates/category/_sort_by.html | 66 | ||||
| -rw-r--r-- | templates/category/_sort_menu.html | 30 | ||||
| -rw-r--r-- | templates/category/index.html | 3 |
3 files changed, 46 insertions, 53 deletions
diff --git a/templates/category/_sort_by.html b/templates/category/_sort_by.html index e0e4cf88..4f2f9a8c 100644 --- a/templates/category/_sort_by.html +++ b/templates/category/_sort_by.html @@ -1,27 +1,51 @@ +{% load staticfiles %} {% load i18n %} {% load shop %} -{% load staticfiles %} -<li> - <div class="row"> - <div class="col-6"> - Sort by: <strong>{{ label }}</strong> +<div class="sort-by"> + <div class="click-area d-none"></div> + <button class="btn btn-link"> + <div> + <span> + Sort by: + <strong> + {{ sort_by }} + </strong> + </span> + <div class="sort-order-icon"> + {% if arrow_down %} + <svg data-src="{% static "assets/arrow_down.svg" %}"> + {% else %} + <svg data-src="{% static "assets/arrow_up.svg" %}"> + {% endif %} + </div> </div> - <div class="col-6"> - <div> - <a href="{% get_sort_by_url ascending_attribute %}"> - <span>{% trans 'ascending' context 'sort by option' %}</span> - <div class="sort-order-icon float-right"> - <img src="{% static "assets/arrow_up.svg" %}"> + </button> + <ul class="sort-list d-none"> + {% for choice in sort_by_choices %} + <li> + <div class="row"> + <div class="col-6"> + Sort by: <strong>{{ choice.label }}</strong> </div> - </a> - <a href="{% get_sort_by_url descending_attribute %}"> - <span>{% trans 'descending' context 'sort by option' %}</span> - <div class="sort-order-icon float-right"> - <img src="{% static "assets/arrow_down.svg" %}"> + <div class="col-6"> + <div> + <a href="{% get_sort_by_url choice.value %}"> + <span>{% trans 'ascending' context 'sort by option' %}</span> + <div class="sort-order-icon float-right"> + <img src="{% static "assets/arrow_up.svg" %}"> + </div> + </a> + <a href="{% get_sort_by_url choice.value descending=True %}"> + <span>{% trans 'descending' context 'sort by option' %}</span> + <div class="sort-order-icon float-right"> + <img src="{% static "assets/arrow_down.svg" %}"> + </div> + </a> + </div> </div> - </a> - </div> - </div> - </div> -</li> + </div> + </li> + {% endfor %} + </ul> +</div> diff --git a/templates/category/_sort_menu.html b/templates/category/_sort_menu.html deleted file mode 100644 index 420474ab..00000000 --- a/templates/category/_sort_menu.html +++ /dev/null @@ -1,30 +0,0 @@ -{% load sort_by from sort_by %} -{% load staticfiles %} -{% load i18n %} -{% load shop %} - -<div class="sort-by"> - <div class="click-area d-none"></div> - <button class="btn btn-link"> - <div> - <span> - Sort by: - <strong> - {{ sort_by }} - </strong> - </span> - <div class="sort-order-icon"> - {% if arrow_down %} - <svg data-src="{% static "assets/arrow_down.svg" %}"> - {% else %} - <svg data-src="{% static "assets/arrow_up.svg" %}"> - {% endif %} - </div> - </div> - </button> - <ul class="sort-list d-none"> - {% for choice in sort_by_choices %} - {% sort_by choice %} - {% endfor %} - </ul> -</div> diff --git a/templates/category/index.html b/templates/category/index.html index 45be775c..4c8a1343 100644 --- a/templates/category/index.html +++ b/templates/category/index.html @@ -3,7 +3,6 @@ {% load i18n %} {% load shop %} {% load staticfiles %} -{% load sort_menu from sort_menu %} {% load render_bundle from webpack_loader %} {% load prices_i18n %} @@ -45,7 +44,7 @@ <span class="filters-menu__label d-sm-none">Filters</span> </div> <div class="col-6 col-md-10 col-lg-6"> - {% sort_menu sort_by_choices %} + {% sort_by sort_by_choices %} </div> </div> </div> |