[Jifty-commit] r733 - jifty/trunk/doc/talks
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Mar 23 13:37:55 EST 2006
Author: jesse
Date: Thu Mar 23 13:37:53 2006
New Revision: 733
Modified:
jifty/trunk/doc/talks/takahashi.css
jifty/trunk/doc/talks/takahashi.js
jifty/trunk/doc/talks/yapc.asia.2005.xul
Log:
* Takahashi.js updates for translations
Modified: jifty/trunk/doc/talks/takahashi.css
==============================================================================
--- jifty/trunk/doc/talks/takahashi.css (original)
+++ jifty/trunk/doc/talks/takahashi.css Thu Mar 23 13:37:53 2006
@@ -159,3 +159,9 @@
position: relative;
}
+.subtitle {
+ color: yellow;
+ text-align: center;
+ font-size: 50px;
+ bottom: 0;
+}
Modified: jifty/trunk/doc/talks/takahashi.js
==============================================================================
--- jifty/trunk/doc/talks/takahashi.js (original)
+++ jifty/trunk/doc/talks/takahashi.js Thu Mar 23 13:37:53 2006
@@ -9,6 +9,9 @@
this.deck = document.getElementById('deck');
this.scroller = document.getElementById('scroller');
+ this.canvas.appendChild(document.createElement('description'));
+ this.canvas.lastChild.setAttribute('id', "caption");
+ this.canvas.lastChild.setAttribute('class', 'subtitle');
this.toolbar = document.getElementById('canvasToolbar');
this.toolbarHeight = this.toolbar.boxObject.height;
this.isToolbarHidden = true;
@@ -82,14 +85,20 @@
line = text[i];
image_width = 0;
image_height = 0;
+ var subtitle = '';
+
+ if (line.match(/^~/)) {
+ subtitle = line.substring(1);
+ line = '';
+ }
+
if (line.match(/^ /)) {
code_listing = 1;
this.content.lastChild.setAttribute('align', 'left');
this.content.lastChild.setAttribute('class', 'pre');
line = line.substring(1)
- }
-
+ }
while (line.match(/^([^\{]+)?(\{\{ima?ge? +src="([^"]+)" +width="([0-9]+)" +height="([0-9]+)"[^\}]*\}\}|\{\{(([^\|]+)?\||)([^\}]+)\}\})(.+)?/))
{
if (RegExp.$1) {
@@ -147,6 +156,13 @@
}
this.content.setAttribute('style', 'font-size:10px;');
+ caption = document.getElementById('caption');
+ if (subtitle) {
+ caption.setAttribute('value', subtitle);
+ } else {
+ caption.setAttribute('value', '');
+
+ }
if (this.content.boxObject.width) {
var canvas_w = this.canvas.boxObject.width;
@@ -170,15 +186,12 @@
}
var content_h = this.content.boxObject.height;
- if(content_h >= canvas_h){
+ if(content_h >= (canvas_h - 50)){ // That 50 is space for subtitles
content_h = this.content.boxObject.height;
new_fs = Math.round((canvas_h/content_h) * new_fs);
this.content.setAttribute('style', 'font-size:'+ new_fs + "px");
}
}
-
-
-
this.canvas.removeAttribute('rendering');
},
Modified: jifty/trunk/doc/talks/yapc.asia.2005.xul
==============================================================================
--- jifty/trunk/doc/talks/yapc.asia.2005.xul (original)
+++ jifty/trunk/doc/talks/yapc.asia.2005.xul Thu Mar 23 13:37:53 2006
@@ -2,9 +2,11 @@
<html:textarea id="builtinCode" style="visibility: collapse">
♨ Jifty
+~Jifty
----
Nifty Apps
in a Jiffy
+~ a subtitle
----
{{img src="#" width="0" height="0"}}
{{img src="pony.png" width="640" height="422"}}
@@ -20,8 +22,10 @@
framework?
----
Yes.
+~X
----
(Sorry, clkao)
+~ so so so so so sorry
----
Why?
----
@@ -114,6 +118,7 @@
lots of features
----
:-(
+~ :(
----
No
Java
@@ -716,7 +721,97 @@
-<deck flex="1" id="deck"><vbox flex="1" onmousemove="Presentation.onMouseMoveOnCanvas(event);"><toolbox id="canvasToolbar"><toolbar><toolbarbutton oncommand="Presentation.home()" label="|<<" observes="canBack"/><toolbarbutton oncommand="Presentation.back()" label="<" observes="canBack"/><toolbarbutton oncommand="Presentation.forward()" label=">" observes="canForward"/><toolbarbutton oncommand="Presentation.end()" label=">>|" observes="canForward"/><toolbarseparator/><hbox align="center"><textbox id="current_page" size="4" oninput="if (this.value) Presentation.showPage(parseInt(this.value)-1);"/><description value="/"/><description id="max_page"/></hbox><toolbarseparator/><vbox flex="2"><spacer flex="1"/><scrollbar id="scroller" align="center" orient="horizontal" oncommand="Presentation.showPage(parseInt(event.target.getAttribute('curpos')));" onclick="Presentation.showPage(parseInt(event.target.getAttribute('curpos')));" onmousedown="Presentation.onScrollerDragStart();" onmousemove="Presentation.onScrollerDragMove();" onmouseup="Presentation.onScrollerDragDrop();"/><spacer flex="1"/></vbox><toolbarseparator/><spacer flex="1"/><toolbarseparator/><toolbarbutton id="toggleEva" label="Eva" type="checkbox" autoCheck="false" oncommand="Presentation.toggleEvaMode();"/><toolbarseparator/><toolbarbutton label="Edit" oncommand="Presentation.toggleEditMode();"/><toolbarbutton oncommand="Presentation.reload();" label="Reload"/></toolbar></toolbox><vbox flex="1" id="canvas" onclick="Presentation.onPresentationClick(event);"><spacer flex="1"/><hbox flex="1"><spacer flex="1"/><vbox id="content"/><spacer flex="1"/></hbox><spacer flex="1"/></vbox></vbox><vbox flex="1" id="edit"><toolbox><toolbar><toolbarbutton label="New Page" oncommand="Presentation.addPage()"/><spacer flex="1"/><toolbarseparator/><toolbarbutton label="View" oncommand="Presentation.toggleEditMode();"/><toolbarbutton oncommand="Presentation.reload();" label="Reload"/></toolbar></toolbox><textbox id="textField" flex="1" multiline="true" oninput="Presentation.onEdit()"/><hbox collapsed="true"><iframe id="dataLoader" onload="if (window.Presentation) Presentation.onDataLoad();"/></hbox></vbox></deck><broadcasterset><broadcaster id="canBack"/><broadcaster id="canForward"/></broadcasterset><commandset><command id="cmd_forward" oncommand="if (Presentation.isPresentationMode) Presentation.forward();"/><command id="cmd_back" oncommand="if (Presentation.isPresentationMode) Presentation.back();"/><command id="cmd_home" oncommand="if (Presentation.isPresentationMode) Presentation.home();"/><command id="cmd_end" oncommand="if (Presentation.isPresentationMode) Presentation.end();"/></commandset><keyset><key keycode="VK_ENTER" command="cmd_forward"/><key keycode="VK_RETURN" command="cmd_forward"/><key keycode="VK_PAGE_DOWN" command="cmd_forward"/><key keycode="VK_RIGHT" command="cmd_forward"/><key keycode="VK_DOWN" command="cmd_forward"/><!--key keycode="VK_BACK_SPACE" command="cmd_back"/--><key keycode="VK_UP" command="cmd_back"/><key keycode="VK_PAGE_UP" command="cmd_back"/><!--<key keycode="VK_BACK_UP" command="cmd_back"/>--><!--<key keycode="VK_BACK_LEFT" command="cmd_back"/>--><key keycode="VK_HOME" command="cmd_home"/><!--<key keycode="VK_END" command="cmd_end"/>--><key key="n" modifiers="accel" oncommand="Presentation.addPage();"/><key key="r" modifiers="accel" oncommand="window.location.reload();"/><key key="e" modifiers="accel" oncommand="Presentation.toggleEditMode();"/><key key="a" modifiers="accel" oncommand="Presentation.toggleEvaMode();"/></keyset><script src="takahashi.js" type="application/x-javascript" /></page>
+
+<deck flex="1" id="deck">
+<vbox flex="1" onmousemove="Presentation.onMouseMoveOnCanvas(event);">
+<toolbox id="canvasToolbar">
+<toolbar>
+<toolbarbutton oncommand="Presentation.home()" label="|<<" observes="canBack"/>
+<toolbarbutton oncommand="Presentation.back()" label="<" observes="canBack"/>
+<toolbarbutton oncommand="Presentation.forward()" label=">" observes="canForward"/>
+<toolbarbutton oncommand="Presentation.end()" label=">>|" observes="canForward"/>
+<toolbarseparator/>
+<hbox align="center">
+<textbox id="current_page" size="4" oninput="if (this.value) Presentation.showPage(parseInt(this.value)-1);"/>
+<description value="/"/>
+<description id="max_page"/>
+</hbox>
+<toolbarseparator/>
+<vbox flex="2">
+<spacer flex="1"/>
+<scrollbar id="scroller" align="center" orient="horizontal" oncommand="Presentation.showPage(parseInt(event.target.getAttribute('curpos')));" onclick="Presentation.showPage(parseInt(event.target.getAttribute('curpos')));" onmousedown="Presentation.onScrollerDragStart();" onmousemove="Presentation.onScrollerDragMove();" onmouseup="Presentation.onScrollerDragDrop();"/>
+<spacer flex="1"/>
+</vbox>
+<toolbarseparator/>
+<spacer flex="1"/>
+<toolbarseparator/>
+<toolbarbutton id="toggleEva" label="Eva" type="checkbox" autoCheck="false" oncommand="Presentation.toggleEvaMode();"/>
+<toolbarseparator/>
+<toolbarbutton label="Edit" oncommand="Presentation.toggleEditMode();"/>
+<toolbarbutton oncommand="Presentation.reload();" label="Reload"/>
+</toolbar>
+</toolbox>
+<vbox flex="1" id="canvas" onclick="Presentation.onPresentationClick(event);">
+<spacer flex="1"/>
+<hbox flex="1">
+<spacer flex="1"/>
+<vbox id="content">
+</vbox>
+<spacer flex="1"/>
+</hbox>
+<spacer flex="1"/>
+</vbox>
+</vbox>
+<vbox flex="1" id="edit">
+<toolbox>
+<toolbar>
+<toolbarbutton label="New Page" oncommand="Presentation.addPage()"/>
+<spacer flex="1"/>
+<toolbarseparator/>
+<toolbarbutton label="View" oncommand="Presentation.toggleEditMode();"/>
+<toolbarbutton oncommand="Presentation.reload();" label="Reload"/>
+</toolbar>
+</toolbox>
+<textbox id="textField" flex="1" multiline="true" oninput="Presentation.onEdit()"/>
+<hbox collapsed="true">
+<iframe id="dataLoader" onload="if (window.Presentation) Presentation.onDataLoad();"/>
+</hbox>
+</vbox>
+</deck>
+<broadcasterset>
+<broadcaster id="canBack"/>
+<broadcaster id="canForward"/>
+</broadcasterset>
+<commandset>
+<command id="cmd_forward" oncommand="if (Presentation.isPresentationMode) Presentation.forward();"/>
+<command id="cmd_back" oncommand="if (Presentation.isPresentationMode) Presentation.back();"/>
+<command id="cmd_home" oncommand="if (Presentation.isPresentationMode) Presentation.home();"/>
+<command id="cmd_end" oncommand="if (Presentation.isPresentationMode) Presentation.end();"/>
+</commandset>
+<keyset>
+<key keycode="VK_ENTER" command="cmd_forward"/>
+<key keycode="VK_RETURN" command="cmd_forward"/>
+<key keycode="VK_PAGE_DOWN" command="cmd_forward"/>
+<key keycode="VK_RIGHT" command="cmd_forward"/>
+<key keycode="VK_DOWN" command="cmd_forward"/>
+<!--key keycode="VK_BACK_SPACE" command="cmd_back"/-->
+<key keycode="VK_UP" command="cmd_back"/>
+<key keycode="VK_PAGE_UP" command="cmd_back"/>
+<!--
+<key keycode="VK_BACK_UP" command="cmd_back"/>-->
+<!--
+<key keycode="VK_BACK_LEFT" command="cmd_back"/>-->
+<key keycode="VK_HOME" command="cmd_home"/>
+<!--
+<key keycode="VK_END" command="cmd_end"/>-->
+<key key="n" modifiers="accel" oncommand="Presentation.addPage();"/>
+<key key="r" modifiers="accel" oncommand="window.location.reload();"/>
+<key key="e" modifiers="accel" oncommand="Presentation.toggleEditMode();"/>
+<key key="a" modifiers="accel" oncommand="Presentation.toggleEvaMode();"/>
+</keyset>
+<script src="takahashi.js" type="application/x-javascript" />
+</page>
+
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1
-
More information about the Jifty-commit
mailing list