parade 0.9.2 → 0.10.0

data/lib/parade/section.rb

@@ -145,6 +145,17 @@ module Parade
       ""
     end
 
+    attr_writer :footer
+
+    def footer
+      footer_erb = ERB.new File.read(@footer || default_footer)
+      footer_erb.result(binding)
+    end
+
+    def default_footer
+      File.join(File.dirname(__FILE__), "..", "views", "footer.erb")
+    end
+
     def resources
       @resources || []
     end
@@ -183,10 +194,10 @@ module Parade
     end
 
     # @return [String] HTML representation of the section
-    def to_html
+    def to_html(options = {})
       slides.map do |section_or_slide|
         post_renderers.inject(section_or_slide.to_html) do |content,renderer|
-          renderer.render(content)
+          renderer.render(content,options)
         end
       end.join("\n")
     end

data/lib/parade/server.rb

@@ -94,15 +94,19 @@ module Parade
       #
       # A shortcut to define a CSS resource file within a view template
       #
-      def css(filepath)
-        %{<link rel="stylesheet" href="#{File.join "css", filepath}" type="text/css"/>}
+      def css(*filepaths)
+        filepaths.map do |filepath|
+          %{<link rel="stylesheet" href="#{File.join "css", filepath}" type="text/css"/>}
+        end.join("\n")
       end
 
       #
       # A shortcut to define a Javascript resource file within a view template
       #
-      def js(filepath)
-        %{<script type="text/javascript" src="#{File.join "js", filepath}"></script>}
+      def js(*filepaths)
+        filepaths.map do |filepath|
+          %{<script type="text/javascript" src="#{File.join "js", filepath}"></script>}
+        end.join("\n")
       end
 
       def custom_resource(resource_extension)
@@ -126,7 +130,8 @@ module Parade
 
       def plugin_css_files
         self.class.plugin_stylesheet_files.map do |path|
-          "<style>\n#{File.read(path)}\n</style>"
+          content = File.read(path)
+          erb :inline_css, locals: { content: content }
         end.join("\n")
       end
 
@@ -140,7 +145,8 @@ module Parade
 
       def plugin_js_files
         self.class.plugin_javascript_files.map do |path|
-          "<script type='text/javascript'>#{File.read(path)}</script>"
+          content = File.read(path)
+          erb :inline_js, locals: { content: content }
         end.join("\n")
       end
 
@@ -166,8 +172,12 @@ module Parade
         presentation.title
       end
 
-      def slides
-        presentation.to_html
+      def slides(options = {})
+        presentation.to_html(options)
+      end
+
+      def footer
+        presentation.footer
       end
 
       def pause_message
@@ -188,16 +198,19 @@ module Parade
     # The request for slides is used by the client-side javascript presentation
     # and returns all the slides HTML.
     #
+    # A hash of params may contain:
+    #   * height - the current height of the window
+    #   * width - the current width of the window
     get "/slides" do
-      slides
+      slides(params)
     end
 
     get "/" do
       erb :index
     end
 
-    get "/onepage" do
-      erb :onepage
+    get "/print" do
+      erb :print
     end
 
   end

data/lib/parade/slide.rb

@@ -54,10 +54,9 @@ module Parade
     end
 
     #
-    # @return [Boolean] true if the slide has no content and false if the slide
-    #   has content.
+    # @return [Boolean] true if the slide has no content and not intentionly marked blank.
     def empty?
-      @content.to_s.strip == ""
+      @content.to_s.strip == "" && !content_classes.include?('blank')
     end
 
     #

data/lib/parade/slide_post_renderers.rb

@@ -20,5 +20,7 @@ module Parade
   SlidePostRenderers.register Renderers::CommandLineRenderer
   SlidePostRenderers.register Renderers::ColumnsRenderer.new(css_class: 'columns',
     html_element: "h2", segments: 12)
+  SlidePostRenderers.register Renderers::ColumnsRenderer.new(css_class: 'comparison',
+    html_element: "h2", segments: 12)
 
 end

data/lib/parade/version.rb

@@ -1,3 +1,3 @@
 module Parade
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end

data/lib/public/css/960.css

@@ -16,7 +16,6 @@
 body {
   min-width: 960px;
 }
-
 /* `Container
 ----------------------------------------------------------------------------------------------------*/
 
@@ -27,6 +26,7 @@ body {
   width: 960px;
 }
 
+
 /* `Grid >> Global
 ----------------------------------------------------------------------------------------------------*/
 

data/lib/public/css/fg.menu.css

@@ -3,10 +3,36 @@ Author:	Maggie Wachs, maggie@filamentgroup.com
 Date:		September 2008
 */
 
+/* REQUIRED STYLES - the menus will only render correctly with these rules */
 
