From f9a2881b35e0a42e36d1558ba4f41301e3acec2f Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 10 Sep 2016 14:16:51 +0000 Subject: [PATCH] more compact menues svn path=/trunk/; revision=147 --- static/common.css | 38 +++++++++++++++++------------------ templates/advfilter.html.sh | 4 +--- templates/list.html.sh | 24 ++++++++++++++-------- templates/playctl.html.sh | 6 +++--- templates/preferences.html.sh | 8 ++++---- templates/tagger.html.sh | 4 ++-- templates/tree.html.sh | 27 +++++++++++++++++-------- templates/view.html.sh | 4 ++-- 8 files changed, 65 insertions(+), 50 deletions(-) diff --git a/static/common.css b/static/common.css index d614432..16910fb 100644 --- a/static/common.css +++ b/static/common.css @@ -113,40 +113,48 @@ a.panel { width: auto; padding: 0; margin: auto 1em 1ex 0; + text-decoration: none; } .panel .help { display: block;} /* == Top Panel == */ -.panel#advfilter { position: absolute; top: 0; } -.panel#search select { margin-right: .5em; } +.panel.switchable.top { + position: absolute; + top: 0; +} body.playctl .panel#advfilter, +body.playctl .panel#morelinks, body.playctl .panel#search { margin-top: 1.25em; border-top: 1px solid #FFF; } +.panel#search select { margin-right: .5em; } + /* == Bottom Panels == */ -.panel#preferences, -.panel#tagger, +.panel.bottom, .panel#foot { position: fixed; bottom: 0px; border-style: solid none none none; } - /* == Switchable Panels == */ -form.panel, -div.panel { +.panel.switchable { z-index: 1; overflow: hidden; min-height: 0; max-height: 0; padding-top: 0; padding-bottom: 0; } +.panel.switchable:target { + max-height: 100%; + overflow-y: scroll; +} +.panel.switchable.top:target{ padding-bottom: 1em; } .panel#search, .panel#foot { @@ -159,24 +167,16 @@ div.panel { body.playctl .panel#search, body.playctl .panel#foot { padding-right: .25em; } -.panel:target { - max-height: 100%; - overflow-y: scroll; -} -.panel#advfilter:target{ padding-bottom: 1em; } /* == Panel Switches == */ -.panel#playctl a.panel, -.panel#advfilter a.panel, -.panel#preferences a.panel, -.panel#tagger a.panel { +.panel.switchable.bottom a.panel:last-of-type, +.panel.switchable.top a.panel:first-of-type { display: block; border-style: none none solid none; border-width: 1px; } -.panel#preferences a.panel, -.panel#tagger a.panel { +.panel.switchable.bottom a.panel:last-of-type { border-style: solid none none none; margin-top: .5em; } @@ -184,7 +184,6 @@ body.playctl .panel#foot { padding-right: .25em; } /* == Panel Elements == */ -.panel#advfilter .quicklinks, .panel#advfilter .filter, .panel#tagger .newtag, .panel#tagger input[type=submit], @@ -256,7 +255,6 @@ body.playctl .panel#foot { padding-right: .25em; } margin-left: 1em; } -#advfilter .quicklinks {width: 100%;} /* == Recent filters == */ diff --git a/templates/advfilter.html.sh b/templates/advfilter.html.sh index c4f14cc..fb56645 100755 --- a/templates/advfilter.html.sh +++ b/templates/advfilter.html.sh @@ -57,7 +57,7 @@ filterbox(){ } cat < Hide @@ -74,8 +74,6 @@ cat <

- - Most recent EOF diff --git a/templates/list.html.sh b/templates/list.html.sh index f7bb43c..e25daf3 100755 --- a/templates/list.html.sh +++ b/templates/list.html.sh @@ -27,10 +27,8 @@ cat < - Clear All - Advanced - Browse Folders - Player + Clear + More
@@ -57,6 +55,19 @@ cat < + + $(. $_EXEC/templates/preferences.html.sh) +
@@ -75,9 +86,7 @@ cat < Add Tags - Preferences - ^ top ^ - + ⇧
@@ -85,7 +94,6 @@ cat <
- $(. $_EXEC/templates/preferences.html.sh) $(. $_EXEC/templates/advfilter.html.sh) EOF diff --git a/templates/playctl.html.sh b/templates/playctl.html.sh index 6bf7dcc..a8a14a1 100755 --- a/templates/playctl.html.sh +++ b/templates/playctl.html.sh @@ -16,7 +16,7 @@ # along with Serve0 If not, see . cat < + @@ -59,7 +59,7 @@ cat <$(printf %s "$description" |_wiki)}
- +
@@ -72,7 +72,7 @@ cat <Hide -
+ diff --git a/templates/preferences.html.sh b/templates/preferences.html.sh index 39b31aa..24e5df9 100755 --- a/templates/preferences.html.sh +++ b/templates/preferences.html.sh @@ -1,4 +1,4 @@ -# Copyright 2015 Paul Hänsch +# Copyright 2015, 2016 Paul Hänsch # # This file is part of Serve0 # @@ -16,8 +16,10 @@ # along with Serve0 If not, see . cat < + Hide +
Watch videos: @@ -44,8 +46,6 @@ cat < - - Hide EOF diff --git a/templates/tagger.html.sh b/templates/tagger.html.sh index f92bf0c..4838399 100755 --- a/templates/tagger.html.sh +++ b/templates/tagger.html.sh @@ -1,4 +1,4 @@ -# Copyright 2014, 2015 Paul Hänsch +# Copyright 2014, 2015, 2016 Paul Hänsch # # This file is part of Serve0 # @@ -38,7 +38,7 @@ EOF } cat < +

Add selectetd tags to selected videos.

$(category_box $(list_categories))

diff --git a/templates/tree.html.sh b/templates/tree.html.sh index 43820e6..9343fc4 100755 --- a/templates/tree.html.sh +++ b/templates/tree.html.sh @@ -1,4 +1,4 @@ -# Copyright 2014, 2015 Paul Hänsch +# Copyright 2014 - 2016 Paul Hänsch # # This file is part of Serve0 # @@ -16,14 +16,27 @@ # along with Serve0 If not, see . cat < +

+ + + $(. $_EXEC/templates/preferences.html.sh) +
    $(filelist) @@ -31,13 +44,11 @@ cat < - -