chiark / gitweb /
~mdw / disorder / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b43dc0c)
more template fiddling
authorRichard Kettlewell <rjk@greenend.org.uk>
Sat, 17 May 2008 12:07:18 +0000 (13:07 +0100)
committerRichard Kettlewell <rjk@greenend.org.uk>
Sat, 17 May 2008 12:07:18 +0000 (13:07 +0100)
templates/macros.tmpl patch | blob | blame | history
templates/new.tmpl patch | blob | blame | history
templates/recent.tmpl patch | blob | blame | history

diff --git a/templates/macros.tmpl b/templates/macros.tmpl
index b4715995ea1cb81107180595255496de78306cf1..11ba25ccf1b1f667bcf670160ed4f2545fd871ed 100644 (file)
--- a/templates/macros.tmpl
+++ b/templates/macros.tmpl
@@ -36,9 +36,6 @@ and then redefines macros as desired.
 @#  @name is the name of this page, for the <title> element
 @define {stdhead} {name}
         {@quiethead
 @#  @name is the name of this page, for the <title> element
 @define {stdhead} {name}
         {@quiethead
-<link rel=stylesheet
-      type="text/css"
-      href="@label{url.static}/disorder.css">
 <title>@label{@name.title}</title>}
 
 @# Non-displaying <head> text
 <title>@label{@name.title}</title>}
 
 @# Non-displaying <head> text
@@ -170,3 +167,12 @@ and then redefines macros as desired.
                   width=@width height=@height
                   title="@label{playing.@q{@dir}verbose}"
                   alt="@label{playing.@dir}">}}
                   width=@width height=@height
                   title="@label{playing.@q{@dir}verbose}"
                   alt="@label{playing.@dir}">}}
+
+Local variables:
+mode:sgml
+sgml-always-quote-attributes:nil
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+fill-column:79
+End:
diff --git a/templates/new.tmpl b/templates/new.tmpl
index 2185c4bb2fdf3fb5f3fb4d547d800533fd6131f4..e017a740fe664720cb5bd6bacad53e693e98a7fc 100644 (file)
--- a/templates/new.tmpl
+++ b/templates/new.tmpl
@@ -24,50 +24,38 @@ USA
  </head>
  <body>
 @stdmenu{new}
  </head>
  <body>
 @stdmenu{new}
-  <h1>@label:new.title@</h1>
+  <h1>@label{new.title}</h1>
 
 
-@#{only display the table if there is something to put in it}@
-@if{@isnew@}{
+@# Only display the table if there is something to put in it
+@if{@isnew}{
   <table class=new>
     <tr class=headings>
   <table class=new>
     <tr class=headings>
-     <th class=artist>@label:heading.artist@</th>
-     <th class=album>@label:heading.album@</th>
-     <th class=title>@label:heading.title@</th>
-     <th class=length>@label:heading.length@</th>
+     <th class=artist>@label{heading.artist}</th>
+     <th class=album>@label{heading.album}</th>
+     <th class=title>@label{heading.title}</th>
+     <th class=length>@label{heading.length}</th>
 @right{prefs}{
 @right{prefs}{
-     <th class=button>&nbsp;</th>}@
+     <th class=button>&nbsp;</th>}
     </tr>
     @new{
     </tr>
     @new{
-    <tr class=@parity@>
-     <td class=artist>@right{play}{<a class=directory
-       title="@part{artist}@"
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
-       >@part{short}{artist}@</a>}{<span class=directory
-       title="@part{artist}@"
-       >@part{short}{artist}@</span>}@</td>
-     <td class=album>@right{play}{<a class=directory
-       title="@part{album}@"
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
-       >@part{short}{album}@</a>}{<span class=directory
-       title="@part{album}@"
-       >@part{short}{album}@</span>}@</td>
-     <td class=title>@right{play}{<a class=file
-       title="@part{title}@"
-       href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@"
-       >@part{short}{title}@</a>}{<span class=file
-       title="@part{title}@"
-       >@part{short}{title}@</span>}@</td>
-     <td class=length>@length@</td>
-@right{prefs}{
-     <td class=imgbutton><a class=imgbutton
-      href="@url@?action=prefs&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@image:edit@"
-       title="@label:choose.prefsverbose@"
-       alt="@label:choose.prefs@"></a></td>
-    </tr>}@
-    }@
+    <tr class=@parity>
+     <td class=artist>@martist{new}{@track}</td>
+     <td class=album>@malbum{new}{@track}</td>
+     <td class=title>@mtitle{new}{@track}</td>
+     <td class=length>@length{@id}</td>
+     @right{prefs}{
+     <td class=imgbutton>
+      <a class=imgbutton
+         href="@url?action=prefs&#38;0_file=@urlquote{@track}">
+       <img class=button src="@image{edit}"
+            title="@label{choose.prefsverbose}"
+            alt="@label{choose.prefs}">
+      </a>
+     </td>
+    </tr>}
+    }
   </table>
   </table>
-}@
+}
 
 @credits
  </body>
 
 @credits
  </body>
