deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

S5 Slide notes

Browse source 
Slide notes are now served correctly (as application/xhtml+xml) to compatible
browsers. So you can put math in your notes, and the MathML will render.

We don't do real content-negotioation. IE gets text/html; everyone else gets application/xhtml+xml.
This commit is contained in:
Jacques Distler 2007-09-15 00:29:20 -05:00
parent 08857ebe8e
commit 2c4473a0e9
6 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/s5/themes/i18n/pretty.css
View file

@ -61,8 +61,7 @@ div#controls form {position:absolute;bottom:0;right:0;width:100%;
#controls #navLinks a {padding:0;margin:0 0.5em 0;background:#666; #controls #navLinks a {padding:0;margin:0 0.5em 0;background:#666;
border:none;color:#AAC;cursor:pointer} border:none;color:#AAC;cursor:pointer}
#controls #navList {height:1em} #controls #navList {height:1em}
#controls #navList #jumplist {position:absolute;bottom:0;right:0; #controls #navList #jumplist {background:#DDD;color:#227}
background:#DDD;color:#227}
#currentSlide {font-size:0.5em} #currentSlide {font-size:0.5em}
#currentSlide span {font-size:13px;color:#fff} #currentSlide span {font-size:13px;color:#fff}

3
public/s5/ui/core/notes.css
View file

@ -1,6 +1,7 @@
/* Following are the note styles -- edit away! */ /* Following are the note styles -- edit away! */
body { html { background: #333; color: #FFF; }
body {
margin: 0; margin: 0;
padding: 1.0em; padding: 1.0em;
background: #333; background: #333;

6
public/s5/ui/core/slides.js
View file

@ -631,7 +631,11 @@ function createNotesWindow() { // creates a window for our notes
if (!s5NotesWindow || s5NotesWindow.closed) { // Create the window if it doesn't exist if (!s5NotesWindow || s5NotesWindow.closed) { // Create the window if it doesn't exist
s5NotesWindowLoaded = false; s5NotesWindowLoaded = false;
// Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr. // Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr.
s5NotesWindow = window.open('/s5/ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto'); if (isIE) {
s5NotesWindow = window.open('/s5/ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
} else {
s5NotesWindow = window.open('/s5/ui/s5-notes.xhtml', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
}
} }
if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded
loadNote(); loadNote();

2
public/s5/ui/s5-notes.html
View file

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Notes</title> <title>Notes</title>
<link rel="stylesheet" href="default/notes.css" type="text/css" /> <link rel="stylesheet" href="core/notes.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
document.onkeyup = opener.keys; document.onkeyup = opener.keys;

2
public/s5/ui/s5-notes.xhtml
View file

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Notes</title> <title>Notes</title>
<link rel="stylesheet" href="default/notes.css" type="text/css" /> <link rel="stylesheet" href="core/notes.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
document.onkeyup = opener.keys; document.onkeyup = opener.keys;

1
script/server
View file

@ -18,6 +18,7 @@ OPTIONS = {
'svg' => 'application/svg+xml', 'svg' => 'application/svg+xml',
'tar' => 'application/x-tar', 'tar' => 'application/x-tar',
'tex' => 'application/x-tex', 'tex' => 'application/x-tex',
'xhtml' => 'application/xhtml+xml',
'xml' => 'application/xml', 'xml' => 'application/xml',
'xslt' => 'application/xslt+xml' 'xslt' => 'application/xslt+xml'
}) })