Author:	Ian Bicking
Organization:	The Open Planning Project
site:	http://deliverance.openplans.org

`` + +* Because the target is ``children``, it will be appended *inside* the ``

`` tag + +Examples +-------- + +:: + + + +(continued...) + +* It will also preserve the children of that div; if you don't want to preserve that content (e.g., it looks like ``

content goes here

`` use ```` + +Examples +-------- + +:: + + + +* This will remove the ```` tags, but *not* their children (will just clean the content) + +Examples +-------- + +:: + + + +* This will move the ``class`` attribute from ```` in the content, into ```` in the theme. + +* With ```` the *content* attributes get priority, with ```` the *theme* attributes get priority + + +Examples +-------- + +:: + + + +* This adds the element ``

`` from the content immediate *after* ``

`` in the theme + +* This is probably not what you want + +* Usually you want ``children:`` for the theme, and ``elements:`` or ``children:`` for the content + + +if-content +---------- + +* Rules can be conditional + +* The only condition is "if this selection matches something in the content" + +:: + + + + + + +Runtime rule errors/exceptions +------------------------------ + +Consider the rule:: + + + +Your 404 page may not include ``

``. You do not want a 404 to turn into a theme page with no information + + + +Runtime rule errors/exceptions +------------------------------ + +:: + + + +If ``children:#content`` matches no elements, abort all theming. + +Other corner cases can be specified. + +href +---- + +* How do you make the theme dynamic? + +* Deliverance produces **no content** + + - It only moves content around + +* If everything you want to display is in your content or theme, you can move it all around appropriately, otherwise... + + +href +---- + +:: + + + +Take the resource from ``/sidebar`` (which can be dynamic) + +(In the future, this will be a URI Template, so you can implement more dynamicism) + + +Exceptional Places In The Site +------------------------------ + +* Usually the front page + +* The simple way, don't theme it:: + + + + +Exceptional Places In The Site +------------------------------ + + +Or change the theme:: + + + + + ... rules ... + + +Exceptional Places In The Site +------------------------------ + +Or maybe you just want some extra rules:: + + + + ... some extra rules ... + + + + ... other rules ... + + +Exceptional Places In The Site +------------------------------ + +Some application has a PITA bit of CSS:: + + + + + + +Workarounds +----------- + +Avoid theming... + +A page name (any path that ends with ``/blank.html``):: + + + +Workarounds +----------- + +Avoid theming... + +Based on a request header:: + + + +Workarounds +----------- + +Avoid theming... + +Based on a response header:: + + + +This includes "headers" that are in the page, like ```` + +CSS vs. XPath +------------- + +``link[href$='trac.css']`` is CSS 3 which matches all ```` tags with an ``href`` attribute that ends with ``/trac.css`` (CSS 3). + +Compare the CSS 3 with XPath 1.0:: + + link[href$='trac.css'] + //link[substring(@href, string-length(@href)-len('/trac.css')) = '/trac.css'] + + +CSS +--- + +* CSS is great, except for it being horrible + +* CSS **classes** are the horrible part. And ``#id`` + + +CSS +--- + +* CSS is: + + - A way of mapping (vaguely) semantic HTML to a presentation (styles on tags) + + - A page layout description (layout, based mostly on ids) + + - A mapping from a custom semantic document language to presentation (styles on classes) + +CSS +--- + +* Unfortunately, CSS is not portable + + - Page layout and CSS classes use an application-specific vocabulary + +CSS +--- + +* And CSS is not encapsulated: you can't easily apply CSS to just a portion of a site + + - Rules are flat + + - HTML generally is flat + + - This is frustrating, I don't have a solution, I'm not sure what the solution would be (mostly not sure) + +CSS +--- + +* Tag-based CSS (i.e., selectors without class or id conditions) should be dropped from applications, implemented by theme + +* Large-scale page layout CSS (e.g., sidebars, etc.) should also be in the theme + +* Small-scale page layout should remain with the application (e.g., laying out a form); this is typically done partially with ids and partially with classes + +CSS +--- + +* The custom semantic language should be unified across all your applications, and defined by CSS in the theme + + - Like a CSS framework, but better than the CSS frameworks I've seen so far + + - Current CSS frameworks seem focused on making tricky designer problems easier, not to creating a consistent and application agnostic language + +CSS & HTML 5 +------------ + +* HTML 5 increases the number of tags to increase the expressiveness of content without using CSS classes + + - ``

