com web/pres2: Fixing submodule: .gitmodules pres2reveal reveal_template.php
[email protected] (Rasmus Lerdorf)
| Newsgroups | php.pres |
|---|---|
| Message-ID | <[email protected]> |
Commit: 6a25bddedd612e3e8d6adba3575a9b3aab5fb88a Author: Rasmus Lerdorf <[email protected]> Wed, 12 Mar 2014 12:23:04 -0700 Parents: 47ed5942594add1cc52e9cd14fd9e9335d422a4b Branches: master Link: http://git.php.net/?p=web/pres2.git;a=commitdiff;h=6a25bddedd612e3e8d6adba3575a9b3aab5fb88a Log: Fixing submodule Changed paths: M .gitmodules M pres2reveal M reveal_template.php Diff: diff --git a/.gitmodules b/.gitmodules index 12123b5..62e68ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "reveal.js"] path = reveal.js - url = https://github.com/hakimel/reveal.js.git + url = http://github.com/hakimel/reveal.js.git diff --git a/pres2reveal b/pres2reveal index 1f50272..bc54ffd 100755 --- a/pres2reveal +++ b/pres2reveal @@ -131,11 +131,12 @@ function render_example($e) { $ret = ''; $code = (string)$e; if(substr($code,0,5)=="<?php") { - $code = substr($code,5); + $code = trim(substr($code,5)); } - if(empty($e['hide'])) $ret .= "\t\t<pre><code data-trim class=\"php\">$code</code></pre>\n"; + $code = htmlspecialchars($code); + if(empty($e['hide'])) $ret .= "\t\t<pre><code>$code</code></pre>\n"; if(!empty($e['result'])) { - $ret .= "\t\t<pre><code data-trim class=\"php\">"; + $ret .= "\t\t<pre><code>"; ob_start(); eval("?>$code"); $ret .= ob_get_clean(); diff --git a/reveal_template.php b/reveal_template.php index 54507d6..e97b4f3 100644 --- a/reveal_template.php +++ b/reveal_template.php @@ -18,7 +18,7 @@ <link rel="stylesheet" href="/samdark.css" id="theme"> <!-- For syntax highlighting --> - <link rel="stylesheet" href="/github.css"> + <link rel="stylesheet" href="/styles/github.css"> <!-- If the query includes 'print-pdf', include the PDF print sheet --> <script> @@ -81,7 +81,7 @@ // Optional libraries used to extend on reveal.js dependencies: [ { src: '/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } }, - { src: '/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }, + { src: '/highlight.pack.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }, { src: '/reveal.js/plugin/zoom-js/zoom.js', async: true, callback: function() { return !!document.body.classList; } }, { src: '/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } } ]