use wiki css in slideshows, menu button to slideshow

diff --git a/handlers/70_slideshow.sh b/handlers/70_slideshow.sh
index 04f88b93bd00a4dd197c71cc691df38668705d7f..3e6b81391b4eaace23c5b88489c682b9979d8c23 100755 (executable)
--- a/handlers/70_slideshow.sh
+++ b/handlers/70_slideshow.sh
@@ -23,15 +23,18 @@ esac
 
 printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
 
+PAGE_CSS="${_BASE}/%5B.%5D/themes/slideshow.css${BR}${PAGE_CSS}"
 cat <<-EOF
        <!DOCTYPE HTML>
        <html${LANGUAGE:+ lang=\"${LANGUAGE}\"}><head>
-         <link rel="stylesheet" type="text/css" href="/%5B.%5D/themes/slideshow.css">
+         $(theme_head)
          <title>$(HTML ${PAGE_TITLE})</title>
        </head><body id="$(HTML "${PATH_INFO}")">
-          <a href="#" class="toplevel">overview</a>
        EOF
 
+# theme_pagemenu
+printf '<a href="#" class="toplevel">overview</a>'
+
 page="${PATH_INFO%\[*\]}"
 wiki "$page" | {
   # slide previous ID, slide current ID, slide number

diff --git a/themes/default.sh b/themes/default.sh
index 58f45a43ccb43559e1fa385f2942e120f055a8fc..e3315343e41a89923e0c36207b28cdcdc7fdc8d3 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -52,6 +52,7 @@ theme_pagemenu(){
          <li><a href="./%5Bview%5D">$(_ View)</a></li>
          <li><a href="./%5Bedit%5D">$(_ Edit)</a></li>
          <li><a href="./%5Battachment%5D">$(_ Attachments)</a></li>
+         <li><a href="./%5Bslideshow%5D">$(_ Slideshow)</a></li>
          <li><a href="./%5Brevision%5D">$(_ Revisions)</a></li>
          <li><a href="./%5Brename%5D">$(_ Rename)</a></li>
          <li><a href="./%5Bmove%5D">$(_ Move)</a></li>

diff --git a/themes/slideshow.css b/themes/slideshow.css
index 423f923085b1f8c53243e0aa185ee0f909999ea4..b37cad16f9c7c2b026daf1239fb7f9572d2fa9bc 100644 (file)
--- a/themes/slideshow.css
+++ b/themes/slideshow.css
@@ -13,6 +13,21 @@ body
   background-image: repeating-linear-gradient( to bottom right, #AAA, #999 8px);
 }
 
+body > .pagemenu {
+  position: fixed;
+  top: 0; left: 0; right: 0; z-index: 1;
+  margin: 0;
+  padding: .25em 2em;
+  background-color: #666;
+  list-style: none;
+  box-shadow: 0 0 .5em;
+}
+body > .pagemenu li {
+  display: inline-block;
+  margin-right: 1em;
+}
+body > .pagemenu li a { color: #FFF; }
+
 section.slide
 { background-color: #FFF;
   background-image: repeating-linear-gradient( #FFF, #EEE 4px);
@@ -60,7 +75,7 @@ section.slide:after  /* slide number on overview screen */
 
 body {
   font-family: sans-serif;
-  padding: 2em 1em 6em 1em;
+  padding: 2.5em 1em 6em 1em;
   #background-color: #555;
   text-align: center;
   overflow-x: hidden;
@@ -109,9 +124,10 @@ body a.toplevel {
   bottom: 0; left: 8em;
   width: 2ex; overflow: hidden;
   font-size: .875em;
-  padding-bottom: .25em;
+  -padding-bottom: .25em;
   color: transparent;
   z-index: 5;
+  word-break: normal;
 }
 body a.toplevel:before {
   #color: #888;
@@ -122,7 +138,8 @@ body span.count {
   position: fixed;
   bottom: 0; left: 6.25em;
   font-size: .875em;
-  padding-bottom: .125em;
+  line-height: 1.5em;
+  -padding-bottom: .125em;
   #color: #888;
   z-index: 5;
 }