``, ``

``... + + +The Many-Places Problem +----------------------- + +* When someone sees a page, and wants to change something on the page, they now have yet more places to look for the content + +* Deliverance has no solutions yet, this is just an acknowledgment + +* What I'd like is if elements had attributes to show where the element was generated (typically a file or URL where the template that generated the content came from) + +The Many-Places Problem +----------------------- + +* Deliverance would have to mix and match these attributes as it moves things around, but I can only add that feature if there's something worth moving around + + - But I'd really like to add this feature + + - This should be applicable beyond Plone without trouble + + + +Development Cycle +----------------- + +* Theming is entirely separate from the aapplication + + - That also means you can many many themes for one application + + - Meaning, you can do theme development with a production application + +* Link rewriting allows you to theme a live site + +Development Cycle +----------------- + +* You can change rules on the fly (though not the server and proxy settings without a restart) + +* You can change the theme on the fly (*always*) + +Deployment +---------- + +* Why the emphasis on separate server processes? + + - Deploy products in isolation (buildout, virtualenv, etc -- even PHP/apache) + + - *No* shared code + + - Avoid a version/release lockstep between large pieces of your stack + +Deployment +---------- + +* Why the emphasis on separate server processes? + + - Upgrade pieces when you want to, get bug fixes, new features, etc., without cascading effects across your entire site + + - No migrations needed to update Deliverance + + +Opportunities: Caching +---------------------- + +* Everything talks HTTP + + - This means you can put a cache between any two pieces + +* Pages can be assembled from multiple pieces + + - Some of the pieces might be cachable, even if the aggregate is not + + +The Many Implementations of Deliverance +--------------------------------------- + +* Paul Everitt is working on an XSLT implementation + Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/blank.gif ============================================================================== Binary file. No diff available. Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/framing.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/framing.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,25 @@ +/* This file has been placed in the public domain. */ +/* The following styles size, place, and layer the slide components. + Edit these if you want to change the overall slide layout. + The commented lines can be uncommented (and modified, if necessary) + to help you with the rearrangement process. */ + +/* target = 1024x768 */ + +div#header, div#footer, .slide {width: 100%; top: 0; left: 0;} +div#header {position: fixed; top: 0; height: 3em; z-index: 1;} +div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;} +.slide {top: 0; width: 92%; padding: 2.5em 4% 4%; z-index: 2;} +div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;} +div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; + margin: 0;} +#currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; + z-index: 10;} +html>body #currentSlide {position: fixed;} + +/* +div#header {background: #FCC;} +div#footer {background: #CCF;} +div#controls {background: #BBD;} +div#currentSlide {background: #FFC;} +*/ Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/iepngfix.htc ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/iepngfix.htc Fri Oct 10 00:15:37 2008 @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/opera.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/opera.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,8 @@ +/* This file has been placed in the public domain. */ +/* DO NOT CHANGE THESE unless you really want to break Opera Show */ +.slide { + visibility: visible !important; + position: static !important; + page-break-before: always; +} +#slide0 {page-break-before: avoid;} Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/outline.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/outline.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,16 @@ +/* This file has been placed in the public domain. */ +/* Don't change this unless you want the layout stuff to show up in the + outline view! */ + +.layout div, #footer *, #controlForm * {display: none;} +#footer, #controls, #controlForm, #navLinks, #toggle { + display: block; visibility: visible; margin: 0; padding: 0;} +#toggle {float: right; padding: 0.5em;} +html>body #toggle {position: fixed; top: 0; right: 0;} + +/* making the outline look pretty-ish */ + +#slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;} +#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;} + +.outline {display: inline ! important;} Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/pretty.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/pretty.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,122 @@ +/* This file has been placed in the public domain. */ +/* Following are the presentation styles -- edit away! */ + +html, body {margin: 0; padding: 0; line-height: 1.5; font-family: sans-serif} +i, em {font-family: serif} +ul.simple li {margin-bottom: 0.8em} +body {background: white; color: black;} +/* Replace the background style above with the style below (and again for + div#header) for a graphic: */ +/* background: white url(bodybg.gif) -16px 0 no-repeat; */ +:link, :visited {text-decoration: none; color: #00C;} +#controls :active {color: #88A !important;} +#controls :focus {outline: 1px dotted #227;} +h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;} + +blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em;} +blockquote p {margin: 0;} + +kbd {font-weight: bold; font-size: 1em;} +sup {font-size: smaller; line-height: 1px;} + +.slide pre {padding: 0; margin-left: 0; margin-right: 0; font-size: 90%;} +.slide ul ul li {list-style: square;} +.slide img.leader {display: block; margin: 0 auto;} +.slide tt {font-size: 90%;} + +div#header, div#footer {background: #005; color: #AAB; font-family: sans-serif;} +/* background: #005 url(bodybg.gif) -16px 0 no-repeat; */ +div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;} +#footer h1 {display: block; padding: 0 1em;} +#footer h2 {display: block; padding: 0.8em 1em 0;} + +.slide {font-size: 1.2em;} +.slide h1 {position: absolute; top: 0.45em; z-index: 1; + margin: 0; padding-left: 0.7em; white-space: nowrap; + font: bold 150% sans-serif; color: #DDE; background: #005;} +.slide h2 {font: bold 120%/1em sans-serif; padding-top: 0.5em;} +.slide h3 {font: bold 100% sans-serif; padding-top: 0.5em;} +h1 abbr {font-variant: small-caps;} + +div#controls {position: absolute; left: 50%; bottom: 0; + width: 50%; text-align: right; font: bold 0.9em sans-serif;} +html>body div#controls {position: fixed; padding: 0 0 1em 0; top: auto;} +div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; + margin: 0; padding: 0;} +#controls #navLinks a {padding: 0; margin: 0 0.5em; + background: #005; border: none; color: #779; cursor: pointer;} +#controls #navList {height: 1em;} +#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; + background: #DDD; color: #227;} + +#currentSlide {text-align: center; font-size: 0.5em; color: #449; + font-family: sans-serif; font-weight: bold;} + +#slide0 {padding-top: 1.5em} +#slide0 h1 {position: static; margin: 1em 0 0; padding: 0; color: #000; + font: bold 2em sans-serif; white-space: normal; background: transparent;} +#slide0 h2 {font: bold italic 1em sans-serif; margin: 0.25em;} +#slide0 h3 {margin-top: 1.5em; font-size: 1.5em;} +#slide0 h4 {margin-top: 0; font-size: 1em;} + +ul.urls {list-style: none; display: inline; margin: 0;} +.urls li {display: inline; margin: 0;} +.external {border-bottom: 1px dotted gray;} +html>body .external {border-bottom: none;} +.external:after {content: " \274F"; font-size: smaller; color: #77B;} + +.incremental, .incremental *, .incremental *:after {visibility: visible; + color: white; border: 0;} +img.incremental {visibility: hidden;} +.slide .current {color: green;} + +.slide-display {display: inline ! important;} + +.huge {font-family: sans-serif; font-weight: bold; font-size: 150%;} +.big {font-family: sans-serif; font-weight: bold; font-size: 120%;} +.small {font-size: 75%;} +.tiny {font-size: 50%;} +.huge tt, .big tt, .small tt, .tiny tt {font-size: 115%;} +.huge pre, .big pre, .small pre, .tiny pre {font-size: 115%;} + +.maroon {color: maroon;} +.red {color: red;} +.magenta {color: magenta;} +.fuchsia {color: fuchsia;} +.pink {color: #FAA;} +.orange {color: orange;} +.yellow {color: yellow;} +.lime {color: lime;} +.green {color: green;} +.olive {color: olive;} +.teal {color: teal;} +.cyan {color: cyan;} +.aqua {color: aqua;} +.blue {color: blue;} +.navy {color: navy;} +.purple {color: purple;} +.black {color: black;} +.gray {color: gray;} +.silver {color: silver;} +.white {color: white;} + +.left {text-align: left ! important;} +.center {text-align: center ! important;} +.right {text-align: right ! important;} + +.animation {position: relative; margin: 1em 0; padding: 0;} +.animation img {position: absolute;} + +/* Docutils-specific overrides */ + +.slide table.docinfo {margin: 1em 0 0.5em 2em;} + +pre.literal-block, pre.doctest-block {background-color: white;} + +tt.docutils {background-color: white;} + +/* diagnostics */ +/* +li:after {content: " [" attr(class) "]"; color: #F88;} +div:before {content: "[" attr(class) "]"; color: #F88;} +*/ Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/print.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/print.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,24 @@ +/* This file has been placed in the public domain. */ +/* The following rule is necessary to have all slides appear in print! + DO NOT REMOVE IT! */ +.slide, ul {page-break-inside: avoid; visibility: visible !important;} +h1 {page-break-after: avoid;} + +body {font-size: 12pt; background: white;} +* {color: black;} + +#slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} +#slide0 h3 {margin: 0; padding: 0;} +#slide0 h4 {margin: 0 0 0.5em; padding: 0;} +#slide0 {margin-bottom: 3em;} + +#header {display: none;} +#footer h1 {margin: 0; border-bottom: 1px solid; color: gray; + font-style: italic;} +#footer h2, #controls {display: none;} + +.print {display: inline ! important;} + +/* The following rule keeps the layout stuff out of print. + Remove at your own risk! */ +.layout, .layout * {display: none !important;} Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/s5-core.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/s5-core.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,11 @@ +/* This file has been placed in the public domain. */ +/* Do not edit or override these styles! + The system will likely break if you do. */ + +div#header, div#footer, div#controls, .slide {position: absolute;} +html>body div#header, html>body div#footer, + html>body div#controls, html>body .slide {position: fixed;} +.handout {display: none;} +.layout {display: block;} +.slide, .hideme, .incremental {visibility: hidden;} +#slide0 {visibility: visible;} Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/slides.css ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/slides.css Fri Oct 10 00:15:37 2008 @@ -0,0 +1,10 @@ +/* This file has been placed in the public domain. */ + +/* required to make the slide show run at all */ + at import url(s5-core.css); + +/* sets basic placement and size of slide components */ + at import url(framing.css); + +/* styles that make the slides look good */ + at import url(pretty.css); Added: z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/slides.js ============================================================================== --- (empty file) +++ z3/deliverance/sandbox/ianb/ploneconf2008/ui/default/slides.js Fri Oct 10 00:15:37 2008 @@ -0,0 +1,558 @@ +// S5 v1.1 slides.js -- released into the Public Domain +// Modified for Docutils (http://docutils.sf.net) by David Goodger +// +// Please see http://www.meyerweb.com/eric/tools/s5/credits.html for +// information about all the wonderful and talented contributors to this code! + +var undef; +var slideCSS = ''; +var snum = 0; +var smax = 1; +var slideIDs = new Array(); +var incpos = 0; +var number = undef; +var s5mode = true; +var defaultView = 'slideshow'; +var controlVis = 'visible'; + +var isIE = navigator.appName == 'Microsoft Internet Explorer' ? 1 : 0; +var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0; +var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0; + +function hasClass(object, className) { + if (!object.className) return false; + return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1); +} + +function hasValue(object, value) { + if (!object) return false; + return (object.search('(^|\\s)' + value + '(\\s|$)') != -1); +} + +function removeClass(object,className) { + if (!object) return; + object.className = object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'), RegExp.$1+RegExp.$2); +} + +function addClass(object,className) { + if (!object || hasClass(object, className)) return; + if (object.className) { + object.className += ' '+className; + } else { + object.className = className; + } +} + +function GetElementsWithClassName(elementName,className) { + var allElements = document.getElementsByTagName(elementName); + var elemColl = new Array(); + for (var i = 0; i< allElements.length; i++) { + if (hasClass(allElements[i], className)) { + elemColl[elemColl.length] = allElements[i]; + } + } + return elemColl; +} + +function isParentOrSelf(element, id) { + if (element == null || element.nodeName=='BODY') return false; + else if (element.id == id) return true; + else return isParentOrSelf(element.parentNode, id); +} + +function nodeValue(node) { + var result = ""; + if (node.nodeType == 1) { + var children = node.childNodes; + for (var i = 0; i < children.length; ++i) { + result += nodeValue(children[i]); + } + } + else if (node.nodeType == 3) { + result = node.nodeValue; + } + return(result); +} + +function slideLabel() { + var slideColl = GetElementsWithClassName('*','slide'); + var list = document.getElementById('jumplist'); + smax = slideColl.length; + for (var n = 0; n < smax; n++) { + var obj = slideColl[n]; + + var did = 'slide' + n.toString(); + if (obj.getAttribute('id')) { + slideIDs[n] = obj.getAttribute('id'); + } + else { + obj.setAttribute('id',did); + slideIDs[n] = did; + } + if (isOp) continue; + + var otext = ''; + var menu = obj.firstChild; + if (!menu) continue; // to cope with empty slides + while (menu && menu.nodeType == 3) { + menu = menu.nextSibling; + } + if (!menu) continue; // to cope with slides with only text nodes + + var menunodes = menu.childNodes; + for (var o = 0; o < menunodes.length; o++) { + otext += nodeValue(menunodes[o]); + } + list.options[list.length] = new Option(n + ' : ' + otext, n); + } +} + +function currentSlide() { + var cs; + var footer_nodes; + var vis = 'visible'; + if (document.getElementById) { + cs = document.getElementById('currentSlide'); + footer_nodes = document.getElementById('footer').childNodes; + } else { + cs = document.currentSlide; + footer = document.footer.childNodes; + } + cs.innerHTML = '' + snum + '<\/span> ' + + '\/<\/span> ' + + '' + (smax-1) + '<\/span>'; + if (snum == 0) { + vis = 'hidden'; + } + cs.style.visibility = vis; + for (var i = 0; i < footer_nodes.length; i++) { + if (footer_nodes[i].nodeType == 1) { + footer_nodes[i].style.visibility = vis; + } + } +} + +function go(step) { + if (document.getElementById('slideProj').disabled || step == 0) return; + var jl = document.getElementById('jumplist'); + var cid = slideIDs[snum]; + var ce = document.getElementById(cid); + if (incrementals[snum].length > 0) { + for (var i = 0; i < incrementals[snum].length; i++) { + removeClass(incrementals[snum][i], 'current'); + removeClass(incrementals[snum][i], 'incremental'); + } + } + if (step != 'j') { + snum += step; + lmax = smax - 1; + if (snum > lmax) snum = lmax; + if (snum < 0) snum = 0; + } else + snum = parseInt(jl.value); + var nid = slideIDs[snum]; + var ne = document.getElementById(nid); + if (!ne) { + ne = document.getElementById(slideIDs[0]); + snum = 0; + } + if (step < 0) {incpos = incrementals[snum].length} else {incpos = 0;} + if (incrementals[snum].length > 0 && incpos == 0) { + for (var i = 0; i < incrementals[snum].length; i++) { + if (hasClass(incrementals[snum][i], 'current')) + incpos = i + 1; + else + addClass(incrementals[snum][i], 'incremental'); + } + } + if (incrementals[snum].length > 0 && incpos > 0) + addClass(incrementals[snum][incpos - 1], 'current'); + ce.style.visibility = 'hidden'; + ne.style.visibility = 'visible'; + jl.selectedIndex = snum; + currentSlide(); + number = 0; +} + +function goTo(target) { + if (target >= smax || target == snum) return; + go(target - snum); +} + +function subgo(step) { + if (step > 0) { + removeClass(incrementals[snum][incpos - 1],'current'); + removeClass(incrementals[snum][incpos], 'incremental'); + addClass(incrementals[snum][incpos],'current'); + incpos++; + } else { + incpos--; + removeClass(incrementals[snum][incpos],'current'); + addClass(incrementals[snum][incpos], 'incremental'); + addClass(incrementals[snum][incpos - 1],'current'); + } +} + +function toggle() { + var slideColl = GetElementsWithClassName('*','slide'); + var slides = document.getElementById('slideProj'); + var outline = document.getElementById('outlineStyle'); + if (!slides.disabled) { + slides.disabled = true; + outline.disabled = false; + s5mode = false; + fontSize('1em'); + for (var n = 0; n < smax; n++) { + var slide = slideColl[n]; + slide.style.visibility = 'visible'; + } + } else { + slides.disabled = false; + outline.disabled = true; + s5mode = true; + fontScale(); + for (var n = 0; n < smax; n++) { + var slide = slideColl[n]; + slide.style.visibility = 'hidden'; + } + slideColl[snum].style.visibility = 'visible'; + } +} + +function showHide(action) { + var obj = GetElementsWithClassName('*','hideme')[0]; + switch (action) { + case 's': obj.style.visibility = 'visible'; break; + case 'h': obj.style.visibility = 'hidden'; break; + case 'k': + if (obj.style.visibility != 'visible') { + obj.style.visibility = 'visible'; + } else { + obj.style.visibility = 'hidden'; + } + break; + } +} + +// 'keys' code adapted from MozPoint (http://mozpoint.mozdev.org/) +function keys(key) { + if (!key) { + key = event; + key.which = key.keyCode; + } + if (key.which == 84) { + toggle(); + return; + } + if (s5mode) { + switch (key.which) { + case 10: // return + case 13: // enter + if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return; + if (key.target && isParentOrSelf(key.target, 'controls')) return; + if(number != undef) { + goTo(number); + break; + } + case 32: // spacebar + case 34: // page down + case 39: // rightkey + case 40: // downkey + if(number != undef) { + go(number); + } else if (!incrementals[snum] || incpos >= incrementals[snum].length) { + go(1); + } else { + subgo(1); + } + break; + case 33: // page up + case 37: // leftkey + case 38: // upkey + if(number != undef) { + go(-1 * number); + } else if (!incrementals[snum] || incpos <= 0) { + go(-1); + } else { + subgo(-1); + } + break; + case 36: // home + goTo(0); + break; + case 35: // end + goTo(smax-1); + break; + case 67: // c + showHide('k'); + break; + } + if (key.which < 48 || key.which > 57) { + number = undef; + } else { + if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return; + if (key.target && isParentOrSelf(key.target, 'controls')) return; + number = (((number != undef) ? number : 0) * 10) + (key.which - 48); + } + } + return false; +} + +function clicker(e) { + number = undef; + var target; + if (window.event) { + target = window.event.srcElement; + e = window.event; + } else target = e.target; + if (target.href != null || hasValue(target.rel, 'external') || isParentOrSelf(target, 'controls') || isParentOrSelf(target,'embed') || isParentOrSelf(target, 'object')) return true; + if (!e.which || e.which == 1) { + if (!incrementals[snum] || incpos >= incrementals[snum].length) { + go(1); + } else { + subgo(1); + } + } +} + +function findSlide(hash) { + var target = document.getElementById(hash); + if (target) { + for (var i = 0; i < slideIDs.length; i++) { + if (target.id == slideIDs[i]) return i; + } + } + return null; +} + +function slideJump() { + if (window.location.hash == null || window.location.hash == '') { + currentSlide(); + return; + } + if (window.location.hash == null) return; + var dest = null; + dest = findSlide(window.location.hash.slice(1)); + if (dest == null) { + dest = 0; + } + go(dest - snum); +} + +function fixLinks() { + var thisUri = window.location.href; + thisUri = thisUri.slice(0, thisUri.length - window.location.hash.length); + var aelements = document.getElementsByTagName('A'); + for (var i = 0; i < aelements.length; i++) { + var a = aelements[i].href; + var slideID = a.match('\#.+'); + if ((slideID) && (slideID[0].slice(0,1) == '#')) { + var dest = findSlide(slideID[0].slice(1)); + if (dest != null) { + if (aelements[i].addEventListener) { + aelements[i].addEventListener("click", new Function("e", + "if (document.getElementById('slideProj').disabled) return;" + + "go("+dest+" - snum); " + + "if (e.preventDefault) e.preventDefault();"), true); + } else if (aelements[i].attachEvent) { + aelements[i].attachEvent("onclick", new Function("", + "if (document.getElementById('slideProj').disabled) return;" + + "go("+dest+" - snum); " + + "event.returnValue = false;")); + } + } + } + } +} + +function externalLinks() { + if (!document.getElementsByTagName) return; + var anchors = document.getElementsByTagName('a'); + for (var i=0; i' + + '

