Skip to content

Commit 031c96c

Browse files
jackycutejackycute
committed
Updated slide mode
1 parent 54b33f1 commit 031c96c

6 files changed

Lines changed: 42 additions & 22 deletions

File tree

‎app.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,8 @@ app.get("/features", response.showFeatures);
358358
app.get("/s/:shortid", response.showPublishNote);
359359
//publish note actions
360360
app.get("/s/:shortid/:action", response.publishNoteActions);
361-
362-
//add p
361+
//get publish slide
363362
app.get("/p/:shortid", response.showPublishSlide);
364-
365363
//get note by id
366364
app.get("/:noteId", response.showNote);
367365
//note actions

‎lib/response.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var Mustache = require('mustache');
2424
var opts = {
2525
userBasePath: process.cwd(),
2626
revealBasePath: path.resolve(require.resolve('reveal.js'), '..', '..'),
27-
template: fs.readFileSync(path.join('.', '/public/views/templates', 'reveal.html')).toString(),
28-
templateListing: fs.readFileSync(path.join('.', '/public/views/templates', 'listing.html')).toString(),
27+
template: fs.readFileSync(path.join('.', '/public/views/slide', 'reveal.hbs')).toString(),
28+
templateListing: fs.readFileSync(path.join('.', '/public/views/slide', 'listing.hbs')).toString(),
2929
theme: 'css/theme/black.css',
3030
highlightTheme: 'zenburn',
3131
separator: '^(\r\n?|\n)---(\r\n?|\n)$',
@@ -404,7 +404,6 @@ function publishNoteActions(req, res, next) {
404404
}
405405
}
406406

407-
408407
function showPublishSlide(req, res, next) {
409408
var shortid = req.params.shortid;
410409
if (shortId.isValid(shortid)) {
@@ -425,8 +424,12 @@ function showPublishSlide(req, res, next) {
425424
return;
426425
}
427426
var body = LZString.decompressFromBase64(data.rows[0].content);
427+
var title = data.rows[0].title;
428+
var decodedTitle = LZString.decompressFromBase64(title);
429+
if (decodedTitle) title = decodedTitle;
430+
title = Note.generateWebTitle(title);
428431
var text = S(body).escapeHTML().s;
429-
render(res, text);
432+
render(res, title, text);
430433
});
431434
});
432435
});
@@ -436,10 +439,11 @@ function showPublishSlide(req, res, next) {
436439
}
437440