-/* REQUIRED STYLES - the menus will only render correctly with these rules */	
+.fg-button {
+    clear:left;
+    margin:0 4px 40px 20px;
+    padding: .4em 1em;
+    text-decoration:none !important;
+    cursor:pointer;
+    position: relative;
+    text-align: center;
+    zoom: 1;
+}
 
-.fg-menu-container { position: absolute; top:0; left:-999px; padding: .4em;  overflow: hidden; }
+.fg-button .ui-icon {
+    position: absolute;
+    top: 50%;
+    margin-top: -8px;
+    left: 50%;
+    margin-left: -8px;
+}
+
+a.fg-button { float:left; }
+
+.fg-button-icon-right { padding-right: 2.1em; }
+
+.fg-button-icon-right .ui-icon { left: auto; right: .2em; margin-left: 0; }
+
+.fg-button.ui-state-loading .ui-icon { background: url(spinner_bar.gif) no-repeat 0 0; }
+
+.fg-menu-container { z-index: 2147483647; position: absolute; top:0; left:-999px; padding: .4em;  overflow: hidden; }
 .fg-menu-container.fg-menu-flyout { overflow: visible; }
 
 .fg-menu, .fg-menu ul { list-style-type:none; padding: 0; margin:0; }
@@ -17,13 +43,13 @@ Date:		September 2008
 .fg-menu ul { position:absolute; top:0; }
 .fg-menu ul ul { top:-1px; }
 
-.fg-menu-container.fg-menu-ipod .fg-menu-content, 
+.fg-menu-container.fg-menu-ipod .fg-menu-content,
 .fg-menu-container.fg-menu-ipod .fg-menu-content ul { background: none !important; }
 
 .fg-menu.fg-menu-scroll,
 .fg-menu ul.fg-menu-scroll { overflow: scroll;  overflow-x: hidden; }
 
-.fg-menu li { clear:both; float:left; width:100%; margin: 0; padding:0; border: 0; }	
+.fg-menu li { clear:both; float:left; width:100%; margin: 0; padding:0; border: 0; }
 .fg-menu li li { font-size:1em; } /* inner li font size must be reset so that they don't blow up */
 
 .fg-menu-flyout ul ul { padding: .4em; }
@@ -41,7 +67,7 @@ Date:		September 2008
 .fg-menu-breadcrumb li.fg-menu-current-crumb { clear: left; float: none; opacity: 1; }
 .fg-menu-breadcrumb li.fg-menu-current-crumb { padding-top: .2em; }
 
-.fg-menu-breadcrumb a, 
+.fg-menu-breadcrumb a,
 .fg-menu-breadcrumb span { float: left; }
 
 .fg-menu-footer a:link,
@@ -55,10 +81,10 @@ Date:		September 2008
 .fg-menu-breadcrumb .fg-menu-prev-list a:visited,
 .fg-menu-breadcrumb .fg-menu-prev-list a:hover,
 .fg-menu-breadcrumb .fg-menu-prev-list a:active { background-image: none; text-decoration:none; }
-	
+
 .fg-menu-breadcrumb .fg-menu-prev-list a { float: left; padding-right: .4em; }
 .fg-menu-breadcrumb .fg-menu-prev-list a .ui-icon { float: left; }
-	
+
 .fg-menu-breadcrumb .fg-menu-current-crumb a:link,
 .fg-menu-breadcrumb .fg-menu-current-crumb a:visited,
 .fg-menu-breadcrumb .fg-menu-current-crumb a:hover,
@@ -66,7 +92,7 @@ Date:		September 2008
 
 
 
-/* REQUIRED LINK STYLES: links are "display:block" by default; if the menu options are split into 
+/* REQUIRED LINK STYLES: links are "display:block" by default; if the menu options are split into
 	selectable node links and 'next' links, the script floats the node links left and floats the 'next' links to the right	*/
 
 .fg-menu a:link,
@@ -92,12 +118,12 @@ Date:		September 2008
 .fg-menu a span { display:block; cursor:pointer; }
 
 
- /* SUGGESTED STYLES - for use with jQuery UI Themeroller CSS */	
- 
+ /* SUGGESTED STYLES - for use with jQuery UI Themeroller CSS */
+
 .fg-menu-indicator span { float:left; }
 .fg-menu-indicator span.ui-icon { float:right; }
 
-.fg-menu-content.ui-widget-content, 
+.fg-menu-content.ui-widget-content,
 .fg-menu-content ul.ui-widget-content { border:0; }
 
 

data/lib/public/css/mobile.css

