From 031c96c72d168a23cca0c609f46e019eced8bc64 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Fri, 18 Dec 2015 09:40:52 -0600
Subject: Updated slide mode

---
 public/js/index.js                  | 11 +++++-
 public/views/header.ejs             | 23 ++++++-----
 public/views/slide/listing.hbs      | 22 +++++++++++
 public/views/slide/reveal.hbs       | 78 +++++++++++++++++++++++++++++++++++++
 public/views/templates/listing.html | 22 -----------
 public/views/templates/reveal.html  | 72 ----------------------------------
 6 files changed, 123 insertions(+), 105 deletions(-)
 create mode 100644 public/views/slide/listing.hbs
 create mode 100644 public/views/slide/reveal.hbs
 delete mode 100644 public/views/templates/listing.html
 delete mode 100644 public/views/templates/reveal.html

(limited to 'public')

diff --git a/public/js/index.js b/public/js/index.js
index 4706d210..88410749 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -283,7 +283,6 @@ var ui = {
         shortStatus: $(".ui-short-status"),
         status: $(".ui-status"),
         new: $(".ui-new"),
-        slide: $(".ui-slide"),
         publish: $(".ui-publish"),
         download: {
             markdown: $(".ui-download-markdown"),
@@ -296,6 +295,10 @@ var ui = {
             dropbox: $(".ui-import-dropbox"),
             clipboard: $(".ui-import-clipboard")
         },
+        beta: {
+            pdf: $(".ui-beta-pdf"),
+            slide: $(".ui-beta-slide")
+        },
         mode: $(".ui-mode"),
         edit: $(".ui-edit"),
         view: $(".ui-view"),
@@ -793,7 +796,6 @@ function closestIndex(arr, closestTo) {
 var url = window.location.protocol + '//' + window.location.host + window.location.pathname;
 //share
 ui.toolbar.publish.attr("href", url + "/publish");
-ui.toolbar.slide.attr("href", url + "/slide");
 //download
 //markdown
 ui.toolbar.download.markdown.click(function () {
@@ -853,6 +855,11 @@ ui.toolbar.uploadImage.bind('change', function (e) {
 ui.toc.dropdown.click(function (e) {
     e.stopPropagation();
 });
+//beta
+//pdf
+ui.toolbar.beta.pdf.attr("download", "").attr("href", url + "/pdf");
+//slide
+ui.toolbar.beta.slide.attr("href", url + "/slide");
 
 function scrollToTop() {
     if (currentMode == modeType.both) {
diff --git a/public/views/header.ejs b/public/views/header.ejs
index 47246a1d..c98202c0 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -21,14 +21,18 @@
             <a data-target="#" data-toggle="dropdown" class="btn btn-link">
                 <i class="fa fa-caret-down"></i>
             </a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="menu">
+            <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
                 <li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="./new" target="_blank"><i class="fa fa-plus fa-fw"></i> New</a>
                 </li>
-                <li role="presentation"><a role="menuitem" class="ui-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-television fa-fw"></i> Slides</a>
-                </li>
                 <li role="presentation"><a role="menuitem" class="ui-publish" tabindex="-1" href="#" target="_blank"><i class="fa fa-print fa-fw"></i> Publish</a>
                 </li>
                 <li class="divider"></li>
+                <li class="dropdown-header">Beta</li>
+                <li role="presentation"><a role="menuitem" class="ui-beta-pdf" tabindex="-1" href="#" target="_self"><i class="fa fa-file-pdf-o fa-fw"></i> Export PDF</a>
+                </li>
+                <li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
+                </li>
+                <li class="divider"></li>
                 <li class="dropdown-header">Export</li>
                 <li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
                 </li>
@@ -88,11 +92,6 @@
                     <i class="fa fa-plus"></i> New
                 </a>
             </li>
-            <li>
-                <a href="#" target="_blank" class="ui-slide">
-                    <i class="fa fa-television"></i> Slide
-                </a>
-            </li>
             <li>
                 <a href="#" target="_blank" class="ui-publish">
                     <i class="fa fa-print"></i> Publish
@@ -103,6 +102,12 @@
                     Menu <i class="fa fa-caret-down"></i>
                 </a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="menu">
+                    <li class="dropdown-header">Beta</li>
+                    <li role="presentation"><a role="menuitem" class="ui-beta-pdf" tabindex="-1" href="#" target="_self"><i class="fa fa-file-pdf-o fa-fw"></i> Export PDF</a>
+                    </li>
+                    <li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
+                    </li>
+                    <li class="divider"></li>
                     <li class="dropdown-header">Export</li>
                     <li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
                     </li>
@@ -123,4 +128,4 @@
         </ul>
     </div>
 </nav>
-<div class="ui-spinner unselectable hidden-print"></div>
+<div class="ui-spinner unselectable hidden-print"></div>
\ No newline at end of file
diff --git a/public/views/slide/listing.hbs b/public/views/slide/listing.hbs
new file mode 100644
index 00000000..371f4ac3
--- /dev/null
+++ b/public/views/slide/listing.hbs
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <title>Directory Listing</title>
+        <link rel="stylesheet" href="/vendor/reveal.js/{{{theme}}}" id="theme">
+        <style type="text/css">
+            body {
+                margin: 1em;
+            }
+            a {
+                color: white;
+                display: block;
+            }
+        </style>
+		<link rel="icon" href="http://i.imgur.com/IVlU2PU.png" sizes="512x512" />
+    </head>
+
+    <body>
+        {{{listing}}}
+    </body>
+</html>
diff --git a/public/views/slide/reveal.hbs b/public/views/slide/reveal.hbs
new file mode 100644
index 00000000..876a7ba3
--- /dev/null
+++ b/public/views/slide/reveal.hbs
@@ -0,0 +1,78 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+        <meta name="mobile-web-app-capable" content="yes">
+        <title>{{title}}</title>
+        <link rel="icon" type="image/png" href="https://hackmd.io/favicon.png">
+        <link rel="apple-touch-icon" href="https://hackmd.io/apple-touch-icon.png">
+        
+        <link rel="stylesheet" href="/vendor/reveal.js/css/reveal.css">
+        <link rel="stylesheet" href="/vendor/reveal.js/{{{theme}}}" id="theme">
+        <!-- For syntax highlighting -->
+        <link rel="stylesheet" href="/vendor/reveal.js/lib/css/{{{highlightTheme}}}.css">
+
+        <!-- If the query includes 'print-pdf', use the PDF print sheet -->
+        <script>
+          document.write( '<link rel="stylesheet" href="/vendor/reveal.js/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
+        </script>
+		<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
+    </head>
+    <body>
+
+        <div class="reveal">
+            <div class="slides">{{{slides}}}</div>
+        </div>
+        
+        <script src="/vendor/reveal.js/lib/js/head.min.js"></script>
+        <script src="/vendor/reveal.js/js/reveal.js"></script>
+        <script src="/vendor/string.min.js"></script>
+
+        <script>
+            var body = $(".slides").html();
+            $(".slides").html(S(body).unescapeHTML().s);
+
+            function extend() {
+              var target = {};
+              for (var i = 0; i < arguments.length; i++) {
+                var source = arguments[i];
+                for (var key in source) {
+                  if (source.hasOwnProperty(key)) {
+                    target[key] = source[key];
+                  }
+                }
+              }
+              return target;
+            }
+
+            // Optional libraries used to extend on reveal.js
+            var deps = [
+              { src: '/vendor/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+              { src: '/vendor/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector('[data-markdown]'); } },
+              { src: '/vendor/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector('[data-markdown]'); } },
+              { src: '/vendor/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+              { src: '/vendor/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
+              { src: '/vendor/reveal.js/plugin/math/math.js', async: true }
+            ];
+
+            // default options to init reveal.js
+            var defaultOptions = {
+              controls: true,
+              progress: true,
+              history: true,
+              center: true,
+              transition: 'slide',
+              dependencies: deps
+            };
+
+            // options from URL query string
+            var queryOptions = Reveal.getQueryHash() || {};
+
+            var options = {{{options}}};
+            options = extend(defaultOptions, options, queryOptions);
+            Reveal.initialize(options);
+        </script>
+    </body>
+</html>
diff --git a/public/views/templates/listing.html b/public/views/templates/listing.html
deleted file mode 100644
index 371f4ac3..00000000
--- a/public/views/templates/listing.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <title>Directory Listing</title>
-        <link rel="stylesheet" href="/vendor/reveal.js/{{{theme}}}" id="theme">
-        <style type="text/css">
-            body {
-                margin: 1em;
-            }
-            a {
-                color: white;
-                display: block;
-            }
-        </style>
-		<link rel="icon" href="http://i.imgur.com/IVlU2PU.png" sizes="512x512" />
-    </head>
-
-    <body>
-        {{{listing}}}
-    </body>
-</html>
diff --git a/public/views/templates/reveal.html b/public/views/templates/reveal.html
deleted file mode 100644
index 04b8c9fc..00000000
--- a/public/views/templates/reveal.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <title>Reveal.js</title>
-        <link rel="stylesheet" href="/vendor/reveal.js/css/reveal.css">
-        <link rel="stylesheet" href="/vendor/reveal.js/{{{theme}}}" id="theme">
-        <!-- For syntax highlighting -->
-        <link rel="stylesheet" href="/vendor/reveal.js/lib/css/{{{highlightTheme}}}.css">
-
-        <!-- If the query includes 'print-pdf', use the PDF print sheet -->
-        <script>
-          document.write( '<link rel="stylesheet" href="/vendor/reveal.js/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
-        </script>
-		<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
-    </head>
-    <body>
-
-        <div class="reveal">
-            <div class="slides">{{{slides}}}</div>
-        </div>
-
-        <script src="/vendor/reveal.js/lib/js/head.min.js"></script>
-        <script src="/vendor/reveal.js/js/reveal.js"></script>
-        <script src="/vendor/string.min.js"></script>
-
-        <script>
-            var body = $(".slides").html();
-            $(".slides").html(S(body).unescapeHTML().s);
-
-            function extend() {
-              var target = {};
-              for (var i = 0; i < arguments.length; i++) {
-                var source = arguments[i];
-                for (var key in source) {
-                  if (source.hasOwnProperty(key)) {
-                    target[key] = source[key];
-                  }
-                }
-              }
-              return target;
-            }
-
-            // Optional libraries used to extend on reveal.js
-            var deps = [
-              { src: '/vendor/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
-              { src: '/vendor/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector('[data-markdown]'); } },
-              { src: '/vendor/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector('[data-markdown]'); } },
-              { src: '/vendor/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-              { src: '/vendor/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
-              { src: '/vendor/reveal.js/plugin/math/math.js', async: true }
-            ];
-
-            // default options to init reveal.js
-            var defaultOptions = {
-              controls: true,
-              progress: true,
-              history: true,
-              center: true,
-              transition: 'default',
-              dependencies: deps
-            };
-
-            // options from URL query string
-            var queryOptions = Reveal.getQueryHash() || {};
-
-            var options = {{{options}}};
-            options = extend(defaultOptions, options, queryOptions);
-            Reveal.initialize(options);
-        </script>
-    </body>
-</html>
-- 
cgit v1.2.3