438441
//reveal.js render
439-
var render = function (res, markdown) {
442+
var render = function (res, title, markdown) {
440443
var slides = md.slidify(markdown, opts);
441444

442445
res.end(Mustache.to_html(opts.template, {
446+
title: title,
443447
theme: opts.theme,
444448
highlightTheme: opts.highlightTheme,
445449
slides: slides,

‎public/js/index.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ var ui = {
283283
shortStatus: $(".ui-short-status"),
284284
status: $(".ui-status"),
285285
new: $(".ui-new"),
286-
slide: $(".ui-slide"),
287286
publish: $(".ui-publish"),
288287
download: {
289288
markdown: $(".ui-download-markdown"),
@@ -296,6 +295,10 @@ var ui = {
296295
dropbox: $(".ui-import-dropbox"),
297296
clipboard: $(".ui-import-clipboard")
298297
},
298+
beta: {
299+
pdf: $(".ui-beta-pdf"),
300+
slide: $(".ui-beta-slide")
301+
},
299302
mode: $(".ui-mode"),
300303
edit: $(".ui-edit"),
301304
view: $(".ui-view"),
@@ -793,7 +796,6 @@ function closestIndex(arr, closestTo) {
793796
var url = window.location.protocol + '//' + window.location.host + window.location.pathname;
794797
//share
795798
ui.toolbar.publish.attr("href", url + "/publish");
796-
ui.toolbar.slide.attr("href", url + "/slide");
797799
//download
798800
//markdown
799801
ui.toolbar.download.markdown.click(function () {
@@ -853,6 +855,11 @@ ui.toolbar.uploadImage.bind('change', function (e) {
853855
ui.toc.dropdown.click(function (e) {
854856
e.stopPropagation();
855857
});
858+
//beta
859+
//pdf
860+
ui.toolbar.beta.pdf.attr("download", "").attr("href", url + "/pdf");
861+
//slide
862+
ui.toolbar.beta.slide.attr("href", url + "/slide");
856863

857864
function scrollToTop() {
858865
if (currentMode == modeType.both) {

‎public/views/header.ejs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
<a data-target="#" data-toggle="dropdown" class="btn btn-link">
2222
<i class="fa fa-caret-down"></i>
2323
</a>
24-
<ul class="dropdown-menu" role="menu" aria-labelledby="menu">
24+
<ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
2525
<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>
2626
</li>
27-
<li role="presentation"><a role="menuitem" class="ui-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-television fa-fw"></i> Slides</a>
28-
</li>
2927
<li role="presentation"><a role="menuitem" class="ui-publish" tabindex="-1" href="#" target="_blank"><i class="fa fa-print fa-fw"></i> Publish</a>
3028
</li>
3129
<li class="divider"></li>
30+
<li class="dropdown-header">Beta</li>
31+
<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>
32+
</li>
33+
<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>
34+
</li>
35+
<li class="divider"></li>
3236
<li class="dropdown-header">Export</li>
3337
<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>
3438
</li>
@@ -88,11 +92,6 @@
8892
<i class="fa fa-plus"></i> New
8993
</a>
9094
</li>
91-
<li>
92-
<a href="#" target="_blank" class="ui-slide">
93-
<i class="fa fa-television"></i> Slide
94-
</a>
95-
</li>
9695
<li>
9796
<a href="#" target="_blank" class="ui-publish">
9897
<i class="fa fa-print"></i> Publish
@@ -103,6 +102,12 @@
103102
Menu <i class="fa fa-caret-down"></i>
104103
</a>
105104
<ul class="dropdown-menu" role="menu" aria-labelledby="menu">
105+
<li class="dropdown-header">Beta</li>
106+
<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>
107+
</li>
108+
<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>
109+
</li>
110+
<li class="divider"></li>
106111
<li class="dropdown-header">Export</li>
107112
<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>
108113
</li>
@@ -123,4 +128,4 @@
123128
</ul>
124129
</div>
125130
</nav>
126-
<div class="ui-spinner unselectable hidden-print"></div>
131+
<div class="ui-spinner unselectable hidden-print"></div>

public/views/templates/listing.html renamed to public/views/slide/listing.hbs

File renamed without changes.

public/views/templates/reveal.html renamed to public/views/slide/reveal.hbs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<title>Reveal.js</title>
5+
<meta name="apple-mobile-web-app-capable" content="yes">
6+
<meta name="apple-mobile-web-app-status-bar-style" content="black">
7+
<meta name="mobile-web-app-capable" content="yes">
8+
<title>{{title}}</title>
9+
<link rel="icon" type="image/png" href="https://hackmd.io/favicon.png">
10+
<link rel="apple-touch-icon" href="https://hackmd.io/apple-touch-icon.png">
11+
612
<link rel="stylesheet" href="/vendor/reveal.js/css/reveal.css">
713
<link rel="stylesheet" href="/vendor/reveal.js/{{{theme}}}" id="theme">
814
<!-- For syntax highlighting -->
@@ -19,7 +25,7 @@
1925
<div class="reveal">
2026
<div class="slides">{{{slides}}}</div>
2127
</div>
22-
28+
2329
<script src="/vendor/reveal.js/lib/js/head.min.js"></script>
2430
<script src="/vendor/reveal.js/js/reveal.js"></script>
2531
<script src="/vendor/string.min.js"></script>
@@ -57,7 +63,7 @@
5763
progress: true,
5864
history: true,
5965
center: true,
60-
transition: 'default',
66+
transition: 'slide',
6167
dependencies: deps
6268
};
6369

0 commit comments

Comments
 (0)