summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-11-18 23:51:22 +0000
committerJohn McLear <john@mclear.co.uk>2014-11-18 23:51:22 +0000
commit0f1fd0b2818393386c13801cc83ec0cb51a1fe98 (patch)
tree5a7f8929bdb08bf91b8a213d2e1ba4642a8aa847 /src
parentf5dcc374bae933f87ee3232d90750d9f1675e9e8 (diff)
downloadetherpad-lite-0f1fd0b2818393386c13801cc83ec0cb51a1fe98.zip
working blocks
Diffstat (limited to 'src')
-rw-r--r--src/templates/pad.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 15fd45e2..ed1332a7 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -42,7 +42,11 @@
<% e.begin_block("styles"); %>
<link href="../static/css/fontawesome-etherpad.css" rel="stylesheet">
<link href="../static/css/pad.css" rel="stylesheet">
+
+ <% e.begin_block("customStyles"); %>
<link href="../static/custom/pad.css" rel="stylesheet">
+ <% e.end_block(); %>
+
<style title="dynamicsyntax"></style>
<% e.end_block(); %>
@@ -347,7 +351,9 @@
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
+ <% e.begin_block("customScripts"); %>
<script type="text/javascript" src="../static/custom/pad.js"></script>
+ <% e.end_block(); %>
<!-- Bootstrap page -->
<script type="text/javascript">