Changeset 204

Timestamp:

09/18/06 16:02:41 (2 years ago)

Author:

matt

Message:

Upgrade to s5 v1.2a1

Files:

• trunk/demo/spod5/ui/bg-shade.png (added)
• trunk/demo/spod5/ui/default/framing.css (modified) (1 diff)
• trunk/demo/spod5/ui/default/notes.css (added)
• trunk/demo/spod5/ui/default/pretty.css (modified) (3 diffs)
• trunk/demo/spod5/ui/default/s5-core.css (modified) (1 diff)
• trunk/demo/spod5/ui/default/slides.js (modified) (14 diffs)

trunk/demo/spod5/ui/default/framing.css

@@ -11 +11 @@
-.slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2;  list-style: none;}
-div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;}
-
-
+
-#currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;}
-html>body #currentSlide {position: fixed;}

trunk/demo/spod5/ui/default/pretty.css

@@ -1 +1 @@
-/* Following are the presentation styles -- edit away! */
-
-axon_logo_500_fade.gif) -160px 0 no-repeat; color: #000; font-size: 2
+bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2.25
-:link, :visited {text-decoration: none; color: #00C;}
-#controls :active {color: #88A !important;}
@@ -30 +30 @@
-.slide img.leader {display: block; margin: 0 auto;}
-
-eee; color: #005
+005; color: #AAB
-  font-family: Verdana, Helvetica, sans-serif;}
-eee url(axon_logo_500_fade.gif) -167px -7px
- border: 2px solid black; margin: 5px; width: 90%;
+005 url(bodybg.gif) -16px 0
+
-div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;}
-#footer h1, #footer h2 {display: block; padding: 0 1em;}
@@ -42 +42 @@
-  margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap;
-  font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize;
-005; background: transparent
+DDE; background: #005
-.slide h3 {font-size: 130%;}
-h1 abbr {font-variant: small-caps;}
-
-5
-5
+6
+4
-  text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;}
-
-
-
-
+
-#controls #navLinks a {padding: 0; margin: 0 0.5em; 
-eee; border: none; color: #227
+005; border: none; color: #779
-  cursor: pointer;}
-
-
+
-
-#currentSlide {text-align: center; font-size: 0.5em; color: #449;}

trunk/demo/spod5/ui/default/s5-core.css

@@ -4 +4 @@
-html>body div#header, html>body div#footer, 
-  html>body div#controls, html>body .slide {position: fixed;}
-
+, .notes
-.layout {display: block;}
-.slide, .hideme, .incremental {visibility: hidden;}

trunk/demo/spod5/ui/default/slides.js

