Mercurial > dottes
diff dottes.html.learnertune @ 589:5db7e72d4219 build-default-240
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
| author | Jim Hague <jim.hague@acm.org> |
|---|---|
| date | Wed, 02 Nov 2016 00:21:30 +0000 |
| parents | afc031477784 |
| children | 2fe68733ec17 |
line wrap: on
line diff
--- a/dottes.html.learnertune Sat Oct 29 22:41:44 2016 +0100 +++ b/dottes.html.learnertune Wed Nov 02 00:21:30 2016 +0000 @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8" /> - <title>Cry Havoc tunes - learning @TITLE@</title> + <title>Cry Havoc tunes - learning ${title}</title> <link rel="stylesheet" href="../css/reset.css" /> <link rel="stylesheet" href="../css/text.css" /> <link rel="stylesheet" href="../css/960.css" /> @@ -33,7 +33,7 @@ <div class="dottes-tune-header"> <div class="dottes-tune-header-row"> <div class="dottes-tune-header-left"> - <a class="dottes-tune-icon-link" href="@TUNE@.html"> + <a class="dottes-tune-icon-link" href="${name}.html"> <img class="dottes-tune-table-image" src="../img/music.png" alt="Dottes"> </a> @@ -43,15 +43,15 @@ </a> </div> <div class="dottes-tune-header-middle"> - <h1>@TITLE@</h1> - <h2>@SUBTITLE@</h2> + <h1>${title}</h1> + <h2>${subtitle}</h2> </div> <div class="dottes-tune-header-right"> - <em>@COMPOSER@</em> + <em>${composer}</em> </div> </div> </div> - <p>@TITLE@ is in the key of @KEY@. + <p>${title} is in the key of ${key}. <div class="dottes-tune-footer"> <div class="dottes-tune-footer-row"> <div class="dottes-tune-footer-left"> @@ -59,14 +59,14 @@ </div> <div class="dottes-tune-footer-centre"> <audio controls loop> - <source src="../@MASTERBOOKE@/normal-@TUNE@.mp3" type="audio/mpeg" /> - <source src="../@MASTERBOOKE@/normal-@TUNE@.ogg" type="audio/ogg" /> + <source src="../${masterbooke}/normal-${name}.mp3" type="audio/mpeg" /> + <source src="../${masterbooke}/normal-${name}.ogg" type="audio/ogg" /> <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> - <param name="FileName" value="normal-@TUNE@.mp3" /> + <param name="FileName" value="normal-${name}.mp3" /> <param name="autoStart" value="false" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> - <object type="audio/mpeg" data="normal-@TUNE@.mp3"> + <object type="audio/mpeg" data="normal-${name}.mp3"> <param name="controller" value="true" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> @@ -77,9 +77,9 @@ <div class="dottes-tune-footer-right"> <ul class="tune-data-list"> <li><a class="dottes-link-tune dottes-mp3" download - href="../@MASTERBOOKE@/@TUNE@.mp3">MP3</a></li> + href="../${masterbooke}/${name}.mp3">MP3</a></li> <li><a class="dottes-link-tune dottes-ogg" download - href="../@MASTERBOOKE@/@TUNE@.ogg">OGG</a></li> + href="../${masterbooke}/${name}.ogg">OGG</a></li> </ul> </div> </div> @@ -89,14 +89,14 @@ </div> <div class="dottes-tune-footer-centre"> <audio controls loop> - <source src="../@MASTERBOOKE@/littleslow-@TUNE@.mp3" type="audio/mpeg" /> - <source src="../@MASTERBOOKE@/littleslow-@TUNE@.ogg" type="audio/ogg" /> + <source src="../${masterbooke}/littleslow-${name}.mp3" type="audio/mpeg" /> + <source src="../${masterbooke}/littleslow-${name}.ogg" type="audio/ogg" /> <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> - <param name="FileName" value="littleslow-@TUNE@.mp3" /> + <param name="FileName" value="littleslow-${name}.mp3" /> <param name="autoStart" value="false" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> - <object type="audio/mpeg" data="littleslow-@TUNE@.mp3"> + <object type="audio/mpeg" data="littleslow-${name}.mp3"> <param name="controller" value="true" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> @@ -107,9 +107,9 @@ <div class="dottes-tune-footer-right"> <ul class="tune-data-list"> <li><a class="dottes-link-tune dottes-mp3" download - href="../@MASTERBOOKE@/littleslow-@TUNE@.mp3">MP3</a></li> + href="../${masterbooke}/littleslow-${name}.mp3">MP3</a></li> <li><a class="dottes-link-tune dottes-ogg" download - href="../@MASTERBOOKE@/littleslow-@TUNE@.ogg">OGG</a></li> + href="../${masterbooke}/littleslow-${name}.ogg">OGG</a></li> </ul> </div> </div> @@ -119,14 +119,14 @@ </div> <div class="dottes-tune-footer-centre"> <audio controls loop> - <source src="../@MASTERBOOKE@/slow-@TUNE@.mp3" type="audio/mpeg" /> - <source src="../@MASTERBOOKE@/slow-@TUNE@.ogg" type="audio/ogg" /> + <source src="../${masterbooke}/slow-${name}.mp3" type="audio/mpeg" /> + <source src="../${masterbooke}/slow-${name}.ogg" type="audio/ogg" /> <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> - <param name="FileName" value="slow-@TUNE@.mp3" /> + <param name="FileName" value="slow-${name}.mp3" /> <param name="autoStart" value="false" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> - <object type="audio/mpeg" data="slow-@TUNE@.mp3"> + <object type="audio/mpeg" data="slow-${name}.mp3"> <param name="controller" value="true" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> @@ -137,9 +137,9 @@ <div class="dottes-tune-footer-right"> <ul class="tune-data-list"> <li><a class="dottes-link-tune dottes-mp3" download - href="../@MASTERBOOKE@/slow-@TUNE@.mp3">MP3</a></li> + href="../${masterbooke}/slow-${name}.mp3">MP3</a></li> <li><a class="dottes-link-tune dottes-ogg" download - href="../@MASTERBOOKE@/slow-@TUNE@.ogg">OGG</a></li> + href="../${masterbooke}/slow-${name}.ogg">OGG</a></li> </ul> </div> </div> @@ -149,14 +149,14 @@ </div> <div class="dottes-tune-footer-centre"> <audio controls loop> - <source src="../@MASTERBOOKE@/veryslow-@TUNE@.mp3" type="audio/mpeg" /> - <source src="../@MASTERBOOKE@/veryslow-@TUNE@.ogg" type="audio/ogg" /> + <source src="../${masterbooke}/veryslow-${name}.mp3" type="audio/mpeg" /> + <source src="../${masterbooke}/veryslow-${name}.ogg" type="audio/ogg" /> <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> - <param name="FileName" value="veryslow-@TUNE@.mp3" /> + <param name="FileName" value="veryslow-${name}.mp3" /> <param name="autoStart" value="false" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> - <object type="audio/mpeg" data="veryslow-@TUNE@.mp3"> + <object type="audio/mpeg" data="veryslow-${name}.mp3"> <param name="controller" value="true" /> <param name="autoplay" value="false" /> <param name="playCount" value="100000" /> @@ -167,9 +167,9 @@ <div class="dottes-tune-footer-right"> <ul class="tune-data-list"> <li><a class="dottes-link-tune dottes-mp3" download - href="../@MASTERBOOKE@/veryslow-@TUNE@.mp3">MP3</a></li> + href="../${masterbooke}/veryslow-${name}.mp3">MP3</a></li> <li><a class="dottes-link-tune dottes-ogg" download - href="../@MASTERBOOKE@/veryslow-@TUNE@.ogg">OGG</a></li> + href="../${masterbooke}/veryslow-${name}.ogg">OGG</a></li> </ul> </div> </div>