mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-28 03:16:16 -04:00
skins: finalize support for multiple skins
The old "static/custom" directory is replaced by "static/skins/<skinName>", where <skinName> is taken from settings.json. When no value is found, a default of "no-skin" is assumed, so that backward compatibility is maintained. The most evident security concerns have been addressed. Closes #3471.
This commit is contained in:
parent
e34c74b24d
commit
9c990ab08a
5 changed files with 14 additions and 14 deletions
|
@ -44,7 +44,7 @@
|
|||
<link href="../static/css/pad.css" rel="stylesheet">
|
||||
|
||||
<% e.begin_block("customStyles"); %>
|
||||
<link href="../static/custom/pad.css" rel="stylesheet">
|
||||
<link href="../static/skins/<%=encodeURI(settings.skinName)%>/pad.css" rel="stylesheet">
|
||||
<% e.end_block(); %>
|
||||
|
||||
<style title="dynamicsyntax"></style>
|
||||
|
@ -378,7 +378,7 @@
|
|||
<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/skins/<%=encodeURI(settings.skinName)%>/pad.js"></script>
|
||||
<% e.end_block(); %>
|
||||
|
||||
<!-- Bootstrap page -->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue