Some new blocks to allow plugins to add scripts, styles and modals

pull/557/head
Egil Moeller 2012-03-21 19:29:06 +01:00
parent 1ca12b24e6
commit 50474dff1f
1 changed files with 71 additions and 67 deletions

View File

@ -7,9 +7,11 @@
<meta name="robots" content="noindex, nofollow"> <meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link href="../static/css/pad.css" rel="stylesheet"> <% e.begin_block("styles"); %>
<link href="../static/custom/pad.css" rel="stylesheet"> <link href="../static/css/pad.css" rel="stylesheet">
<style title="dynamicsyntax"></style> <link href="../static/custom/pad.css" rel="stylesheet">
<style title="dynamicsyntax"></style>
<% e.end_block(); %>
<!-- head and body had been removed intentionally --> <!-- head and body had been removed intentionally -->
@ -215,74 +217,76 @@
</div> </div>
<div id="mainmodals"> <div id="mainmodals">
<div id="connectionbox" class="modaldialog"> <% e.begin_block("modals"); %>
<div id="connectionboxinner" class="modaldialog-inner"> <div id="connectionbox" class="modaldialog">
<div class="connecting">Connecting...</div> <div id="connectionboxinner" class="modaldialog-inner">
<div class="reconnecting">Reestablishing connection...</div> <div class="connecting">Connecting...</div>
<div class="disconnected"> <div class="reconnecting">Reestablishing connection...</div>
<h2 class="h2_disconnect">Disconnected.</h2> <div class="disconnected">
<h2 class="h2_userdup">Opened in another window.</h2> <h2 class="h2_disconnect">Disconnected.</h2>
<h2 class="h2_unauth">No Authorization.</h2> <h2 class="h2_userdup">Opened in another window.</h2>
<div id="disconnected_looping"> <h2 class="h2_unauth">No Authorization.</h2>
<p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p> <div id="disconnected_looping">
</div> <p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p>
<div id="disconnected_initsocketfail"> </div>
<p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p> <div id="disconnected_initsocketfail">
</div> <p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p>
<div id="disconnected_userdup"> </div>
<p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p> <div id="disconnected_userdup">
</div> <p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p>
<div id="disconnected_unknown"> </div>
<p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p> <div id="disconnected_unknown">
</div> <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p>
<div id="disconnected_slowcommit"> </div>
<p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p> <div id="disconnected_slowcommit">
</div> <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p>
<div id="disconnected_unauth"> </div>
<p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p> <div id="disconnected_unauth">
</div> <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
<div id="disconnected_deleted"> </div>
<p>This pad was deleted.</p> <div id="disconnected_deleted">
</div> <p>This pad was deleted.</p>
<div id="reconnect_advise"> </div>
<p>If this continues to happen, please let us know</p> <div id="reconnect_advise">
</div> <p>If this continues to happen, please let us know</p>
<div id="reconnect_form"> </div>
<button id="forcereconnect">Reconnect Now</button> <div id="reconnect_form">
<button id="forcereconnect">Reconnect Now</button>
</div>
</div> </div>
</div> </div>
<form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
<input type="hidden" class="padId" name="padId">
<input type="hidden" class="diagnosticInfo" name="diagnosticInfo">
<input type="hidden" class="missedChanges" name="missedChanges">
</form>
</div> </div>
<form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;"> <% e.end_block(); %>
<input type="hidden" class="padId" name="padId">
<input type="hidden" class="diagnosticInfo" name="diagnosticInfo">
<input type="hidden" class="missedChanges" name="missedChanges">
</form>
</div>
</div> </div>
<script type="text/javascript" src="../static/js/require-kernel.js"></script> <% e.begin_block("scripts"); %>
<script type="text/javascript" src="../static/js/jquery.js"></script> <script type="text/javascript" src="../static/js/require-kernel.js"></script>
<script type="text/javascript" src="../socket.io/socket.io.js"></script> <script type="text/javascript" src="../static/js/jquery.js"></script>
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> <script type="text/javascript" src="../socket.io/socket.io.js"></script>
<script type="text/javascript"> <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
var clientVars = {}; <script type="text/javascript">
(function () { var clientVars = {};
require.setRootURI("../javascripts/src"); (function () {
require.setLibraryURI("../javascripts/lib"); require.setRootURI("../javascripts/src");
require.setGlobalKeyPath("require"); require.setLibraryURI("../javascripts/lib");
require.setGlobalKeyPath("require");
var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
plugins.update(function () { plugins.update(function () {
require('ep_etherpad-lite/static/js/pad').init(); require('ep_etherpad-lite/static/js/pad').init();
}); });
/* TODO: These globals shouldn't exist. */
pad = require('ep_etherpad-lite/static/js/pad').pad;
chat = require('ep_etherpad-lite/static/js/chat').chat;
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
}());
</script>
/* TODO: These globals shouldn't exist. */
pad = require('ep_etherpad-lite/static/js/pad').pad;
chat = require('ep_etherpad-lite/static/js/chat').chat;
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
}());
</script>
<% e.end_block(); %>
</html> </html>