' + + 'Ø<\/a>' + + '«<\/a>' + + '»<\/a>' + + '

- +
+Or give the file contents: (filename required)
+ +
+ Modified: z3/deliverance/trunk/deliverance/log.py ============================================================================== --- z3/deliverance/trunk/deliverance/log.py (original) +++ z3/deliverance/trunk/deliverance/log.py Fri Oct 10 21:15:34 2008 @@ -25,8 +25,8 @@ self.request = request # This is writable: self.theme_url = None - # Also writable: - self.edit_url = None + # Also writable (list of (url, name)) + self.edit_urls = [] def message(self, level, el, msg, *args, **kw): """Add one message at the given log level""" @@ -68,19 +68,24 @@ return resp log_template = HTMLTemplate('''\ -

Deliverance Information

{{if log.theme_url}} - theme: {{theme_url}} + theme {{else}} theme: no theme set {{endif}} | unthemed content | content source | browse content - {{if log.edit_url}} - | edit files + {{if log.edit_urls}} + | {{endif}} {{if edit_rules}} | edit rules Modified: z3/deliverance/trunk/deliverance/proxy.py ============================================================================== --- z3/deliverance/trunk/deliverance/proxy.py (original) +++ z3/deliverance/trunk/deliverance/proxy.py Fri Oct 10 21:15:34 2008 @@ -66,10 +66,13 @@ request = Request(environ) log = environ['deliverance.log'] for index, proxy in enumerate(self.proxies): + if proxy.editable: + url = request.application_url + '/.deliverance/proxy-editor/%s/' % (index+1) + name = proxy.editable_name + if (url, name) not in log.edit_urls: + log.edit_urls.append((url, name)) ## FIXME: obviously this is wonky: if proxy.match(request, None, None, log): - if proxy.editable: - log.edit_url = request.application_url + '/.deliverance/proxy-editor/%s/' % (index+1) try: return proxy.forward_request(environ, start_response) except AbortProxy, e: @@ -368,6 +371,14 @@ return editor(environ, start_response) except exc.HTTPException, e: return e(environ, start_response) + + @property + def editable_name(self): + dest_href = self.dest.href + base = posixpath.basename(dest_href) + if not base: + base = posixpath.basename(posixpath.dirname(dest_href)) + return base class ProxyMatch(AbstractMatch): """Represents the request matching for objects""" From ianb at codespeak.net Fri Oct 10 23:25:25 2008 From: ianb at codespeak.net (ianb at codespeak.net) Date: Fri, 10 Oct 2008 23:25:25 +0200 (CEST) Subject: [z3-checkins] r58940 - z3/deliverance/trunk/deliverance Message-ID: <20081010212525.9B50A16A12C@codespeak.net> Author: ianb Date: Fri Oct 10 23:25:24 2008 New Revision: 58940 Modified: z3/deliverance/trunk/deliverance/log.py z3/deliverance/trunk/deliverance/middleware.py Log: Add a link to browse the theme Modified: z3/deliverance/trunk/deliverance/log.py ============================================================================== --- z3/deliverance/trunk/deliverance/log.py (original) +++ z3/deliverance/trunk/deliverance/log.py Fri Oct 10 23:25:24 2008 @@ -79,6 +79,7 @@ | unthemed content | content source | browse content + / theme {{if log.edit_urls}} |

