marc/folkugat-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
marc
2025-04-04 22:18:49 +02:00
parent 26aa4579b1
commit d5eb40e300
14 changed files with 1135 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1083
folkugat_web/assets/static/css/main.css
View File

File diff suppressed because one or more lines are too long

7
folkugat_web/assets/templates/fragments/tema/score.html
View File

@@ -47,13 +47,18 @@
{% endif %}
</h5>
<hr class="h-px mt-1 mb-3 bg-beige border-0">
<div>
<div class="flex flex-col items-center">
{% if score.img_url is not none %}
<div class="flex justify-center">
<a href="{{ score.pdf_url or score.img_url }}" target="_blank">
<img class="m-2" src="{{ score.img_url }}" />
</a>
</div>
{% if score.pdf_url is not none %}
<div class="text-beige border rounded border-beige m-2 p-1">
<a href="{{ score.pdf_url }}" target="_blank">Obre el PDF</a>
</div>
{% endif %}
{% elif score.pdf_url is not none %}
{% set pdf_url = score.pdf_url %}
{% include "fragments/pdf_viewer.html" %}

30
folkugat_web/assets/templates/fragments/temes/result_links.html
View File

@@ -1,17 +1,19 @@
<ul class="flex flex-row items-center">
{% if tema.links %}
{% for link in tema.links %}
<li class="px-2 text-beige">
<a href="{{ link.url }}" target="_blank">
{% if link.content_type == ContentType.AUDIO %}
<i class="fa fa-volume-up" aria-hidden="true"></i>
{% elif link.content_type == ContentType.PARTITURA %}
<i class="fa fa-music" aria-hidden="true"></i>
{% else %}
<i class="fa fa-link" aria-hidden="true"></i>
{% endif %}
</a>
</li>
{% endfor %}
<li class="px-2 text-beige">
{% if tema.has_score %}
<a href="/tema/{{ tema.id }}" target="_blank">
<i class="fa fa-music px-1" aria-hidden="true"></i>
</a>
{% endif %}
{% if tema.has_lyrics %}
<a href="/tema/{{ tema.id }}" target="_blank">
<i class="fa fa-font px-1" aria-hidden="true"></i>
</a>
{% endif %}
{% if tema.has_audio %}
<a href="/tema/{{ tema.id }}" target="_blank">
<i class="fa fa-volume-up px-1" aria-hidden="true"></i>
</a>
{% endif %}
</li>
</ul>

75
folkugat_web/assets/templates/lilypond/score.ly
View File

@@ -1,75 +0,0 @@
\new ChordNames {
\chords {
\set chordChanges = ##t
\set noChordSymbol = ""
\partial 2
r2
% A
\repeat volta 2 {
d1 g a:5 r4 a2.:aug | d1 g a
\alternative {
\volta 1 { a4 a2.:aug }
\volta 2 { d4 d2.:7 }
}
}
% B
g1 d/fs g2 a b:m c/a
g1 d/fs g2 a d a/cs
% C
b1:m d/fs a g2 a
b1:m d/fs a2 g d a/cs
b1:m d/fs a g2 a
b1:m g a2 a:aug a1:aug
}
}
\new Staff {
\relative {
\numericTimeSignature
\time 4/4
\set Timing.beamExceptions = #'()
\set Timing.baseMoment = #(ly:make-moment 1/4)
\set Timing.beatStructure = 2,2
\key d \major
\partial 2
a8 b d e
% A
\mark \default
\repeat volta 2 {
fs4. fs8 e fs e d | g, r r4 e'8 fs e d |
a16 b8( b8.) c16 b a8 b d e | e d( d) a( a) b d e |
fs4. fs8 e fs e d | g, r r4 e'8 fs e d |
a b d e e d( d) e |
\alternative {
\volta 1 { d4 a( a8) b d e }
\volta 2 { d4 fs( fs) e8 d }
}
}
% B
\mark \default
b2 e8 fs e d | a2 e'8 fs e d | b4. b8 a b d e | e d( d) fs( fs) a e d |
b2 e8 fs e d | a2 e'8 fs e d | a b d e e d( d) e | d4 d16 d d8 d fs a cs |
\bar "||" \break
% C
\mark \default
d4. d8 cs d cs a | fs4 e8 d a' b a fs | e2 e8 fs e d | a b d e d fs a cs |
d4. d8 cs d cs b | fs4 e8 d a' b a fs | e2 d4. e8 | d4 d16 d d8 d fs a cs |
d2 cs4 b8 a | fs4 e8 d a b a fs | e'2 e8 fs e d | a b d e d fs a cs |
d2 d8 cs a fs | b2 b8 a fs d | e-> r r fs-> d-> r r4 | r8 c' c c c b a g |
\bar "|."
}
}

2
folkugat_web/assets/templates/lilypond/score_template.ly
View File

@@ -36,7 +36,7 @@
\numericTimeSignature
\time 4/4
\set Timing.beamExceptions = #'()
\set Timing.baseMoment = #(ly:make-moment 1/4)
\set Timing.baseMoment = #(ly:make-moment 1/8)
\set Timing.beatStructure = 2,2
% -----------------------------------------------------

2
folkugat_web/assets/templates/lilypond/single_score.ly
View File

@@ -5,7 +5,7 @@
}
\header {
title = \markup { "{{ tema.title }}" }
title = \markup { "{{ tema.title | safe }}" }
{% if tema.composer() %}
composer = "{{ tema.composer() }}"
{% elif tema.origin() %}