From 5a2ff83bea2d58a834ae11a2934ea912b063f828 Mon Sep 17 00:00:00 2001 From: Effie Date: Sun, 18 Jun 2023 16:50:33 +1000 Subject: [PATCH] Pretties up the song and motif pages. --- app.py | 8 +-- static/motificon.png | Bin 0 -> 1025 bytes static/songbook.png | Bin 0 -> 4861 bytes static/songicon.png | Bin 0 -> 580 bytes static/style.css | 148 ++++++++++++++++++++++++++------------ templates/motif.html | 32 +++++---- templates/motifindex.html | 6 +- templates/nav.html | 6 +- templates/song.html | 32 +++++---- templates/songindex.html | 10 +-- 10 files changed, 155 insertions(+), 87 deletions(-) create mode 100644 static/motificon.png create mode 100644 static/songbook.png create mode 100644 static/songicon.png diff --git a/app.py b/app.py index ccd5e43..fca2e09 100644 --- a/app.py +++ b/app.py @@ -259,16 +259,16 @@ def songpage(id): # query song name - name, = db.execute(''' + song_info = db.execute(''' select - name + name, name_jp from song where id = ? ''', (id,) - ).fetchone() + ).fetchall() # query album info @@ -333,7 +333,7 @@ def songpage(id): ).fetchall() return flask.render_template('song.html', - name=name, + song_info=song_info, id=id, album_info=album_info, clip_info=clip_info, diff --git a/static/motificon.png b/static/motificon.png new file mode 100644 index 0000000000000000000000000000000000000000..d50714cb30256712b0a9b8b0b2f9aacd964dfbe3 GIT binary patch literal 1025 zcmV+c1pfPpP)Px#1ZP1_K>z@;j|==^1poj6p-@azMF0Q*{{R60e*mggRlh$!%w{vxRVubfB)?xD z%uF-6TrR&=D#T7F$XhnHTQ<8@GrvzS!&)u0T0F*7D!Wi9zgaW9SS-I)D#TbZ##ArA zQ7x}vJ;7Hi!&NH9QZcVzKfhNm!%{83R4TwyFt=Mey;L;1S2x2`FSA@ZxK=i~S~a#< zIkaCqx>z-`TRFK_GqPPjuV6l~UOl{8Hn3hkv0Od6S2eO;JGNOjwOu^6TR62`I(|Nq7Q{lfkGzWn*T`}nx}_O&=Yl#f9Imblt3S z+p2Kcr*7A!Y|WZv%$H)ukX^)!Tf>T4z=l}9gIBwLRJwdqxOq{wbx^f*PqcGRvvN+c zZ%namORsB6u4+oIX-TYRNULQ>t7J#2V@9`89ZvuN0AX}ePE!B@0s{mE1_uZV3k(eo z4i69!5fT#=7Z@5F9334VA0QwiBqb*&DJv{5FflVUH9I^#K0!f3LrF?ZQBzb{Xlre7 zeSw39k&>UJrl+Tev z25^&*M52fYA}U!6D)!#X?%I1p>~$1-?_D&a;`dj3m>A$ekaPB7U;N(goZp!{Co?y3 zaX+D9dA%vkF56NQ1eVr9g2g7=)69CF)r>CD_IqGv8B3#G*(Q-?h2&oyBa2v>9sZM% z$TO-*ZW_mD=DIVC#`MlNoopRF0An>3qrl_IHu3D8DL|`4k$DQ2 z9-`*(84L699j~h8+6CNZdaMGxl3=#(frp(?t)P?(pnUj4i^TK%vO&n&?q?K~>jEej z2t&lH5JGmelRu%7B1bgjMI9e$r(ioD3jYm-wX2N<)#+krR}v8g^NM0F22@5-&NqnO zojp1#qR1K@<ozsNXp7g5x(9d%rOk}e}5GpJ3kO09L~xv00000NkvXXu0mjflHSX~ literal 0 HcmV?d00001 diff --git a/static/songbook.png b/static/songbook.png new file mode 100644 index 0000000000000000000000000000000000000000..8701cc126469cc2d1c46028d88b8b71a6e5bc2d6 GIT binary patch literal 4861 zcmVPx#1ZP1_K>z@;j|==^1pojNr%6OXRCwCWovoLvJ`>0LCtSI<5{bkjk;qtNBod26 zBC$v$5{s-vVv)$o`JI_0Fr?w7yWM@Bd(ND_cemS?Pv<*t3AwkM^`{8}_@vc)=KH^6 zj@SC+_1w<>{2I6)f~hPk9af#d{8fPeFW`C5&ALT_vF@6KD$b z!UU!+gGZAn*q*m9=N*uL3ebjj2n(Uu5;R^V#3I2hs0jc%0H^?loZt*?3Xdj*M=hbR zB>`*^poZ9%5}rd2O%Z{--|0j83y8PxKs$n!@4!l<2+Az8B#3_=N`_+rbDt5cnb|~^ z!qlcPw&?=W1+l9oJRcckkx#E*T!qL$eiWd2QVz_O33+fgu!=N=wyt3u27u?2#jJ*4 zJ#AQhM&CQKS;Hid+8YTXlk-53qHehpERbAQx{`l3pN|2~2$kbsmxT^LY3h5N}8D3^>YeMuO;78wna2 zHWc9TV&{H^bmUnaT3-p6dkHY407FKx&uJQ_lDqOogxC>81rYx}KQc%opWb`!fLMJ9 z;_V0?#gQadGTgwbNQSm&yuf+!EZa1YserB$5P5fK%V-O6WVQjBEn#2-QG4OgW-xY2 z%62^bB*fbhyfTdep0)BU^Tu~C=uP9lI~VXAG6=rD!2kLJ5qj`wVt_FP7_;qb^4DG< zYENW|1r5ElE#pPXg#%#q!^E-$sAC?!Sd~TqP|}<0tAxIi*9!Xq);_Wo7JM@I9cqcs%?L#9e^7ZoTRvB6zh1h!XBJz?qVXBO_md z=!D10nrBH;i!`)U+Zo8v`-0kld`Nnac2+j=5C;xd;^9?@y8vqruv!5s8M^>pfaoZQ zjbXQfzdQHo0#NFhWkcKpiFIU|1~9e)#x{BJLNuJ@l=A0N-T*WM0s`nEK%BiPfQ`<= z1|YtvB@XU-;SNNr5H^8-DZU9}P922c0Liuh4MYx-!^{LG!WbU4djBRQ^}0)uq4yCf z-|YHNXb-IN80uUsaS&r5+E6QrxB*%aPXInOK-Kc4>UpPvMpCgYW33KxU@nlk^eMZq zQyW3@o*bpkWr!|-#sh^;A_%Zz0P$1A(&kXcXIXj2`w-lu4S$aEi*zYtq+5s(#zzND zS<)O40h^2+AAk&WL5{5=Cc}nQr3Mc8L4CWl(GXuHi~zF`%50Uf4Nw);2VQuXM6wM) z4i8OvcLqt|ZOa+&u1Xf1@BqMbo}q0T$fbnX^ENOSV-Ry05JU_~bWK>-J~HZ3z7-D* zz}f+@NCR4=vEv}d4+C&QFC2Ef@S6ZhTCFNK@I#EWMe&EI9hkgM9VQKSiDZ2n-z!tuWgDx3Av=<`4 z-DL8P2Rb0q_j*Z%GKUb}@2b{Ah!5Mc6)aTneAbYJ{`&hmvB=opcwtNNFeRrsld{VT zHvoAiF0DA&EOBs^v9q;%1E88CDuDA#98AgMBJG6+0Ld7E^_D$S_S`8=l7=B&!hq0T zh#vxvg{UyRCX}-9k4u|N08Jc}k+)>yjf{07F8M>1i2rh-mbjlUiX5Er6I& zpS|2ZzGDy#KYHgywrt8%4)%C?NY7|U~hbRvSe{EzMsqZ?PM}!hY+9K zqo$lDFM&=1JQ+-FLa%GgfK(8Tcc(NW!x}K+Vc_eF+C^Smlfv}cGJa@BQho(!Eryr6 z^2Zm<6JL9wOU4q0Cb=%-!2-CE@=h!pQi_8%KY`mh!AjVW1ZD z{!MX>*G4rjwR%#mrC4jr*8wsan`Gk7#&0B(!2!^sq69+*5dWS;9<^u> zR+k!xPYdGnA?Z3IU3g=^j8avDhOHM?Iv(P4A4&NVK&fK}&IV0a;+F9RFLZg|kTFkT z7p&o#=frpwG8u<@-2{_KSFzGczmK`oae47*2}$TJ@G&txA1VC~#`6tCeT`$69!mKT zpebiE9XId=IY26^mt>-4eB^~2c+z$r1-U@<(J2>LpLp^0E@W0*PtQ!8L-gz~aR zKjVNFl#m&FGMN#2BHFJ zR{P+Y)A#Xl2BJ&KxFCfChs5^|w}~7AT(a>?Z!BJ9O!3E*Gz&aQ>%0g9FTnrzkIZ<3 z%k0PTGA3p+j)S`{NA|stAYu#*)Q9#!?|&BbGkgp_R?Q3z#I-iWYgMa!!nsZ46kx%! zv1;wyH6gx%L3`nBN}5r59(swVq44F(Xvac_MGPG8D10hMA_u@^1=uNok$;D>h*i5s z>n3u6sJu`*rEKCMCbGR9U$@;oeVRHo^4_*4w6pORpn}&{(FPm`ab}U@@qz&~GRC0? z)pTsl#>jYyg+mG=^wscTR`OMaxRU6ZlyPc9`woqit*ykjqfL=K8`~3_m)K(f>a2}a8pR)(6RHJ1W)tVGjI@L`K&^(c)$fJYk98GbGP4Wf zfs`A)O{C5u%F4w%08KW=PaTsP9e|6BV{cc+2oT@Ypj#xW3896qtw99- z0#f`SshD~(@;#U)Rj^~rrvNf9v_K97R{_Fy?y;C4aAP9~CVs{5Q?E^(j)Is*YRw!u zpemh7SQT)-K+3B}T?$ zn=r4CE68U_TZH?rgCfg71i@i z^+{Ri9K5B(jY~Mpz#bmMhN~O7UA>2m%UC*OtTtgLORzRx$j3&ef2Msfv?MvfJkKx; z13|@g-lnd}@D_=#ZQ=2F&?+0iyaCrSST$LwEn*fzvseIi7C56mc&Q0ZGMSfTg7GBTjE)S*&U7+Z0(E-lDXsOEdWo`B zHs|Ekg9};~l2z7M1Xbq&R4Lw&s9@nR!DmAYSD($}ZlsHJR8y+~l6+bGy9CfBV|+mz z_hWj0@j_G5v?_Q%C_uBOoq_DR)!VjEnGWdXD!s;d8;7M0rHHXBiEs&2Pj(!G3>%tc zdvMH7FjN`>oHRgJ{Br`lB4eIRY%ipE*QhvXAesh$Xx3`q*fs&EppMXnI)*|2yDL@9 zGEzhv_YV8KpLO4Ri*rwtcW=Je2;=t`;yWVvGY!BKIxWc}J-U5hDU;yU30N<2x z!QzCO6S|U#YO93yLP34B_w}Y6ElIk1X%6i&I0rm)XQ}~+Nec_a*5{_PZ7nmci+0d?f-Y&peEQPcaU~}=@gWY6uAY%>?WgD<5wb&Ud z$TMILFFOP0f_DWV)|*DcvEHZ62MMPD&%DrND-o<-$g{EWLIhYy|8T&X?%58kZ^JwA zK6`M2g*pPnJE*Ec(8AKD7PRk`d&dh4=bSLw#6hYF5nwB5yPTP5$Zr687n&2?1$ewn zLx5Pb(lP~0AjLp`F3Azw+P7^xgSF?}qK@ zy-T%)q!cua#kjbcNFN<%a&=B>)FpJ=g4xLZSK#s!V00V+o`_Tw@aQ@k zt*KrA4NZs48i^Wss1EAT1App;wCGes+fhH=pqS9DRUF{ng?`Fjj*&81AK!DD5-@eb z$gJ-@Dbz+NzH>p3_=iRfG-#ISd)qaUcaC#9TKbf1?HE_IIKXF@(3-*?z%%d3FFJ-b3Mwp zr_q;>emaB5OB#G5WvXteGTjIQ#HmYsf4w`hbU<_gv!O}6$63o##j=M2Hl)k?w25J6 zh=GIHTubr@7>Bliv*29<_!dN#OfcheFI2-+v9v?E)l!|EAGmm#5L9BQgMgm;gg3S8 zYHm#&6EJBn!&Nt&TuWVp+R!$@*!wD(?d{ILe0tl}q~i9%cv);hFSIl9t}OBI`T(=0 zs+gCJ`iQAqFXC%ptsax*deseO>0R(LJ`Z$2bHQsEyvxVmU503tG-?N_+P{Zh(luhe zo!<)nujK_h8jm(cO3LPQCulT=3*fEElEHnm>tQ#RSqbbawAzC9v-1NFAlmI6#v7B7 z>8JoGpe{2=!Vr=mPzNxUC7t@V0$bx4ZBpu0X@O-0j{7n2qld+gZ6fkSnj2^rZzlZc z36_^2vW$!}!qt5Panwz@IvNkQMJ(->T7f+~B~9aH!aw&g4(un;>c2h$)P~5r6U=zD z9H}98%hIRW1i8jB^f0W&a$#z*lQ_1wzVS_H^Px#1ZP1_K>z@;j|==^1poj5v`|b`MF0Q*|9=3gRaL(~Kg?z`)Kx0BNF={sAI4NT z$XhnMRWrX&FT+|byHF^?R4}|)EWcGM#8@%GS1ZF+D#KDOzf>x@S~a&@IJsIkuV6mF zQ!Tb#JhWXrvR*pDQ!leyI<8+qtzbc`VneK9M66;%s$xW}VMMB8MXO>&t71i}Vn(ZD zM5|&%sbfZ}V@9cBMyg^(|Nq7M_OBon|idw>nTET}|zJgZ0fmW(xMp6Ab z5&!@IF?3Q+Qvd=31O)~M2nh}k5D^m<7Z@5H9wH<#GBZ6rKSV}GPMe&)zrfAW?C$XJ z@$~lh`~9=>CiwsW0P#sgK~#9!)zMpTfHGix%Zp8b z88_O*MANw=dEV@V(X@X*4O93*7?l$SzAzgMnY{#TlAg(sI59vX81jK%Hh|Aiph5vd zp$dfzMJg1jP<`v`(4U^W@lL>4o_Bl}MVh8t!s}l^P3L)%ex9OwYq;^dYA4d#gD)J4 zJTEAstuw<;abViEGpwaqWBybk+O`+S#}d)jdBsM4ZSm$-h_v?T2m4~RD)#su z+SPNUHCk~d?~=tWqgtG{4{mpwE|=-_#cfu Motif: {{ name }} - +
+

