Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve display of badges on public recipes filer #532

Merged
merged 1 commit into from
Jul 3, 2023
Merged

Improve display of badges on public recipes filer #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/static/css/components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@
border: 1px solid #ced4da !important;
}


.select-badge {
min-width: 4rem;
text-align: center;
}
2 changes: 1 addition & 1 deletion app/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ div.warning li {

div.warning li:before {
content: "⚠️";
}
}
4 changes: 2 additions & 2 deletions app/static/js/controllers/select_badges_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export default class extends Controller {
return;
}

var badge = document.createElement("span")
badge.className = "select-badge lh-3 ms-1 me-1 p-2 cursor-clickable rounded-pill text-nobreak"
var badge = document.createElement("div")
badge.className = "select-badge lh-2 mb-1 ms-1 me-1 p-2 pt-1 pb-1 cursor-clickable rounded-pill"

if (option.dataset.color == "None" || option.dataset.color == null || option.dataset.color.length === 0) {
badge.dataset.color = this.selectedClass.replace("bg-color-", "")
Expand Down
27 changes: 12 additions & 15 deletions app/templates/public_recipes/_filter.html.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<summary> pokročilé filtrování </summary>
<div>

<form action="{{ url_for('PublicRecipeView:index') }}" method="get" accept-charset="UTF-8">
<form action="{{ url_for('PublicRecipeView:index') }}" method="get" accept-charset="UTF-8">

<div class="row" data-controller="select-badges"
data-select-badges-selected-class="bg-color-highlight"
data-select-badges-unselected-class="bg-color-light-grey">
<h4>{{ form.category.label(class_="me-1 col-sm-2 col-form-label") }}</h4>
<div class="col-sm-9">
{{ render_field(form.category, has_label=False, data_select_badges_target="select") }}
<div data-select-badges-target="badges" class="text-overflow-break"></div>
<div data-select-badges-target="badges" class="d-flex flex-wrap"></div>
</div>
</div>

Expand All @@ -24,11 +24,11 @@
<h4>{{ form.dietary_labels.label(class_="col-form-label") }}</h4>
<div class="col-sm-9">
{{ render_field(form.dietary_labels, has_label=False, data_select_badges_target="select") }}
<div data-select-badges-target="badges" class="text-overflow-break"></div>
<div data-select-badges-target="badges" class="d-flex flex-wrap"></div>
</div>
</div>
</div>

<div class="col-12 col-md-6">
<div class="row mt-2" data-controller="select-badges"
data-select-badges-type-value="multiple"
Expand All @@ -37,7 +37,7 @@
<h4>{{ form.difficulty_labels.label(class_="col-form-label") }}</h4>
<div class="col-sm-9">
{{ render_field(form.difficulty_labels, has_label=False, data_select_badges_target="select") }}
<div data-select-badges-target="badges" class="text-overflow-break"></div>
<div data-select-badges-target="badges" class="d-flex flex-wrap"></div>
</div>
</div>
</div>
Expand All @@ -59,29 +59,26 @@
<h4>pouze moje oblíbené?</h4>
<div class="col-sm-9">
{{ render_field(form.favorite, has_label=False, data_select_badges_target="select") }}
<div data-select-badges-target="badges" class="text-overflow-break"></div>
<div data-select-badges-target="badges" class="d-flex"></div>
</div>
</div>
</div>
</div>

<hr>

<div class="row mt-2">
<div data-controller="select-badges"
data-select-badges-selected-class="bg-color-highlight"
data-select-badges-unselected-class="bg-color-light-grey">
<h4>seřadit podle</h4>
{{ render_field(form.sort_by, has_label=False, data_select_badges_target="select") }}
<div data-select-badges-target="badges" class="text-overflow-break"></div>
<div data-select-badges-target="badges" class="d-flex flex-wrap"></div>
</div>
</div>


<div class="text-end mt-2">
{{ form.submit(class_='btn bg-color-primary-action color-white ms-3') }}
</div>
<div class="text-end mt-2">
{{ form.submit(class_='btn bg-color-primary-action color-white ms-3') }}
</div>

</form>
</form>
</div>
</details>
</details>
Loading