Skip to content

Display tags on each document on the course view #295

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

Open
Mortinat wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Display tags on each document on the course view #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
457d473
[UPD] display tags
Mortinat Jan 2, 2023
16d8f4f
Merge branch 'main' into show_tags
Mortinat May 31, 2023
b406e96
[ADD] incon to tag
Mortinat May 31, 2023
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
21 changes: 10 additions & 11 deletions catalog/templates/catalog/course.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h1 class="d-flex align-items-center gap-2">
data-action="change->course-filter#filter"
data-course-filter-target="tag"
/>
<label for="tag-{{ tag.name }}">{{ tag.name }}</label>
<label for="tag-{{ tag.name }}">{{ tag.name }} {{ tag.icon|safe }}</label>
</li>
{% endfor %}
</ul>
Expand Down Expand Up @@ -134,16 +134,15 @@ <h1 class="d-flex align-items-center gap-2">
{{ document.user.name }} |
{{ document.pages }} page{{ document.pages|pluralize }} |
{{ document.date|date:"F Y"|capfirst }}
<div class="tags d-none">
{% for kw in document.tags.all %}
<span
data-id="{{ kw.id }}"
style="background-color: {{ kw.color }}; color:white;"
>
{{ kw }}
</span>
{% endfor %}
</div>
{% for kw in document.tags.all %}
<span
data-id="{{ kw.id }}"
class="badge"
style="background-color: {{ kw.color }}; color:white;font-size:0.8em"
>
{{kw.icon|safe}}
</span>
{% endfor %}
</div>
</div>
</a>
Expand Down
17 changes: 17 additions & 0 deletions tags/migrations/0002_tag_icon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.2.1 on 2023-05-31 15:07

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("tags", "0001_initial"),
]

operations = [
migrations.AddField(
model_name="tag",
name="icon",
field=models.CharField(blank=True, max_length=1000),
),
]
1 change: 1 addition & 0 deletions tags/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

class Tag(models.Model):
name = models.CharField(max_length=50, unique=True)
icon = models.CharField(max_length=1000, blank=True)

@property
def color(self):
Expand Down