From: rjk@greenend.org.uk <>
Date: Sat, 5 Jan 2008 12:46:35 +0000 (+0000)
Subject: Further web interface visuals: choose directories now have an icon,
X-Git-Tag: 3.0~93
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/52ca8a3270adcdcf1423217216fe818700acc75f

Further web interface visuals: choose directories now have an icon,
giving better balance against the prefs links for the files.
---

diff --git a/images/Makefile.am b/images/Makefile.am
index 387fc77..cff2b5c 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -21,7 +21,7 @@
 static_DATA=cross.png down.png downdown.png edit.png nocross.png	\
 nodown.png nodowndown.png noup.png noupup.png tick.png up.png upup.png  \
 notes.png play.png pause.png random.png randomcross.png notescross.png  \
-propagate.png speaker.png speakercross.png
+propagate.png speaker.png speakercross.png directory.png
 
 staticdir=${pkgdatadir}/static
 
diff --git a/images/directory.png b/images/directory.png
new file mode 100644
index 0000000..d297803
Binary files /dev/null and b/images/directory.png differ
diff --git a/templates/choose.html b/templates/choose.html
index dae34e0..db8c257 100644
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -117,7 +117,7 @@ USA
 
    @if{@ne{@arg:directory@}{}@}{
    <p class=directoryname>@navigate{@arg:directory@}{/<a
-   class=directory
+   class=thisdirectory
    href="@url@?action=choose&#38;directory=@urlquote{@fullname@}@&#38;nonce=@nonce@">@basename@</a>}@:</p>
    }@
 
@@ -128,7 +128,12 @@ USA
     </p>
     @choose{directories}{
     <p class=directory>
-     <a class=directory href="@url@?action=choose&#38;directory=@urlquote{@file@}@&#38;nonce=@nonce@">
+     <a class=directory
+     href="@url@?action=choose&#38;directory=@urlquote{@file@}@&#38;nonce=@nonce@"
+     title="@label:choose.directory@">
+     <img class=button
+      src="@image:directory@"
+      alt="">
       @transform{@file@}{dir}{display}@
      </a>
     </p>
@@ -159,7 +164,7 @@ USA
      @right{prefs}{<a class=imgprefs
      href="@url@?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@"
      ><img class=button 
-      src="@@image:edit@"
+      src="@image:edit@"
       title="@label:choose.allprefsverbose@"
       alt="@label:choose.allprefs@"></a>}@
      <a class=allfiles href="@url@?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
diff --git a/templates/disorder.css b/templates/disorder.css
index fce95fc..0bb6cd3 100644
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -189,6 +189,18 @@ p.directoryname {
   padding: 0.2em
 }
 
+a.thisdirectory:link {
+  color: black
+}
+
+a.thisdirectory:visited {
+  color: black
+}
+
+a.thisdirectory:active {
+  color: red
+}
+
 /* directories */
 div.directories {
 }
@@ -208,6 +220,7 @@ p.directory {
 }
 
 a.directory {
+  text-decoration: none;
 }
 
 a.directory:link {
diff --git a/templates/options.labels b/templates/options.labels
index d81f7be..289a0cf 100644
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -93,6 +93,9 @@ label	choose.directories	Directories
 # Heading for track list
 label	choose.files		Tracks
 
+# Caption for visit-directory links
+label	choose.directory	"Visit directory"
+
 # Short and long text for edit prefs button (both recent and choose pages)
 label	choose.prefs		Edit
 label	choose.prefsverbose	"edit track information"