@@ -1 @@
-
+2a
-//
-// Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information 
@@ -14 +14 @@
-var controlVis = 'visible';
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0;
-var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0;
@@ -29 +44 @@
-
-function removeClass(object,className) {
-
+ || !hasClass(object,className)
-        object.className = object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'), RegExp.$1+RegExp.$2);
-}
@@ -82 +97 @@
-                var did = 'slide' + n.toString();
-                obj.setAttribute('id',did);
-
+
+
-
-                var otext = '';
@@ -107 +123 @@
-                cs = document.currentSlide;
-        }
-
+
+
-                '<span id="csSep">\/<\/span> ' + 
-
+
+
+
-        if (snum == 0) {
-                cs.style.visibility = 'hidden';
@@ -152 +171 @@
-        if (incrementals[snum].length > 0 && incpos > 0)
-                addClass(incrementals[snum][incpos - 1], 'current');
-
-
+
+
+
+
+
+
-        jl.selectedIndex = snum;
-        currentSlide();
+        loadNote();
+        permaLink();
-        number = 0;
-}
@@ -271 +296 @@
-                                showHide('k');
-                                break;
+                        case 78: // n
+                                createNotesWindow();
+                                break;
-                }
-                if (key.which < 48 || key.which > 57) {
@@ -290 +318 @@
-                e = window.event;
-        } else target = e.target;
-getAttribute('href')
+href
-        if (!e.which || e.which == 1) {
-                if (!incrementals[snum] || incpos >= incrementals[snum].length) {
@@ -372 +400 @@
-}
-
+function permaLink() {
+        document.getElementById('plink').href = window.location.pathname + '#slide' + snum;
+}
+
-function createControls() {
-        var controlsDiv = document.getElementById("controls");
@@ -384 +416 @@
-        controlsDiv.innerHTML = '<form action="#" id="controlForm"' + hideDiv + '>' +
-        '<div id="navLinks">' +
+        '<a accesskey="n" id="show-notes" href="javascript:createNotesWindow();" title="Show Notes">&equiv;<\/a>' +
-        '<a accesskey="t" id="toggle" href="javascript:toggle();">&#216;<\/a>' +
-        '<a accesskey="z" id="prev" href="javascript:go(-1);">&laquo;<\/a>' +
@@ -399 +432 @@
-function fontScale() {  // causes layout problems in FireFox that get fixed if browser's Reload is used; same may be true of other Gecko-based browsers
-        if (!s5mode) return false;
-22;  // both yield 32 (after rounding
-32
+48;  // both yield 16 (the usual browser default
+64
-        if (window.innerHeight) {
-                var vSize = window.innerHeight;
@@ -425 +458 @@
-function fontSize(value) {
-        if (!(s5ss = document.getElementById('s5ss'))) {
-isIE
+document.createStyleSheet
-                        document.getElementsByTagName('head')[0].appendChild(s5ss = document.createElement('style'));
-                        s5ss.setAttribute('media','screen, projection');
@@ -434 +467 @@
-                }
-        }
-isIE
+(document.s5ss && document.s5ss.addRule)
-                while (s5ss.lastChild) s5ss.removeChild(s5ss.lastChild);
-body
-
-body
+html
+
+html
-        }
-}
@@ -529 +562 @@
-}
-
+function noteLabel() { // Gives notes id's to match parent slides
+        var notes = GetElementsWithClassName('div','notes');
+        for (var i = 0; i < notes.length; i++) {
+                var note = notes[i];
+                var id = 'note' + note.parentNode.id.substring(5);
+                note.setAttribute('id',id);
+        }
+        resetElapsedSlide();
+        resetRemainingTime();
+        window.setInterval('updateElaspedTime()', 1000);
+}
+
+function createNotesWindow() { // creates a window for our notes
+        if (!s5NotesWindow || s5NotesWindow.closed) { // Create the window if it doesn't exist
+                s5NotesWindowLoaded = false;
+                // Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr.
+                s5NotesWindow = window.open('ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0');
+        }
+        if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded
+                loadNote();
+        } else { // Keep trying...
+                window.setTimeout('createNotesWindow()', 50);
+        }
+}
+
+function loadNote() {
+// Loads a note into the note window
+        var notes = nextNotes = '<em class="disclaimer">There are no notes for this slide.</em>';
+        if (document.getElementById('note' + snum)) {
+                notes = document.getElementById('note' + snum).innerHTML;
+        }
+        if (document.getElementById('note' + (snum + 1))) {
+                nextNotes = document.getElementById('note' + (snum + 1)).innerHTML;
+        }
+        
+        var jl = document.getElementById('jumplist');
+        var slideTitle = jl.options[jl.selectedIndex].text.replace(/^\d+\s+:\s+/, '') + ((jl.selectedIndex) ? ' (' + jl.selectedIndex + '/' + (smax - 1) + ')' : '');
+        if (jl.selectedIndex < smax - 1) {
+                var nextTitle = jl.options[jl.selectedIndex + 1].text.replace(/^\d+\s+:\s+/, '') + ((jl.selectedIndex + 1) ? ' (' + (jl.selectedIndex + 1) + '/' + (smax - 1) + ')' : '');
+        } else {
+                var nextTitle = '[end of slide show]';
+        }
+        
+        if (s5NotesWindow && !s5NotesWindow.closed && s5NotesWindow.document) {
+                s5NotesWindow.document.getElementById('slide').innerHTML = slideTitle;
+                s5NotesWindow.document.getElementById('notes').innerHTML = notes;
+                s5NotesWindow.document.getElementById('next').innerHTML = nextTitle;
+                s5NotesWindow.document.getElementById('nextnotes').innerHTML = nextNotes;
+        }
+        resetElapsedSlide();
+}
+
+function resetElapsedTime() {
+        presentationStart = new Date();
+        slideStart = new Date();
+        updateElaspedTime();
+}
+
+function resetElapsedSlide() {
+        if (snum != previousSlide) {
+                slideStart = new Date();
+                previousSlide = snum;
+                updateElaspedTime();
+        }
+}
+
+function updateElaspedTime() {
+        if (!s5NotesWindowLoaded || !s5NotesWindow || s5NotesWindow.closed) return;
+        var now = new Date();
+        var ep = s5NotesWindow.document.getElementById('elapsed-presentation');
+        var es = s5NotesWindow.document.getElementById('elapsed-slide');
+        ep.innerHTML = formatTime(now.valueOf() - presentationStart.valueOf());
+        es.innerHTML = formatTime(now.valueOf() - slideStart.valueOf());
+}
+
+function resetRemainingTime() {
+        if (!s5NotesWindowLoaded || !s5NotesWindow || s5NotesWindow.closed) return;
+        var startField = s5NotesWindow.document.getElementById('startFrom');
+        startFrom = readTime(startField.value);
+        countdown.remaining = startFrom * 60000;  // convert to msecs
+        countdown.start = new Date().valueOf();
+        countdown.end = countdown.start + countdown.remaining;
+        var tl = s5NotesWindow.document.getElementById('timeLeft');
+        var timeLeft = formatTime(countdown.remaining);
+        tl.innerHTML = timeLeft;
+}
+
+function updateRemainingTime() {
+        if (!s5NotesWindowLoaded || !s5NotesWindow || s5NotesWindow.closed) return;
+        var tl = s5NotesWindow.document.getElementById('timeLeft');
+        var now = new Date();
+        if (countdown.state == 'run') {
+                countdown.remaining = countdown.end - now;
+        }
+        tl.style.color = '';
+        tl.style.backgroundColor = '';
+        if (countdown.remaining >= 0) {
+                var timeLeft = formatTime(countdown.remaining);
+                removeClass(tl,'overtime');
+                if (countdown.remaining < 300000) {
+                        tl.style.color = 'rgb(' + (255-Math.round(countdown.remaining/2000)) + ',0,0)';
+                        tl.style.backgroundColor = 'rgb(255,255,' + (Math.round(countdown.remaining/2000)) + ')';
+                }
+        } else {
+                var timeLeft = '-' + formatTime(-countdown.remaining);
+                addClass(tl,'overtime');
+        }
+        tl.innerHTML = timeLeft;
+}
+
+function toggleRemainingTime() {
+        if (countdown.state == 'pause') countdown.state = 'run'; else countdown.state = 'pause';
+        if (countdown.state == 'pause') {
+                window.clearInterval(countdown.timer);
+        }
+        if (countdown.state == 'run') {
+                countdown.start = new Date().valueOf();
+                countdown.end = countdown.start + countdown.remaining;
+                countdown.timer = window.setInterval('updateRemainingTime()', 1000);
+        }
+}
+
+function alterRemainingTime(amt) {
+        var change = amt * 60000;  // convert to msecs
+        countdown.end += change;
+        countdown.remaining += change;
+        updateRemainingTime();
+}
+
+function formatTime(msecs)  {
+        var time = new Date(msecs);
+        
+        var hrs = time.getUTCHours() + ((time.getUTCDate() -1) * 24); // I doubt anyone will spend more than 24 hours on a presentation or single slide but just in case...
+        hrs = (hrs < 10) ? '0'+hrs : hrs;
+        if (hrs == 'NaN' || isNaN(hrs)) hrs = '--';
+        
+        var min = time.getUTCMinutes();
+        min = (min < 10) ? '0'+min : min;
+        if (min == 'NaN' || isNaN(min)) min = '--';
+        
+        var sec = time.getUTCSeconds();
+        sec = (sec < 10) ? '0'+sec : sec;
+        if (sec == 'NaN' || isNaN(sec)) sec = '--';
+
+        return hrs + ':' + min + ':' + sec;
+}
+
+function readTime(val) {
+        var sregex = /:/;
+        var matches = sregex.exec(val);
+        if (matches == null) {
+                return val;
+        } else {
+                var times = val.split(':');
+                var hours = parseInt(times[0]);
+                var mins = parseInt(times[1]);
+                var total = (hours * 60) + mins;
+                return total;
+        }
+}
+
+function windowChange() {
+        fontScale();
+}
+
-function startup() {
-        defaultCheck();
-if (!isOp) createControls();
+createControls();  // hallvord
-        slideLabel();
+        noteLabel(); // [SI:060104] must follow slideLabel()
+        loadNote();
-        fixLinks();
-        externalLinks();
-        fontScale();
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
-window.onload = startup;
-fontScale()', 50
+windowChange()',5