From 52ca8a3270adcdcf1423217216fe818700acc75f Mon Sep 17 00:00:00 2001
Message-Id: <52ca8a3270adcdcf1423217216fe818700acc75f.1715317548.git.mdw@distorted.org.uk>
From: Mark Wooding
Date: Sat, 5 Jan 2008 12:46:35 +0000
Subject: [PATCH] Further web interface visuals: choose directories now have an
icon, giving better balance against the prefs links for the files.
Organization: Straylight/Edgeware
From: rjk@greenend.org.uk <>
---
images/Makefile.am | 2 +-
images/directory.png | Bin 0 -> 122 bytes
templates/choose.html | 11 ++++++++---
templates/disorder.css | 13 +++++++++++++
templates/options.labels | 3 +++
5 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 images/directory.png
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 0000000000000000000000000000000000000000..d29780312345ef3556a38fffff6cb35df4fe0133
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`j-D=#Ar`0KPB!FYP~c#W{`dd6
z)dM#ZUaKPQo!;UdE-M7sSQJ+NQd#RUhtFCooAH+cb5JzDjZq_K4d;hX=cesv*rCBE
UJ}a>F0nji8Pgg&ebxsLQ0EJW}CjbBd
literal 0
HcmV?d00001
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@}{}@}{
@navigate{@arg:directory@}{/@basename@}@:
}@
@@ -128,7 +128,12 @@ USA
@choose{directories}{
-
+
+
@transform{@file@}{dir}{display}@
@@ -159,7 +164,7 @@ USA
@right{prefs}{}@
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"
--
[mdw]