Permalink
Browse files

Merge branch 'master' of git://github.com/TwP/webby

  • Loading branch information...
2 parents 97e53b7 + 0bb6f71 commit 39477bbc2b7aa4dcddb295e7095b420092099e78 David Chelimsky committed Jun 18, 2008
Showing with 2,571 additions and 185 deletions.
  1. +23 −4 History.txt
  2. +44 −0 Manifest.txt
  3. +3 −5 Rakefile
  4. BIN data/content/s5/blank.gif
  5. BIN data/content/s5/bodybg.gif
  6. +23 −0 data/content/s5/framing.css
  7. +42 −0 data/content/s5/iepngfix.htc
  8. +7 −0 data/content/s5/opera.css
  9. +15 −0 data/content/s5/outline.css
  10. +86 −0 data/content/s5/pretty.css
  11. +1 −0 data/content/s5/print.css
  12. +9 −0 data/content/s5/s5-core.css
  13. +3 −0 data/content/s5/slides.css
  14. +553 −0 data/content/s5/slides.js
  15. +22 −0 data/templates/blog/month.erb
  16. +15 −0 data/templates/blog/post.erb
  17. +22 −0 data/templates/blog/year.erb
  18. +40 −0 data/templates/presentation.erb
  19. +14 −0 examples/presentation/Rakefile
  20. +10 −0 examples/presentation/content/_sample_code.txt
  21. +137 −0 examples/presentation/content/css/uv/twilight.css
  22. +63 −0 examples/presentation/content/index.txt
  23. BIN examples/presentation/content/s5/blank.gif
  24. BIN examples/presentation/content/s5/bodybg.gif
  25. +23 −0 examples/presentation/content/s5/framing.css
  26. +42 −0 examples/presentation/content/s5/iepngfix.htc
  27. +7 −0 examples/presentation/content/s5/opera.css
  28. +15 −0 examples/presentation/content/s5/outline.css
  29. +86 −0 examples/presentation/content/s5/pretty.css
  30. +1 −0 examples/presentation/content/s5/print.css
  31. +9 −0 examples/presentation/content/s5/s5-core.css
  32. +3 −0 examples/presentation/content/s5/slides.css
  33. +553 −0 examples/presentation/content/s5/slides.js
  34. +43 −0 examples/presentation/layouts/presentation.rhtml
  35. +71 −0 examples/presentation/tasks/blog.rake
  36. +27 −0 examples/presentation/tasks/build.rake
  37. +22 −0 examples/presentation/tasks/create.rake
  38. +22 −0 examples/presentation/tasks/deploy.rake
  39. +12 −0 examples/presentation/tasks/growl.rake
  40. +28 −0 examples/presentation/tasks/heel.rake
  41. +17 −0 examples/presentation/tasks/setup.rb
  42. +19 −0 examples/presentation/tasks/validate.rake
  43. +13 −0 examples/presentation/templates/_partial.erb
  44. +40 −0 examples/presentation/templates/presentation.erb
  45. +1 −1 examples/webby/content/index.txt
  46. +1 −1 examples/webby/content/manual/index.txt
  47. +1 −1 examples/webby/content/reference/index.txt
  48. +1 −1 examples/webby/content/tips_and_tricks/index.txt
  49. +1 −1 examples/webby/content/tutorial/index.txt
  50. +18 −2 lib/webby.rb
  51. +5 −1 lib/webby/filters.rb
  52. +1 −1 lib/webby/filters/haml.rb
  53. +1 −1 lib/webby/filters/sass.rb
  54. +82 −17 lib/webby/helpers/capture_helper.rb
  55. +2 −4 lib/webby/helpers/coderay_helper.rb
  56. +2 −6 lib/webby/helpers/graphviz_helper.rb
  57. +2 −4 lib/webby/helpers/tex_img_helper.rb
  58. +0 −54 lib/webby/helpers/textile_code_helper.rb
  59. +2 −4 lib/webby/helpers/ultraviolet_helper.rb
  60. +136 −34 lib/webby/renderer.rb
  61. +26 −19 lib/webby/resources/db.rb
  62. +4 −7 lib/webby/resources/page.rb
  63. +1 −1 lib/webby/resources/partial.rb
  64. +20 −0 lib/webby/resources/resource.rb
  65. +27 −13 spec/webby/helpers/capture_helper_spec.rb
  66. +10 −2 tasks/gem.rake
  67. +41 −0 tasks/git.rake
  68. +1 −1 tasks/rubyforge.rake
