com presentations: Fixed formatting due to screen size limitations: slides/mongodb/driver-current-status.xml slides/mongodb/driver-history-1.0.0-2.xml slides/mongodb/driver-history-1.0.0.xml slides/mongodb/new-driver-bc2.xml templates/default/image.ezt

Commit:    bb1a2c9f128a3a59cc2bf56922419ad809e7b44d
Author:    Derick Rethans <[email protected]>         Tue, 19 May 2015 16:56:04 -0500
Parents:   1a83b72a465d1a14dc03e491c693d0867555e58d
Branches:  master

Link:       http://git.php.net/?p=presentations.git;a=commitdiff;h=bb1a2c9f128a3a59cc2bf56922419ad809e7b44d

Log:
Fixed formatting due to screen size limitations

Changed paths:
  M  slides/mongodb/driver-current-status.xml
  M  slides/mongodb/driver-history-1.0.0-2.xml
  M  slides/mongodb/driver-history-1.0.0.xml
  M  slides/mongodb/new-driver-bc2.xml
  M  templates/default/image.ezt


Diff:
diff --git a/slides/mongodb/driver-current-status.xml b/slides/mongodb/driver-current-status.xml
index 441bcc3..1c93c7d 100644
--- a/slides/mongodb/driver-current-status.xml
+++ b/slides/mongodb/driver-current-status.xml
@@ -1,19 +1,13 @@
 <slide>
 <title>MongoDB driver — current</title>
 
-<table><tr>
-<td><image filename="author-derickr.png"/></td>
-<td><image filename="author-hannes.png"/></td>
-<td><image filename="author-jeremy.png"/></td>
-</tr></table>
-
-<blurb>The driver generally works well, but there are issues:</blurb>
 <list>
-    <bullet>Former "great" design choices, among them:
+	<bullet>
+	<blurb>Former "great" design choices:</blurb>
         <list>
             <bullet>array/object deserialization</bullet>
             <bullet>positional arguments/options array</bullet>
-            <bullet>not a clear strategy for which command we add helpers</bullet>
+            <bullet>no clear strategy for when to add command helpers</bullet>
             <bullet>static MongoCursor::timeout and ::slaveOkay methods</bullet>
             <bullet>MongoLog and stream context listeners</bullet>
         </list>
diff --git a/slides/mongodb/driver-history-1.0.0-2.xml b/slides/mongodb/driver-history-1.0.0-2.xml
index 3c46cf3..5b1e698 100644
--- a/slides/mongodb/driver-history-1.0.0-2.xml
+++ b/slides/mongodb/driver-history-1.0.0-2.xml
@@ -1,25 +1,18 @@
 <slide>
 <title>History: 1.0.0 (September 2009)</title>
 
-<list>
-    <bullet>Both BSON arrays and documents come now back into PHP as arrays:
-    <example result="1"><![CDATA[<?php
-$m = new Mongo;
-$c = $m->selectCollection( 'demo', 'test' );
-$c->drop();
+<blurb>Both BSON arrays and documents come now back into PHP as arrays</blurb>
+<example result="1"><![CDATA[<?php
+$m = new Mongo; $c = $m->selectCollection( 'demo', 'test' ); $c->drop();
 
 $doc1 = new StdClass;
 $doc1->foo = 'bar';
 $doc2 = array( 'foo' => 'bar' );
 
-$c->insert( $doc1 );
-$c->insert( $doc2 );
+$c->insert( $doc1 ); $c->insert( $doc2 );
 
 foreach( $c->find( array( 'foo' => 'bar' ), array( '_id' => 0 ) ) as $result )
 {
     var_dump( $result );
-}
-?>]]></example>
-    </bullet>
-</list>
+} ]]></example>
 </slide>
diff --git a/slides/mongodb/driver-history-1.0.0.xml b/slides/mongodb/driver-history-1.0.0.xml
index 672d188..621bbbf 100644
--- a/slides/mongodb/driver-history-1.0.0.xml
+++ b/slides/mongodb/driver-history-1.0.0.xml
@@ -1,19 +1,16 @@
 <slide>
 <title>History: 1.0.0 (September 2009)</title>
 
-<list>
-    <bullet>Query operators don't have to start with %$% anymore:
-    <example><![CDATA[<?php
+<blurb>Query operators don't have to start with %$% anymore:</blurb>
+<example><![CDATA[<?php
 $m = new Mongo;
 $c = $m->selectCollection( 'dbname', 'colname' );
 $r = $c->find( array( "fieldname" => array( "$gte" => 42 ) ) );
 ?>]]></example>
-    <blurb>%ini_set( 'mongo.cmd', '@' );%</blurb>
-    <example><![CDATA[<?php
+<blurb>%ini_set( 'mongo.cmd', '@' );%</blurb>
+<example><![CDATA[<?php
 $m = new Mongo;
 $c = $m->selectCollection( 'dbname', 'colname' );
 $r = $c->find( array( "fieldname" => array( "@gte" => 42 ) ) );
 ?>]]></example>
-    </bullet>
-</list>
 </slide>
diff --git a/slides/mongodb/new-driver-bc2.xml b/slides/mongodb/new-driver-bc2.xml
index 0fc2302..5c98480 100644
--- a/slides/mongodb/new-driver-bc2.xml
+++ b/slides/mongodb/new-driver-bc2.xml
@@ -6,4 +6,11 @@
     <bullet>New extension name will be "MongoDB"</bullet>
     <bullet>You will be able to load both "mongo.so" and "mongodb.so"</bullet>
 </list>
+
+<blurb>pecl site:</blurb>
+<image filename="mongo-x2.png"/>
+<break/>
+
+<blurb>%http://docs.php.net/manual/en/refs.database.php%:</blurb>
+<image filename="mongo-x2b.png"/>
 </slide>
diff --git a/templates/default/image.ezt b/templates/default/image.ezt
index e744076..cb4e93b 100644
--- a/templates/default/image.ezt
+++ b/templates/default/image.ezt
@@ -1,6 +1,6 @@
 {use $node, $pres, $inline = false}
 {var $align = get_attribute( $node, 'align' )}
 {var $attr = get_attribute( $node, 'attr' )}
-{if $attr}<div{if $align} align='{$align}'{/if}>{/if}
+{if $attr}<div{if $align} style='float: {$align}'{/if}><div>{/if}
 <img {if $inline}class='inline' {/if}{if $align}align='{$align}' class='{$align}' {/if}src='{$pres->base}{get_attribute( $node, 'filename' )}'/>
-{if $attr}<p class='attribution'>{$attr}</p></div>{/if}
+{if $attr}<p class='attribution'>{$attr}</p></div></div>{/if}