From 5fb0c1a0670249b416a21e1e3de7e963a2d3e63d Mon Sep 17 00:00:00 2001 Message-Id: <5fb0c1a0670249b416a21e1e3de7e963a2d3e63d.1714993039.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 17 May 2008 13:07:18 +0100 Subject: [PATCH] more template fiddling Organization: Straylight/Edgeware From: Richard Kettlewell --- templates/macros.tmpl | 12 ++++++-- templates/new.tmpl | 62 ++++++++++++++++----------------------- templates/recent.tmpl | 67 +++++++++++++++++++------------------------ 3 files changed, 63 insertions(+), 78 deletions(-) diff --git a/templates/macros.tmpl b/templates/macros.tmpl index b471599..11ba25c 100644 --- 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 element @define {stdhead} {name} {@quiethead -<link rel=stylesheet - type="text/css" - href="@label{url.static}/disorder.css"> <title>@label{@name.title}} @# Non-displaying 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}">}} + +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 2185c4b..e017a74 100644 --- a/templates/new.tmpl +++ b/templates/new.tmpl @@ -24,50 +24,38 @@ USA @stdmenu{new} -

@label:new.title@

@label{new.title}

-@#{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}{ - - - - + + + + @right{prefs}{ - }@ + } @new{ - - - - - -@right{prefs}{ - - }@ - }@ + + + + + + @right{prefs}{ + + } + }

@label:heading.artist@	@label:heading.album@	@label:heading.title@	@label:heading.length@	@label{heading.artist}	@label{heading.album}	@label{heading.title}	@label{heading.length}
@right{play}{@part{short}{artist}@}{@part{short}{artist}@}@	@right{play}{@part{short}{album}@}{@part{short}{album}@}@	@right{play}{@part{short}{title}@}{@part{short}{title}@}@	@length@
@martist{new}{@track}	@malbum{new}{@track}	@mtitle{new}{@track}	@length{@id}	+ + + +

-}@ +} @credits diff --git a/templates/recent.tmpl b/templates/recent.tmpl index e8590c7..8f3fd9c 100644 --- a/templates/recent.tmpl +++ b/templates/recent.tmpl @@ -24,50 +24,41 @@ USA @stdmenu{recent} -

@label:recent.title@

@label{recent.title}

-@#{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}{ - - - - - - -@right{prefs}{ - }@ + + + + + + + @right{prefs}{} @recent{ - - - - - - - -@right{prefs}{ - - }@ - }@ + + + + + + + + @right{prefs}{ + + } + }

@label:heading.when@	@label:heading.who@	@label:heading.artist@	@label:heading.album@	@label:heading.title@	@label:heading.length@		@label{heading.when}	@label{heading.who}	@label{heading.artist}	@label{heading.album}	@label{heading.title}	@label{heading.length}
@when@	@who@	@right{play}{@part{short}{artist}@}{@part{short}{artist}@}@	@right{play}{@part{short}{album}@}{@part{short}{album}@}@	@part{short}{title}@	@length@
@mwhen{recent}{@id}	@mwho{recent}{@id}	@martist{recent}{@track}	@malbum{recent}{@track}	@mtitle{recent}{@track}	@length{@id}	+ + + +

-}@ +} @credits -- [mdw]