From 5d30e04bf637da39530a402d04ac833c89c764ea Mon Sep 17 00:00:00 2001 Message-Id: <5d30e04bf637da39530a402d04ac833c89c764ea.1716252371.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 25 May 2008 22:08:37 +0100 Subject: [PATCH] Tinker with UI appearance a bit Organization: Straylight/Edgeware From: Richard Kettlewell --- images/Makefile.am | 7 ++-- images/logosmall.png | Bin 0 -> 5102 bytes templates/about.tmpl | 84 +++++++++++++++++++++++++++++------------ templates/disorder.css | 39 +++++++++++++------ templates/help.tmpl | 40 ++++++++++---------- templates/macros.tmpl | 30 ++++++++++----- 6 files changed, 131 insertions(+), 69 deletions(-) create mode 100644 images/logosmall.png diff --git a/images/Makefile.am b/images/Makefile.am index 1feb7e4..7c77c85 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -19,9 +19,10 @@ # 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 directory.png logo.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 directory.png logo.png \ +logosmall.png staticdir=${pkgdatadir}/static diff --git a/images/logosmall.png b/images/logosmall.png new file mode 100644 index 0000000000000000000000000000000000000000..d40f3a82210fd9743f72ee87bb8b72268a0aa7de GIT binary patch literal 5102 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 @stdmenu{about} -

About DisOrder

-

Copyright

+

About DisOrder

-

DisOrder version @version - - software Jukebox

+
-

Copyright © 2003-2008 Richard Kettlewell
Portions - copyright © 2007 Ross Younger
- Portions copyright © 2007, 2008 Mark Wooding

+

This is DisOrder, a multi-user software jukebox. Please see the help page for instructions on using this + interface.

-

Portions extracted from MPG321, Copyright © 2001 Joe - Drew, Copyright © 2000-2001 Robert Leslie

+
+ +

Reporting Bugs

-

This program is free software; you can redistribute it and/or modify it - under the terms of the GNU - General Public License as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later version.

+
-

This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details.

+

Please report bugs using Google + Code.

-

You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., 59 - Temple Place, Suite 330, Boston, MA 02111-1307 USA

+
+ +

Source Code

+
+ +

DisOrder is free software. You can get the source code from + its website.

+ +
+ +

Copyright

+ +
+ +

Copyright © 2003-2008 Richard Kettlewell
+ + Portions copyright © 2007 Ross + Younger
+ + Portions copyright © 2007, 2008 Mark Wooding
+ + Portions extracted from MPG321, Copyright © 2001 Joe + Drew, Copyright © 2000-2001 Robert Leslie
+ + Portions copyright © 1997-2006 Free Software Foundation, Inc.

+ +

This program is free software; you can redistribute it and/or modify it + under the terms of the GNU + General Public License as published by the Free Software Foundation; + either version 2 of the License, or (at your option) any later version.

+ +

This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details.

+ +

You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA

+ +
+ @credits diff --git a/templates/disorder.css b/templates/disorder.css index 5782975..8bd81c6 100644 --- a/templates/disorder.css +++ b/templates/disorder.css @@ -241,8 +241,21 @@ form.search { /* menu bar *******************************************************************/ +div.top { + background-color: #e0e0e0; + border: 1px solid black +} + +div.logo { + float:right; + margin-top:4px; + margin-right:4px +} + /* p.menubar is the menu bar at the top */ p.menubar { + float:left; + margin-left: 4px; word-spacing: 1em /* Space out menu items */ } @@ -297,6 +310,20 @@ table.prefs input { font-family: monospace } +/* text with sectiosn *******************************************************/ + +/* h2.sectiontitle is used for subsection headings */ +h2.sectiontitle { + background-color: #e0ffe0; /* Black on pastel green */ + color: black; + padding: 0.2em +} + +/* There is a div.section for each subsection */ +div.section { + margin-left: 1em +} + /* help **********************************************************************/ /* table.helpbuttons is used for various tables of buttons */ @@ -309,18 +336,6 @@ table.helpbuttons { margin-right: 2em } -/* h2.helptitle is used for help subsection headings */ -h2.helptitle { - background-color: #e0ffe0; /* Black on pastel green */ - color: black; - padding: 0.2em -} - -/* There is a div.helpsection for each subsection */ -div.helpsection { - margin-left: 1em -} - /* span.configuration marks configuration directives */ span.configuration { font-family: monospace diff --git a/templates/help.tmpl b/templates/help.tmpl index 3c1536f..5e8169e 100644 --- a/templates/help.tmpl +++ b/templates/help.tmpl @@ -26,9 +26,9 @@ USA @stdmenu{help}

@label{help.title}

-

Introduction

+

Introduction

-
+

All screens in the DisOrder web interface have a set of hyperlinks at the top. You can use these to visit the various @@ -38,9 +38,9 @@ USA

-

Playing

+

Playing

-
+

This screen displays the currently playing track (if there is one) and lists all the tracks in the queue (the track that will be played soonest @@ -63,9 +63,9 @@ USA

-

Manage

+

Manage

-
+

This screen is almost identical to Playing except that it includes extra @@ -127,9 +127,9 @@ USA

-

Recent

+

Recent

-
+

This screen displays recently played tracks, most recent first. The -

New

+

New

-
+

This screen displays tracks recently added to the database, most recent first. The -

Choose

+

Choose

-
+

This screen allows you to choose a track to be played, by navigating through the directory structure of the tracks filesystem. @@ -235,9 +235,9 @@ USA

-

Editing Preferences

+

Editing Preferences

-
+

This screen, reached from Choose or Recent, is used to edit a track's preferences. @@ -263,9 +263,9 @@ USA

-

Login

+

Login

-
+

This screen has two different versions.

@@ -285,9 +285,9 @@ USA
-

Troubleshooting

+

Troubleshooting

-
+

If you cannot play a track, or it does not appear in the database even after a rescan, check the following things:

@@ -319,9 +319,9 @@ USA
-

Man Pages

+

Man Pages

-
+

disorder_config(5) - configuration

diff --git a/templates/macros.tmpl b/templates/macros.tmpl index 1bfd97f..1da66d4 100644 --- a/templates/macros.tmpl +++ b/templates/macros.tmpl @@ -47,7 +47,8 @@ and then redefines macros as desired. @# Standard menu @# @current is the name of the current page, e.g. choosealpha, login @define {stdmenu} {current} - {

+ {

+

@menuitem{@current}{playing}{true} @menuitem{@current}{recent}{true} @menuitem{@current}{choose}{@right{play}} @@ -57,7 +58,16 @@ and then redefines macros as desired. @menuitem{@current}{help}{true} @menuitem{@current}{about}{true}

-
+ +
+
} @# Menu entry @@ -69,15 +79,15 @@ and then redefines macros as desired. @# @define {menuitem} {current name available} {@if{@available} - { @label{menu.@name}} - { @label{menu.@name}}} + { href="@url"} + { href="@url?action=@name"} + title="@label{menu.@q{@name}verbose}">@label{menu.@name}} + { @label{menu.@name}}} @# Standard footer text -- [mdw]