From: Richard Kettlewell Date: Sun, 25 May 2008 21:08:37 +0000 (+0100) Subject: Tinker with UI appearance a bit X-Git-Tag: 4.0~53 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/5d30e04bf637da39530a402d04ac833c89c764ea Tinker with UI appearance a bit --- 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 0000000..d40f3a8 Binary files /dev/null and b/images/logosmall.png differ diff --git a/templates/about.tmpl b/templates/about.tmpl index 0495966..3f065df 100644 --- a/templates/about.tmpl +++ b/templates/about.tmpl @@ -25,40 +25,76 @@ USA @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