Skip to content

Commit 4653758

Browse files
authored
add selectable icon to simpleresource plugin (#856)
1 parent 2f1e934 commit 4653758

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed

ephios/plugins/simpleresource/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ def add_fields(self, form, index):
5959
formset=BaseResourceCategoryFormset,
6060
can_delete=True,
6161
extra=0,
62-
fields=["name"],
62+
fields=["name", "icon"],
6363
)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 4.1.5 on 2023-01-02 21:41
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("simpleresource", "0001_initial"),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name="resourcecategory",
15+
name="icon",
16+
field=models.CharField(default="box", max_length=50),
17+
),
18+
]

ephios/plugins/simpleresource/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
class ResourceCategory(models.Model):
88
name = models.CharField(max_length=50, verbose_name=_("Name"))
9+
icon = models.CharField(max_length=50, default="box", help_text="FontAwesome icon name")
910

1011
def __str__(self):
1112
# pylint: disable=invalid-str-returned
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="resource-allocation-shift-{{ allocation.shift.id }}">
22
{% for resource in allocation.resources.all %}
3-
<span class="badge bg-light text-dark"><i class="fas fa-box"></i> {{ resource.title }}</span>
3+
<span class="badge bg-light text-dark"><i class="fas fa-{{ resource.category.icon }}"></i> {{ resource.title }}</span>
44
{% endfor %}
55
</div>

ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@ <h1>{% trans "Edit resource categories" %}</h1>
2121
<div class="formset" data-formset data-formset-prefix="{{ form.prefix }}">
2222
{{ form.management_form }}
2323
<div class="card mb-2">
24-
<div class="card-body">
24+
<div class="card-body pt-2">
2525
<ul class="list-group list-group-flush" data-formset-body>
2626
{% for category_form in form %}
2727
<div class="list-group-item" data-formset-form>
2828
{{ category_form.id }}
29-
<div class="row align-items-center">
30-
<div class="col-lg-10">
29+
<div class="row align-items-start">
30+
<div class="col-lg-6 pt-3">
3131
{% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
3232
</div>
33-
<div class="col-lg-2">
33+
<div class="col-lg-4 pt-3">
34+
{% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
35+
</div>
36+
<div class="col-lg-2 pt-2">
3437
{% if not category_form.fields.DELETE.disabled %}
3538
<button class="btn btn-link" type="button"
3639
data-formset-delete-button><span
@@ -60,11 +63,14 @@ <h1>{% trans "Edit resource categories" %}</h1>
6063
{% escapescript %}
6164
<div class="list-group-item" data-formset-form>
6265
{{ category_form.id }}
63-
<div class="row align-items-center">
64-
<div class="col-lg-10">
66+
<div class="row align-items-start">
67+
<div class="col-lg-6 pt-3">
6568
{% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
6669
</div>
67-
<div class="col-lg-1">
70+
<div class="col-lg-4 pt-3">
71+
{% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
72+
</div>
73+
<div class="col-lg-1 pt-2">
6874
<button class="btn btn-link" type="button"
6975
data-formset-delete-button><span
7076
class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>

0 commit comments

Comments
 (0)