View
@@ -1,15 +1,34 @@
-== 0.8.3 / 2008-04-
+== 0.9.0 / 2008-06-
-* 1 major enhancement
+* 1 bug fix
+ - Better error message when an unkonwn filter is given
+
+== 0.8.4 / 2008-06-03
+
+* 1 minor improvement
+ - Global defaults for HAML and SASS [Dag Odenhall]
+* 1 bug fix
+ - Added the blog templates to the package
+
+== 0.8.3 / 2008-06-02
+
+* 2 major enhancements
- Added blogging support
-* 4 minor enhancements
+ - Added S5 slide presentation support
+* 6 minor enhancements
- Changed the arguments to the DB#find method
- Added locals support for page templates
- Updated atom feed generation template
- Partials now support local variables when rendering
-* 2 bug fixes
+ - Can guard rendering results from processing by subsequent filters
+ (useful when rendering partials or embedding other pages)
+ - Support for "content_for" style captures [M@ McCray]
+* 5 bug fixes
- Fixed reference to an non-existent Error class
- Basepath filter now handles XML files properly
+ - Removed the "--delete" flag from the rsync options [Denis Defreyne]
+ - Fixed a nil cursor bug in the rendering filter stack
+ - Recursive find now works from the root content folder (bug 20281)
== 0.8.2 / 2008-03-12
View
@@ -29,6 +29,17 @@ data/content/css/blueprint/screen.css
data/content/css/coderay.css
data/content/css/site.css
data/content/index.txt
+data/content/s5/blank.gif
+data/content/s5/bodybg.gif
+data/content/s5/framing.css
+data/content/s5/iepngfix.htc
+data/content/s5/opera.css
+data/content/s5/outline.css
+data/content/s5/pretty.css
+data/content/s5/print.css
+data/content/s5/s5-core.css
+data/content/s5/slides.css
+data/content/s5/slides.js
data/layouts/default.rhtml
data/lib/breadcrumbs.rb
data/tasks/blog.rake
@@ -41,7 +52,37 @@ data/tasks/setup.rb
data/tasks/validate.rake
data/templates/_partial.erb
data/templates/atom_feed.erb
+data/templates/blog/month.erb
+data/templates/blog/post.erb
+data/templates/blog/year.erb
data/templates/page.erb
+data/templates/presentation.erb
+examples/presentation/Rakefile
+examples/presentation/content/_sample_code.txt
+examples/presentation/content/css/uv/twilight.css
+examples/presentation/content/index.txt
+examples/presentation/content/s5/blank.gif
+examples/presentation/content/s5/bodybg.gif
+examples/presentation/content/s5/framing.css
+examples/presentation/content/s5/iepngfix.htc
+examples/presentation/content/s5/opera.css
+examples/presentation/content/s5/outline.css
+examples/presentation/content/s5/pretty.css
+examples/presentation/content/s5/print.css
+examples/presentation/content/s5/s5-core.css
+examples/presentation/content/s5/slides.css
+examples/presentation/content/s5/slides.js
+examples/presentation/layouts/presentation.rhtml
+examples/presentation/tasks/blog.rake
+examples/presentation/tasks/build.rake
+examples/presentation/tasks/create.rake
+examples/presentation/tasks/deploy.rake
+examples/presentation/tasks/growl.rake
+examples/presentation/tasks/heel.rake
+examples/presentation/tasks/setup.rb
+examples/presentation/tasks/validate.rake
+examples/presentation/templates/_partial.erb
+examples/presentation/templates/presentation.erb
examples/webby/Rakefile
examples/webby/content/css/blueprint/print.css
examples/webby/content/css/blueprint/screen.css
@@ -76,9 +117,11 @@ lib/webby/filters/haml.rb
lib/webby/filters/markdown.rb
lib/webby/filters/outline.rb
lib/webby/filters/sass.rb
+lib/webby/filters/slides.rb
lib/webby/filters/textile.rb
lib/webby/filters/tidy.rb
lib/webby/helpers.rb
+lib/webby/helpers/capture_helper.rb
lib/webby/helpers/coderay_helper.rb
lib/webby/helpers/graphviz_helper.rb
lib/webby/helpers/tag_helper.rb
@@ -102,6 +145,7 @@ lib/webby/stelan/spawner.rb
lib/webby/utils.rb
spec/spec.opts
spec/spec_helper.rb
+spec/webby/helpers/capture_helper_spec.rb
spec/webby/resources/file_spec.rb
tasks/ann.rake
tasks/bones.rake
View
@@ -15,7 +15,7 @@ PROJ.url = 'http://webby.rubyforge.org/'
PROJ.description = paragraphs_of('README.txt', 3).join("\n\n")
PROJ.rubyforge.name = 'webby'
PROJ.version = Webby::VERSION
-PROJ.release_name = 'Teetering Toddler'
+PROJ.release_name = 'Forgetful Foobar'
PROJ.ruby_opts = %w[-W0]
PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$)
@@ -34,9 +34,8 @@ PROJ.ann.email[:port] = 587
PROJ.ann.text = <<-ANN
== FUN FACT
-La Paz, the capital city of Bolivia, is the highest capital in the
-world at over 17,000 feet (5,181 m).
-
+TODO: add a new fun fact before next release
+
== POST SCRIPT
Visit the Webby forum to chat with other Webby-Heads:
@@ -49,7 +48,6 @@ ANN
depend_on 'directory_watcher'
depend_on 'heel'
depend_on 'hpricot'
-depend_on 'htmlentities'
depend_on 'logging'
depend_on 'rake'
depend_on 'rspec'
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,23 @@
+/* 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 {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: 3.5em 4% 4%; z-index: 2; list-style: none;}
+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;}
+*/
@@ -0,0 +1,42 @@
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script>
+
+// IE5.5+ PNG Alpha Fix v1.0 by Angus Turnbull http://www.twinhelix.com
+// Free usage permitted as long as this notice remains intact.
+
+// This must be a path to a blank image. That's all the configuration you need here.
+var blankImg = 'ui/default/blank.gif';
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m) {
+ if (filters[f]) {
+ filters[f].enabled = s ? true : false;
+ if (s) with (filters[f]) { src = s; sizingMethod = m }
+ } else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix() {
+ if ((parseFloat(navigator.userAgent.match(/MSIE (\S+)/)[1]) < 5.5) ||
+ (event && !/(background|src)/.test(event.propertyName))) return;
+
+ if (tagName == 'IMG') {
+ if ((/\.png$/i).test(src)) {
+ filt(src, 'image'); // was 'scale'
+ src = blankImg;
+ } else if (src.indexOf(blankImg) < 0) filt();
+ } else if (style.backgroundImage) {
+ if (style.backgroundImage.match(/^url[("']+(.*\.png)[)"']+$/i)) {
+ var s = RegExp.$1;
+ style.backgroundImage = '';
+ filt(s, 'crop');
+ } else filt();
+ }
+}
+
+doFix();
+
+</script>
+</public:component>
@@ -0,0 +1,7 @@
+/* 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;}
@@ -0,0 +1,15 @@
+/* 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;}
+#slide0 h1 {padding-top: 1.5em;}
+.slide h1 {margin: 1.5em 0 0; padding-top: 0.25em;
+ border-top: 1px solid #888; border-bottom: 1px solid #AAA;}
+#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;}
View
@@ -0,0 +1,86 @@
+/* Following are the presentation styles -- edit away! */
+
+body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;}
+: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;}
+ul, pre {margin: 0; line-height: 1em;}
+html, body {margin: 0; padding: 0;}
+
+blockquote, q {font-style: italic;}
+blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em; text-align: center; font-size: 1em;}
+blockquote p {margin: 0;}
+blockquote i {font-style: normal;}
+blockquote b {display: block; margin-top: 0.5em; font-weight: normal; font-size: smaller; font-style: normal;}
+blockquote b i {font-style: italic;}
+
+kbd {font-weight: bold; font-size: 1em;}
+sup {font-size: smaller; line-height: 1px;}
+
+.slide code {padding: 2px 0.25em; font-weight: bold; color: #533;}
+.slide code.bad, code del {color: red;}
+.slide code.old {color: silver;}
+.slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;}
+.slide pre code {display: block;}
+.slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;}
+.slide li {margin-top: 0.75em; margin-right: 0;}
+.slide ul ul {line-height: 1;}
+.slide ul ul li {margin: .2em; font-size: 85%; list-style: square;}
+.slide img.leader {display: block; margin: 0 auto;}
+
+div#header, div#footer {background: #005; color: #AAB;
+ font-family: Verdana, Helvetica, sans-serif;}
+div#header {background: #005 url(bodybg.gif) -16px 0 no-repeat;
+ line-height: 1px;}
+div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;}
+#footer h1, #footer h2 {display: block; padding: 0 1em;}
+#footer h2 {font-style: italic;}
+
+div.long {font-size: 0.75em;}
+.slide h1 {position: absolute; top: 0.7em; left: 87px; z-index: 1;
+ margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap;
+ font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize;
+ color: #DDE; background: #005;}
+.slide h3 {font-size: 130%;}
+h1 abbr {font-variant: small-caps;}
+
+div#controls {position: absolute; left: 50%; bottom: 0;
+ width: 50%;
+ text-align: right; font: bold 0.9em Verdana, Helvetica, 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;}
+
+#slide0 {padding-top: 3.5em; font-size: 90%;}
+#slide0 h1 {position: static; margin: 1em 0 0; padding: 0;
+ font: bold 2em Helvetica, sans-serif; white-space: normal;
+ color: #000; background: transparent;}
+#slide0 h2 {font: bold italic 1em Helvetica, 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;}
+.note {display: none;}
+.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 {color: #DDE; visibility: visible;}
+img.incremental {visibility: hidden;}
+.slide .current {color: #B02;}
+
+
+/* diagnostics
+
+li:after {content: " [" attr(class) "]"; color: #F88;}
+ */

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,9 @@
+/* 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;}
@@ -0,0 +1,3 @@
+@import url(s5-core.css); /* required to make the slide show run at all */
+@import url(framing.css); /* sets basic placement and size of slide components */
+@import url(pretty.css); /* stuff that makes the slides look better than blah */
Oops, something went wrong.

0 comments on commit 39477bb

Please sign in to comment.