1
0
Fork 0
mirror of https://github.com/Findus23/acronomy.git synced 2024-09-19 15:33:45 +02:00

html fixes

This commit is contained in:
Lukas Winkler 2020-07-30 22:11:38 +02:00
parent 57b22990a5
commit 900ce5ada4
Signed by: lukas
GPG key ID: 54DE4D798D244853
2 changed files with 11 additions and 7 deletions

View file

@ -12,19 +12,20 @@
<meta property="og:locale" content="en_GB"/>
{% if acro.wiki_articles.all and acro.wiki_articles.all.0.description %}
<!-- This short description is from the Wikipedia project and licensed under Creative Commons Attribution-ShareAlike 3.0 -->
<meta name="description" content="{{ acro.name }}: {{ acro.full_name }} ({{ acro.wiki_articles.all.0.description }})">
<meta name="description"
content="{{ acro.name }}: {{ acro.full_name }} ({{ acro.wiki_articles.all.0.description }})">
<meta property="og:description" content="{{ acro.wiki_articles.all.0.description }}"/>
{% endif %}
{% if acro.wiki_articles.all and acro.wiki_articles.all.0.thumbnail %}
{# Hardcoded URLs are ugly, but there is no other simple solution #}
<meta property="og:image" content="https://acronomy.lw1.at{{ acro.wiki_articles.all.0.thumbnail.thumbnail.url }}"/>
<meta property="og:image:width" content="{{ acro.wiki_articles.all.0.thumbnail.thumb_width }}" />
<meta property="og:image:height" content="{{ acro.wiki_articles.all.0.thumbnail.thumb_height }}" />
<meta property="og:image:width" content="{{ acro.wiki_articles.all.0.thumbnail.thumb_width }}"/>
<meta property="og:image:height" content="{{ acro.wiki_articles.all.0.thumbnail.thumb_height }}"/>
{% else %}
<meta property="og:image" content="https://acronomy.lw1.at{% static "images/logo.png" %}"/>
<meta property="og:image:width" content="1024" />
<meta property="og:image:height" content="1024" />
<meta property="og:image:width" content="1024"/>
<meta property="og:image:height" content="1024"/>
{% endif %}
{% endblock %}
@ -33,10 +34,11 @@
{% block heading %}
<h1 class="acronym">{{ acro.name }}</h1>
{# @formatter:off #}
<p class="fullName">
{% for letter in acro.full_name %}
<span {% if forloop.counter0 in acro.acro_letters %}class="al"{% endif %}>{{ letter }}</span>{% endfor %}
{% for letter in acro.full_name %}<span {% if forloop.counter0 in acro.acro_letters %}class="al"{% endif %}>{{ letter }}</span>{% endfor %}
</p>
{# @formatter:on #}
{% endblock %}

View file

@ -49,6 +49,8 @@ class DetailView(generic.DetailView):
template_name = 'acros/detail.html'
context_object_name = 'acro'
model = Acronym
queryset = Acronym.objects.prefetch_related('wiki_articles')
class EditView(LoginRequiredMixin, SuccessMessageMixin, generic.UpdateView):