From bf13721955492c1012f66f18a899e41fa1425558 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 25 Sep 2012 18:43:35 +0200 Subject: [PATCH] Show notes in the embedder shell. (In a new file.) As discussed in #101 --- shells/embedder+notes.html | 23 +++++++++++++++++++++-- template.html | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/shells/embedder+notes.html b/shells/embedder+notes.html index 15443b0..78c414e 100644 --- a/shells/embedder+notes.html +++ b/shells/embedder+notes.html @@ -6,6 +6,9 @@
+
+

+
@@ -23,7 +26,7 @@ height: 100%; width: 100%; } - #slides, #controls { + #slides, #controls, #notes { left: 0; position: absolute; right: 0; @@ -36,9 +39,21 @@ padding: 5px; } #slides { - bottom: 40px; + bottom: 206px; top: 0; } + #notes { + bottom: 40px; + height: 150px; + + background: #EEE; + color: #444; + padding: 0 20px; + overflow: auto; + font: 25px sans-serif; + border: 8px solid #555; + border-style: solid none; + } iframe { border: none; background-color: white; @@ -149,6 +164,7 @@ argv.forEach(function(e, i, a) { a[i] = decodeURIComponent(e) }); if (argv[0] === "CURSOR" && argc === 2) { var cursor = argv[1].split("."); + this.postMsg(this.view, "GET_NOTES"); this.idx = ~~cursor[0]; this.step = ~~cursor[1]; $("#slideidx").value = this.idx; @@ -159,6 +175,9 @@ $("#slidecount").innerHTML = this.count = argv[2]; document.title = argv[1]; } + if (argv[0] === "NOTES" && argc === 2) { + $("#notes > #content").innerHTML = this.notes = argv[1]; + } } } diff --git a/template.html b/template.html index b435f3f..8f05159 100644 --- a/template.html +++ b/template.html @@ -24,7 +24,7 @@

An incremental list

  • Item 2
  • Item 3 -
    Some notes. They are only visible using onstage shell.
    +
    Some notes. They are only visible using onstage or embedder+notes shell.