+{{if show_parent}} +{{dirname(dir)}} /{{basename(dir)}}/ +{{else}} +{{dir}}/ +{{endif}} +

Deliverance: Theming Decoupled

Deliverance: Theming Decoupled

Outline Of This Talk

Installation

paster startup

Demo

Why Deliverance?

Why Do I Work With Deliverance?

Why Do I Work With Deliverance?

Why Should You Care?

Why Should You Care?

Why You Should Want Heterogeneity

Heterogeneous Stacks Are Hard

How Deliverance Works

Moving Boxes Around

From Content To Theme

From Content To Theme

The Rules

replace, append, prepend

Rules

Rules

Selectors

Selectors (modifiers)

Selectors (modifiers)

drop

Examples

Examples

Examples

Examples

Examples

if-content

Runtime rule errors/exceptions

Runtime rule errors/exceptions

href

href

Exceptional Places In The Site

Exceptional Places In The Site

Exceptional Places In The Site

Exceptional Places In The Site

Workarounds

Workarounds

Workarounds

CSS vs. XPath

CSS

CSS

CSS

CSS

CSS

CSS

CSS & HTML 5

The Many-Places Problem

The Many-Places Problem

Development Cycle

Development Cycle

Deployment

Deployment

Opportunities: Caching

The Many Implementations of Deliverance

Deliverance Information

Deliverance Information