0x2620/njpma
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

apologies, forgot to fix merge conflict in film.html

Browse source
This commit is contained in:
imohkay 2021-10-22 10:41:04 +05:30
parent 5dab8dad1c
commit 25314e853c
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/templates/film.html
View file

@ -17,7 +17,6 @@ body {
<div class="film"> <div class="film">
<div class="info"> <div class="info">
<<<<<<< HEAD
<div class="info-meta"> <div class="info-meta">
<h1> <h1>
<span class="font-bold">{{ film.data.title | safe }}</span> <span class="font-bold">{{ film.data.title | safe }}</span>
@ -29,38 +28,17 @@ body {
{% endfor %} {% endfor %}
</h2> </h2>
<div class="details"> <div class="details">
Year: {{ film.data.date}}, Runtime: {{ film.duration }} {{ film.data.date}}, {{ film.duration }}
======= </div>
<h1>
<span>{{ film.data.title | safe }}</span>
<span>{{ film.data.title_zh | safe }}</span>
</h1>
<h2>
{% for director in film.data.director %}
{{ director|safe }}<br>
{% endfor %}
</h2>
<div class="details">
{{ film.data.date }}, {{ film.duration }}
</div>
<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
<p>{{ film.data.summary|safe }}</p>
<br>
<p>{{ film.data.summary_zh|safe }}</p>
<div class="bio">
<div class="en">
{{film.data.director.0}}: {{ film.data.bio|safe }}
</div>
<div class="zh">
{{film.data.director.1}}: {{ film.data.bio_zh|safe }}
>>>>>>> main
</div>
</div> </div>
<div class="video-block"> <div class="video-block">
<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video> <video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
</div> </div>
<div class="bio-block"> <div class="bio-block">
<p>{{ film.data.summary|safe }}</p> <p>{{ film.data.summary|safe }}</p>
<br>
<p>{{ film.data.summary_zh|safe }}</p>
<div class="bio"> <div class="bio">
<div class="en"> <div class="en">
{{film.data.director.0}}: {{ film.data.bio|safe }} {{film.data.director.0}}: {{ film.data.bio|safe }}