mirror of
https://github.com/Findus23/acronomy.git
synced 2024-09-19 15:33:45 +02:00
add wikipedia descriptions
This commit is contained in:
parent
c3bff89559
commit
ccdbb5cee5
5 changed files with 42 additions and 15 deletions
23
acros/migrations/0048_auto_20200727_1852.py
Normal file
23
acros/migrations/0048_auto_20200727_1852.py
Normal file
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.0.8 on 2020-07-27 18:52
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('acros', '0047_auto_20200720_1534'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='historicalwikipedialink',
|
||||
name='description',
|
||||
field=models.TextField(blank=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='wikipedialink',
|
||||
name='description',
|
||||
field=models.TextField(blank=True),
|
||||
),
|
||||
]
|
|
@ -12,6 +12,7 @@ class WikipediaLink(models.Model):
|
|||
title = models.CharField(max_length=200)
|
||||
extract = models.TextField(blank=True)
|
||||
extract_html = models.TextField(blank=True)
|
||||
description = models.TextField(blank=True)
|
||||
thumbnail = models.ForeignKey(WikipediaImage, on_delete=models.CASCADE, related_name="wiki_articles",
|
||||
blank=True, null=True)
|
||||
timestamp = models.DateTimeField(blank=True)
|
||||
|
@ -23,6 +24,7 @@ class WikipediaLink(models.Model):
|
|||
summary = WikipediaAPISummary(self.title)
|
||||
self.extract = summary.extract
|
||||
self.extract_html = summary.extract_html
|
||||
self.description = summary.description
|
||||
self.timestamp = summary.timestamp
|
||||
self.title = summary.title
|
||||
if summary.image:
|
||||
|
|
|
@ -43,17 +43,6 @@
|
|||
{{ acro.description_html|safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{# <div class="linkwrapper">#}
|
||||
{# {% for link in acro.links.all %}#}
|
||||
{# <div><a href="{{ link.url }}">{{ link.url }}</a></div>#}
|
||||
{# {% endfor %}#}
|
||||
{# {% for paper in acro.papers.all %}#}
|
||||
{# <div>#}
|
||||
{# <a href="{{ paper.ads_url }}">ADS</a>#}
|
||||
{# <a href="{{ paper.arxiv_url }}">Arxiv</a>#}
|
||||
{# <a href="{{ paper.doi_url }}">DOI</a>#}
|
||||
{# </div>#}
|
||||
{# {% endfor %}#}
|
||||
<div class="tags">
|
||||
{% for tag in acro.tags.all %}
|
||||
<a href="{% url "tag" tag.slug %}" class="btn btn-primary btn-tag">{{ tag.name }}</a>
|
||||
|
@ -71,6 +60,9 @@
|
|||
{% endif %}
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ link.title }}</h5>
|
||||
{% if link.description %}
|
||||
<p class="description text-muted">{{ link.description }}</p>
|
||||
{% endif %}
|
||||
{#<p class="card-text">{{ link.extract_html|safe }}</p>#}
|
||||
<p class="card-text">{{ link.extract }}</p>
|
||||
<a href="{{ link.url }}" class="btn btn-primary">
|
||||
|
|
|
@ -26,6 +26,10 @@ class WikipediaAPISummary:
|
|||
def extract_html(self) -> str:
|
||||
return self.data["extract_html"]
|
||||
|
||||
@property
|
||||
def description(self) -> str:
|
||||
return self.data["description"]
|
||||
|
||||
@property
|
||||
def timestamp(self) -> str:
|
||||
return self.data["timestamp"]
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
|
||||
.card-title {
|
||||
text-align: center;
|
||||
|
||||
img {
|
||||
max-width: 32px;
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.card-title img {
|
||||
max-width: 32px;
|
||||
height: auto;
|
||||
.card {
|
||||
.description {
|
||||
text-align: center;
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.card-img-top {
|
||||
height: auto;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue