Mercurial > dottes

changeset 361:265539086836 build-default-159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Wed, 21 Aug 2013 10:32:59 +0100
parents 9aa6a0f09b19 (diff) 01ded8741361 (current diff)
children a8ec8389b117 e4d6a612c755
files dottes.html.footer dottes.html.header makeWeb.sh
diffstat 11 files changed, 53 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 21 10:32:50 2013 +0100
+++ b/.hgtags	Wed Aug 21 10:32:59 2013 +0100
@@ -1,2 +1,3 @@
 6bcafbfac6747b619ab8b99c3bcf662171c63d2e build-default-156
 c79382d6026befece54a9da29a1c64e2b2ef2443 build-default-157
+6d4b2dab5fccda11d66fea2f47e153243dcc704d build-default-158
--- a/Session/DearTobacco.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/DearTobacco.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -7,4 +7,4 @@
    "Em" B E E F | "G" G/F/E/D/ "D" F2 | "Em" B E E c | "G" d c B "D" A |
    "Em" B E E F | "G" G/F/E/D/ "D" F2 | "D" D>E D c | "G" d c B "D" A :|
    "Em" B e e f | "D" g/f/e/d/ f2 | "Em" B e e f | "C" g e "D" f d |
-   "G" B d d "A" e | "G" d/c/B/c/ d2 | "D" F A A F | "D" d c  :|
+   "G" B d d "A" e | "G" d/c/B/c/ d2 | "D" F A A F | "D" d c B A :|
--- a/Session/EmmaFromFinland.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/EmmaFromFinland.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -6,6 +6,6 @@
 Q: 140
 K: FMaj
 D/F/ |: "Dm" A2 A | F D F | A2 A | F D D/F/ |
-"A7" E2 E/F/ | G F E | [1 "Dm" D>EF/G/ | A2 D/F/ :| [2 D3 | "n.c." D F A |]
+"A7" E2 E/F/ | G F E | [1 "Dm" D>EF/G/ | A2 D/F/ :| [2 "n.c." D3 | D F A |]
 "Gm" d2 d | d c B | "Dm" A2 A | A G F |
 "A7" E2 E/F/ | G F E | [1 "Dm" D3 | "n.c." D F A :| [2 "Dm" D3 | D2 |]
--- a/Session/HorsesBrawl.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/HorsesBrawl.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -12,5 +12,5 @@
 "G" G>A B B | "D" c B A c | "Em" B G "D" A F | "G" G2 G2 :|
 "D" d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G F "G" G | "D" A2 A2 |\
        d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G G F | "G" G2 G2 :|
-"Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | A B A G |\
+"Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | A _B A G |\
    "Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | G F "G" G2 :|
--- a/Session/KingOfTheFairies.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/KingOfTheFairies.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -7,7 +7,7 @@
 N: Change: LanigansBall.abc
 K: Em
 B,2 |\
-|: "Em" (ED)uEvF (GF)vGuA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B,2 |
+|: "Em" (ED)uEvF (GF)vGuA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |
 "Em" (ED)EF (GF)GA | (BA)(GB) "D" d3 c | "Em" B2E2 "Bm" (GF)(ED) |\
 [1 "Em" E6 B,2 :| [2 "Em" E6 z2 |]
 "Em" e2 e2 (Bd)uevf | (ga)vguf "C" e3 f | "Em" e2 B2 (BA)uBv^c |\
--- a/Session/PlaneTree.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/PlaneTree.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -10,5 +10,5 @@
 K: Emin
 "Em" EGB EGB| "Am" cBA "G" B2 B| "C" cde "D" dcB| "D" AGA "B" B2 B |
    "Em" EGB EGB| "Am" cBA "G" B2 B| "C" cde "D" dcB| "D" AGF "Em" E3:|
-"C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "D" AGA "Bm" B B|
+"C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "D" AGA "Bm" B2 B|
    "C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "B" AGF "Em" E3:|
--- a/Session/Railway.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/Railway.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -4,6 +4,7 @@
 L: 1/8
 Q: 160
 K: Gmaj
+N: Change: FieryClockFace.abc
 D | "G" G2 G GBd | g2 d d2 d | "Am" e2 d c2 B | "D7" ABA FED |
     "G" G2 G GBd | g2 d d2 d | "C" edc "G" BAG | "D7" A3 "G" G2 :|
 d | "G" b2 b b2 a | g2 g g2 d | "C" e2 d efg | "D" a2 g fed |
--- a/Session/WinsterGallop.abc	Wed Aug 21 10:32:50 2013 +0100
+++ b/Session/WinsterGallop.abc	Wed Aug 21 10:32:59 2013 +0100
@@ -3,7 +3,7 @@
 M: C
 N: Change: SalmonTails.abc
 L: 1/4
-Q: 240
+Q: 210
 R: polka
 K: Gmaj
 "G" GB GB | GB d2 | "D7" A>c BA | "G" GB d2 |
--- a/dottes.html.tune	Wed Aug 21 10:32:50 2013 +0100
+++ b/dottes.html.tune	Wed Aug 21 10:32:59 2013 +0100
@@ -41,16 +41,25 @@
           Change: <a class="dottes-change-link"
                      href="@CHANGETUNE@">@CHANGETITLE@</a>
         </div>
-        <ul class="tune-data-list">
-          <li><a class="dottes-link-tune dottes-pdf"
-                 href="@TUNE@.pdf">PDF</a></li>
-          <li><a class="dottes-link-tune dottes-midi"
-                 href="../@MASTERBOOKE@/@TUNE@.mid">MIDI</a></li>
-          <li><a class="dottes-link-tune dottes-mp3"
-                 href="../@MASTERBOOKE@/@TUNE@.mp3">MP3</a></li>
-          <li><a class="dottes-link-tune dottes-abc"
-                 href="@TUNE@.abc">ABC</a></li>
-        </ul>
+        <div class="dottes-tune-footer">
+          <div class="dottes-tune-footer-row">
+            <div class="dottes-tune-footer-left">
+              <ul class="tune-data-list">
+                <li><a class="dottes-link-tune dottes-pdf"
+                       href="@TUNE@.pdf">PDF</a></li>
+                <li><a class="dottes-link-tune dottes-midi"
+                       href="../@MASTERBOOKE@/@TUNE@.mid">MIDI</a></li>
+                <li><a class="dottes-link-tune dottes-mp3"
+                       href="../@MASTERBOOKE@/@TUNE@.mp3">MP3</a></li>
+                <li><a class="dottes-link-tune dottes-abc"
+                       href="@TUNE@.abc">ABC</a></li>
+              </ul>
+            </div>
+            <div class="dottes-tune-footer-right">
+              Last changed @LASTCHANGED@
+            </div>
+          </div>
+        </div>
       </div>
     </div>
 
--- a/makeWeb.sh	Wed Aug 21 10:32:50 2013 +0100
+++ b/makeWeb.sh	Wed Aug 21 10:32:59 2013 +0100
@@ -92,6 +92,7 @@
         if [ -n "$credit" ]; then
             creditvisibility="yes"
         fi
+        lastchanged=`hg log --limit 1 --template "{date|shortdate}" $filename`
 
         # Copy the ABC into the web.
         cp $filename $webdir
@@ -110,6 +111,7 @@
             -e "s/@CHANGEVISIBILITY@/${changevisibility}/" \
             -e "s/@CREDIT@/${credit}/" \
             -e "s/@CREDITVISIBILITY@/${creditvisibility}/" \
+            -e "s/@LASTCHANGED@/${lastchanged}/" \
             -e "s/@TUNE@/${name}/" dottes.html.tune > $webdir/$tunepage
 
         sed -e "s/@TITLE@/${title//&/\&}/" \
--- a/web/css/dottes.css	Wed Aug 21 10:32:50 2013 +0100
+++ b/web/css/dottes.css	Wed Aug 21 10:32:59 2013 +0100
@@ -170,6 +170,30 @@
     width: 25%;
 }
 
+div.dottes-tune-footer
+{
+    display: table;
+    width: 100%;
+}
+
+div.dottes-tune-footer-row
+{
+    display: table-row;
+}
+
+div.dottes-tune-footer-left
+{
+    display: table-cell;
+    width: 50%;
+}
+
+div.dottes-tune-footer-right
+{
+    display: table-cell;
+    text-align: right;
+    width: 50%;
+}
+
 a.dottes-tune-link
 {
     font-size: 20px;