Motif Icon {{ name }}

+
-

Clips:

-
    -{% for song_id, motif_id, song in clip_info %} -
  • - - {{ song }} -
    • -{% endfor %} -
- +
+

Songs Featured:

+
    + {% for song_id, motif_id, song in clip_info %} +
  • + + {{ song }} +
    • + {% endfor %} +
+
{% endblock %} \ No newline at end of file diff --git a/templates/motifindex.html b/templates/motifindex.html index 2445c85..75054dd 100644 --- a/templates/motifindex.html +++ b/templates/motifindex.html @@ -12,7 +12,8 @@
  • {{ motif }}
    • - {% if count %}x{{ count }}{% endif %} + Song Icon + {% if count %}x {{ count }}{% endif %} {% endfor %} @@ -27,7 +28,8 @@
  • {{ motif }}
    • - {% if count %} x{{ count }} {% endif %} + Song Icon + {% if count %}x {{ count }} {% endif %} {% endfor %} diff --git a/templates/nav.html b/templates/nav.html index a577218..a6035ee 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,9 +1,9 @@
    diff --git a/templates/song.html b/templates/song.html index a65fa5d..57d5ba1 100644 --- a/templates/song.html +++ b/templates/song.html @@ -1,13 +1,21 @@ {% extends "base.html" %} -{% block title %}{{ name }}{% endblock %} +{% block title %} +{% for name, _ in song_info %}{{ name }}{% endfor %} +{% endblock %} {% block content %} -
    -

    {{ name }}

    - {% for track, _, _, album_code in album_info %} - {{ album_code }}{% if not loop.last %}, {% endif %} +
    + Song Icon + {% for name, name_jp in song_info %} +

    {{ name }}

    + {% if name_jp %} +

    {{name_jp}}

    + {% endif %} {% endfor %} -
    + {% for track, _, _, album_code in album_info %} +

    {{ album_code }}{% if not loop.last %}, {% endif %}

    + {% endfor %} + @@ -16,7 +24,7 @@

    Artist:

      {% for name, name_rm, credit in artist_info %} -
    • {{ name_rm }} ({{ name }}): {{ credit }}
      • +
    • {{ credit }}: {% if name_rm %}{{ name_rm }} - {% endif %}{{ name }}
      • {% endfor %}
    @@ -27,21 +35,21 @@

    Album:

    -
    -

    Motifs Used:

    +
    +

    Motifs Featured:

    diff --git a/templates/songindex.html b/templates/songindex.html index e82ef9b..039b7eb 100644 --- a/templates/songindex.html +++ b/templates/songindex.html @@ -10,10 +10,9 @@
      {% for song_id, album, track, name, name_jp, count in song_info if album_id == album %} @@ -24,7 +23,8 @@ {{ name }} {% if name_jp %}{{ name_jp }}{% endif %} - x{{ count }} + Motif Icon + x {{ count }} {% else %}