initial support for Readme.md

R/shinyui.R

@@ -154,13 +154,23 @@ renderPage <- function(ui, connection, showcase=FALSE) {
   if (showcase) {
     writeLines(c('  <script src="shared/highlight/highlight.pack.js"></script>',
                  '  <script src="shared/jquery-ui.js"></script>',
+                 '  <script src="shared/showdown/src/showdown.js"></script>',
                  '  <link rel="stylesheet" type="text/css" href="shared/highlight/styles/tomorrow.css" />',
                  '  <script type="text/javascript">', 
                  '    $(document).ready(function() { ', 
-                 '      $("pre code").each(function(i, e) {hljs.highlightBlock(e)});',
-                 '     });',
-                 '  </script>'), 
-               con = connection)
+                 '      $("pre code").each(function(i, e) { hljs.highlightBlock(e) });'),
+                con = connection)
+    mdfile <- file.path.ci(getwd(), 'Readme.md')
+    if (file.exists(mdfile)) {
+      writeLines(c('      document.getElementById("readme-md").innerHTML = ',
+                   '         (new Showdown.converter()).makeHtml('), 
+                 con = connection)
+      writeLines(paste('"', do.call(paste, as.list(c(gsub('"', '\"', readLines(mdfile)), sep = "\\n"))),
+                       '");', sep = ""), con = connection)
+    }
+    writeLines(c('});', 
+                 '</script>'), con = connection)
+      
   }
   writeLines(c(result$head,
                '</head>',
@@ -178,7 +188,7 @@ renderPage <- function(ui, connection, showcase=FALSE) {
       desc <- read.dcf(descfile)
       cols <- colnames(desc)
       if ("Title" %in% cols) {
-        writeLines(paste('<h1 class="showcase-header">', desc[1,"Title"], 
+        writeLines(paste('<h2><small>', desc[1,"Title"], 
                          sep = ""), con = connection)
         if ("Author" %in% cols) {
           writeLines('by', con = connection)
@@ -195,11 +205,15 @@ renderPage <- function(ui, connection, showcase=FALSE) {
                        con = connection)
           }
         }
-        writeLines('</h1>', con = connection)
+        writeLines('</small></h2>', con = connection)
       }
+    } else {
+      writeLines('<h2><small>Shiny Application</small></h2>', con = connection)
     }
     writeLines(c('</div><div class="span4 showcase-code-link">',
-                 '<a href="javascript:Shiny.popOutCode()">show code</a>',
+                 '<button type="button" class="btn btn-default btn-lg"',
+                 'onclick="javascript:Shiny.popOutCode()">show code',
+                 '<span class="glyphicon glyphicon-new-window"></span></button>',
                  '</div></div></div>'),
                con = connection)
   }
@@ -209,6 +223,7 @@ renderPage <- function(ui, connection, showcase=FALSE) {
   
   if (showcase) {
     writeLines(c('<div class="container-fluid shiny-code-container">',
+                 '<div class="row-fluid" id="readme-md"></div>',
                  '<div class="row-fluid"><h3>Code</h3></div>',
                  '<div class="row-fluid">', 
                  '<div class="span6"><h4>ui.R</h4>',

inst/examples/01_hello/Readme.md

@@ -0,0 +1,6 @@
+This small Shiny application demonstrates Shiny's automatic UI updates.  Click
+*Show Code* in the upper right, then look at the code for `server.R`. Move the
+*Number of observations* slider and notice how the `renderPlot` expression is
+automatically re-evaluated when its dependant, `input$obs`, changes, causing a
+new distribution to be generated and the plot to be rendered.
+

inst/examples/Readme.md

@@ -1 +0,0 @@
-This is an example README.

inst/www/shared/shiny.css

@@ -103,7 +103,6 @@ span.jslider {
 .showcase-header {
   font-size: 16px;
   font-weight: normal;
-  color: #909090;
 }
 
 .showcase-code-link {