fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2326 from ether/blocks-for-custom-script-and-styles 

working blocks
This commit is contained in:
John McLear 2014-11-18 23:51:46 +00:00
parent f5dcc374ba 0f1fd0b281
commit 7b9fd81284
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/templates/pad.html
View File

@ -42,7 +42,11 @@
<% e.begin_block("styles"); %> <% e.begin_block("styles"); %>
<link href="../static/css/fontawesome-etherpad.css" rel="stylesheet"> <link href="../static/css/fontawesome-etherpad.css" rel="stylesheet">
<link href="../static/css/pad.css" rel="stylesheet"> <link href="../static/css/pad.css" rel="stylesheet">
<% e.begin_block("customStyles"); %>
<link href="../static/custom/pad.css" rel="stylesheet"> <link href="../static/custom/pad.css" rel="stylesheet">
<% e.end_block(); %>
<style title="dynamicsyntax"></style> <style title="dynamicsyntax"></style>
<% e.end_block(); %> <% 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/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> <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> <script type="text/javascript" src="../static/custom/pad.js"></script>
<% e.end_block(); %>
<!-- Bootstrap page --> <!-- Bootstrap page -->
<script type="text/javascript"> <script type="text/javascript">