diff --git a/templates/recent.tmpl b/templates/recent.tmpl
index e8590c7c9604b35d269a38fa0ff3802891cf1d03..8f3fd9c61e20fe79fa49860624b6fe4e41171010 100644 (file)
--- a/templates/recent.tmpl
+++ b/templates/recent.tmpl
@@ -24,50 +24,41 @@ USA
  </head>
  <body>
 @stdmenu{recent}
  </head>
  <body>
 @stdmenu{recent}
-  <h1>@label:recent.title@</h1>
+  <h1>@label{recent.title}</h1>
 
 
-@#{only display the table if there is something to put in it}@
-@if{@isrecent@}{
+@# Only display the table if there is something to put in it
+@if{@isrecent}{
   <table class=recent>
     <tr class=headings>
   <table class=recent>
     <tr class=headings>
-     <th class=when>@label:heading.when@</th>
-     <th class=who>@label:heading.who@</th>
-     <th class=artist>@label:heading.artist@</th>
-     <th class=album>@label:heading.album@</th>
-     <th class=title>@label:heading.title@</th>
-     <th class=length>@label:heading.length@</th>
-@right{prefs}{
-     <th class=button>&nbsp;</th>}@
+     <th class=when>@label{heading.when}</th>
+     <th class=who>@label{heading.who}</th>
+     <th class=artist>@label{heading.artist}</th>
+     <th class=album>@label{heading.album}</th>
+     <th class=title>@label{heading.title}</th>
+     <th class=length>@label{heading.length}</th>
+     @right{prefs}{<th class=button>&nbsp;</th>}
     </tr>
     @recent{
     </tr>
     @recent{
-    <tr class=@parity@>
-     <td class=when>@when@</td>
-     <td class=who>@who@</td>
-     <td class=artist>@right{play}{<a class=directory
-       title="@part{artist}@"
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
-       >@part{short}{artist}@</a>}{<span class=directory
-       title="@part{artist}@"
-       >@part{short}{artist}@</span>}@</td>
-     <td class=album>@right{play}{<a class=directory
-       title="@part{album}@"
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
-       >@part{short}{album}@</a>}{<span class=directory
-       title="@part{album}@"
-       >@part{short}{album}@</span>}@</td>
-     <td class=title><span
-       title="@part{title}@">@part{short}{title}@</span></td>
-     <td class=length>@length@</td>
-@right{prefs}{
-     <td class=imgbutton><a class=imgbutton
-      href="@url@?action=prefs&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@image:edit@"
-       title="@label:choose.prefsverbose@"
-       alt="@label:choose.prefs@"></a></td>
-    </tr>}@
-    }@
+    <tr class=@parity>
+     <td class=when>@mwhen{recent}{@id}</td>
+     <td class=who>@mwho{recent}{@id}</td>
+     <td class=artist>@martist{recent}{@track}</td>
+     <td class=album>@malbum{recent}{@track}</td>
+     <td class=title>@mtitle{recent}{@track}</td>
+     <td class=length>@length{@id}</td>
+     @right{prefs}{
+     <td class=imgbutton>
+      <a class=imgbutton
+         href="@url?action=prefs&#38;0_file=@urlquote{@track}">
+       <img class=button src="@image{edit}"
+            title="@label{choose.prefsverbose}"
+            alt="@label{choose.prefs}">
+      </a>
+     </td>
+    </tr>}
+    }
   </table>
   </table>
-}@
+}
 
 @credits
  </body>
 
 @credits
  </body>
Multi-user software jukebox -- https://www.greenend.org.uk/rjk/disorder/