@@ -0,0 +1,179 @@
+
+/* iPad Landscape */
+@media all and (device-width: 768px) and (device-height: 1024px) and (orientation:landscape) {
+  body { width: 1024px; height: 675px; }
+  #preso, .slide { width: 1024px; height: 675px; }
+  #footer { width: 1005px; }
+
+  pre.highlight pre, pre.highlight, pre {
+    font-size: 20px;
+    line-height: 20px;
+  }
+}
+
+/* iPad Portrait */
+@media all and (device-width: 768px) and (device-height: 1024px) and (orientation:portrait) {
+  body { min-width: 768px; }
+  #preso, .slide { height: 720px; width: 768px; }
+  #footer { width: 755px; }
+  h1 { font-size: 3em; }
+  h2 { font-size: 2em; }
+  h3 { font-size: 1em; }
+
+  .content > p { font-size: 1.4em; }
+  .content ol { font-size: 1.5em; }
+  .content > ul { font-size: 2em; }
+  .bullets > ul { font-size: 2em; }
+  .smbullets > ul { font-size: 1.5em; }
+
+  .content.columns .grid_12 p, .content.comparison .grid_12 p {
+    font-size: 125%;
+  }
+
+  .content.columns .grid_6 p, .content.comparison .grid_6 p {
+    font-size: 100%;
+  }
+
+  .content.columns .grid_4 p, .content.comparison .grid_4 p {
+    font-size: 75%;
+  }
+
+  pre.highlight pre, pre.highlight, pre {
+    font-size: 16px;
+    line-height: 16px;
+  }
+}
+
+/* iPhone Portrait and Landscape */
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+  h1 { font-size: 1em; }
+  h2 { font-size: 0.75em; }
+  h3 { font-size: 0.5em; }
+
+  .content > p { font-size: 0.7em; }
+  .content ol { font-size: 0.8em; }
+  .content > ul { font-size: 1em; }
+  .bullets > ul { font-size: 1em; }
+  .smbullets > ul { font-size: 0.8em; }
+
+  .title { padding-top: 5%; }
+  .section-header { padding-top: 12%; }
+  .content > blockquote { font-size: 100%; }
+
+  .content.columns .grid_12 p, .content.comparison .grid_12 p {
+    font-size: 100%;
+  }
+
+  .content.columns .grid_6 p, .content.comparison .grid_6 p {
+    font-size: 75%;
+  }
+
+  .content.columns .grid_4 p, .content.comparison .grid_4 p {
+    font-size: 50%;
+  }
+
+  .bullets > ul > li { padding: 5px; }
+  .smbullets > ul > li { padding: 5px; }
+
+  pre.highlight pre, pre.highlight, pre {
+    font-size: 12px;
+    line-height: 12px;
+  }
+}
+
+/* iPhone Portrait */
+@media screen and (max-width: 320px) and (orientation:portrait) {
+  body { min-width: 320px; }
+  #preso, .slide { height: 300px; width: 320px; }
+  #preso {
+    margin: 0;
+    padding: 0;
+    width: 320px;
+    max-height: 356px;
+    margin-left:auto;
+    margin-right:auto;
+  }
+
+  #footer {
+    background: #eee;
+    margin: 0;
+    padding: 2px;
+    width: 300px;
+    height: 20px;
+    margin-left:auto;
+    margin-right:auto;
+  }
+
+  .slide .center {
+    height: 300px;
+    width: 320px;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
+
+}
+
+/* iPhone Landscape */
+@media screen and (max-width: 480px) and (orientation:landscape) {
+  body { min-width: 480px; min-height: 300px; height: 320px; }
+  #preso, .slide { height: 300px; width: 480px; }
+  #preso {
+    margin: 0;
+    padding: 0;
+    height: 320px;
+    width: 480px;
+    margin-left:auto;
+    margin-right:auto;
+  }
+  #footer {
+    background: #eee;
+    margin: 0;
+    padding: 2px;
+    width: 470px;
+    height: 20px;
+    margin-left:auto;
+    margin-right:auto;
+  }
+
+  .slide .center {
+    height: 320px;
+    width: 480px;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
+}
+
+
+/* 960 Layout Overrides for Mobile Devices */
+
+/* Overrides for iPad and devices */
+
+@media all and (device-width: 768px) and (device-height: 1024px) and (orientation:portrait) {
+  .container_12 { width: 768px;}
+  .container_12 .grid_12 { width: 752px; }
+  .container_12 .grid_6 { width: 360px; }
+  .container_12 .grid_4 { width: 236px; }
+  .container_12 .grid_3 { width: 172px; }
+}
+
+/* Overrides for iPhone and devices */
+
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation:landscape) {
+  .container_12 { width: 480px; }
+  .container_12 .grid_12 { width: 480px; }
+  .container_12 .grid_6 { width: 220px; }
+  .container_12 .grid_4 { width: 140px; }
+  .container_12 .grid_3 { width: 100px; }
+
+}
+
+@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation:portrait) {
+  .container_12 { width: 320px; }
+  .container_12 .grid_12 { width: 320px; }
+  .container_12 .grid_6 { width: 140px; }
+  .container_12 .grid_4 { width: 86px; }
+  .container_12 .grid_3 { width: 60px; }
+
+}