diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-04-25 17:51:03 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-04-25 17:51:03 +0200 |
| commit | c173ebe197b173ce31d908587d76c9310fd35e62 (patch) | |
| tree | deb2ed782aa3c887e6be33c09875afdd216959f3 /src/templates | |
| parent | e559ef56406eb7868fc52221b722b8f4fd349400 (diff) | |
| parent | 83648481c349f59e6e2214832a89193842717da4 (diff) | |
| download | etherpad-lite-c173ebe197b173ce31d908587d76c9310fd35e62.zip | |
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/admin/plugins.html | 171 | ||||
| -rw-r--r-- | src/templates/pad.html | 296 | ||||
| -rw-r--r-- | src/templates/timeslider.html | 24 |
3 files changed, 253 insertions, 238 deletions
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index c1cc645a..6e9b4d2e 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,84 +1,87 @@ -<html> - <head> - <title>Plugin manager</title> - <link href="../../static/css/admin.css" rel="stylesheet" type="text/css" /> - <script src="../../static/js/jquery.js"></script> - <script src="../../socket.io/socket.io.js"></script> - <script src="../../static/js/admin/plugins.js"></script> - </head> - <body> - <div id="wrapper"> - - <% if (errors.length) { %> - <div class="errors"> - <% errors.forEach(function (item) { %> - <div class="error"><%= item.toString() %></div> - <% }) %> - </div> - <% } %> - - - <h1>Installed plugins</h1> - <table> - <thead> - <tr> - <th>Name</th> - <th>Description</th> - <td></td> - </tr> - </thead> - <tbody class="template"> - <tr id="installed-plugin-template"> - <td class="name"></td> - <td class="description"></td> - <td class="actions"> - <input type="button" value="Uninstall" class="do-uninstall"> - </td> - </tr> - </tbody> - <tbody id="installed-plugins"> - </tbody> - </table> - - <div class="paged listing search-results"> - <h1>Search for plugins to install</h1> - <form> - <input type="text" name="search" value="" id="search-query"> - <input type="button" value="Search" id="do-search"> - </form> - <table> - <thead> - <tr> - <th>Name</th> - <th>Description</th> - <td></td> - </tr> - </thead> - <tbody class="template"> - <tr> - <td class="name"></td> - <td class="description"></td> - <td class="actions"> - <input type="button" value="Install" class="do-install"> - </td> - </tr> - </tbody> - <tbody class="results"> - </tbody> - </table> - <input type="button" value="<<" class="do-prev-page"> - <span class="offset"></span>..<span class="limit"></span> of <span class="total"></span>. - <input type="button" value=">>" class="do-next-page"> - </div> - - - <div id="progress" class="dialog"> - <h1 class="title"> - Please wait: <span class="message"></span> - <input type="button" class="close" value="Close"> - </h1> - <div class="history"></div> - </div> - </div> - </body> -</html> +<html>
+ <head>
+ <title>Plugin manager</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
+ <link rel="stylesheet" href="../../static/css/admin.css">
+ <script src="../../static/js/jquery.js"></script>
+ <script src="../../socket.io/socket.io.js"></script>
+ <script src="../../static/js/admin/plugins.js"></script>
+ </head>
+ <body>
+ <div id="wrapper">
+
+ <% if (errors.length) { %>
+ <div class="errors">
+ <% errors.forEach(function (item) { %>
+ <div class="error"><%= item.toString() %></div>
+ <% }) %>
+ </div>
+ <% } %>
+
+
+ <h1>Etherpad Lite</h1>
+ <div class="seperator"></div>
+ <h2>Installed plugins</h2>
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <td></td>
+ </tr>
+ </thead>
+ <tbody class="template">
+ <tr id="installed-plugin-template">
+ <td class="name"></td>
+ <td class="description"></td>
+ <td class="actions">
+ <input type="button" value="Uninstall" class="do-uninstall">
+ </td>
+ </tr>
+ </tbody>
+ <tbody id="installed-plugins">
+ </tbody>
+ </table>
+
+ <div class="paged listing search-results">
+ <div class="seperator"></div>
+ <h2>Search for plugins to install</h2>
+ <form>
+ <input type="text" name="search" placeholder="Search term" id="search-query">
+ <input type="button" value="Search" id="do-search">
+ </form>
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <td></td>
+ </tr>
+ </thead>
+ <tbody class="template">
+ <tr>
+ <td class="name"></td>
+ <td class="description"></td>
+ <td class="actions">
+ <input type="button" value="Install" class="do-install">
+ </td>
+ </tr>
+ </tbody>
+ <tbody class="results">
+ </tbody>
+ </table>
+ <input type="button" value="<<" class="do-prev-page">
+ <span class="offset"></span>..<span class="limit"></span> of <span class="total"></span>.
+ <input type="button" value=">>" class="do-next-page">
+ </div>
+
+ <div id="progress" class="dialog">
+ <h1 class="title">
+ Please wait: <span class="message"></span>
+ <input type="button" class="close" value="Close">
+ </h1>
+ <div class="history"></div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/src/templates/pad.html b/src/templates/pad.html index 91583b36..3eced909 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -11,79 +11,77 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> <% e.begin_block("styles"); %> - <link href="../static/css/pad.css" rel="stylesheet"> - <link href="../static/custom/pad.css" rel="stylesheet"> - <style title="dynamicsyntax"></style> + <link href="../static/css/pad.css" rel="stylesheet"> + <link href="../static/custom/pad.css" rel="stylesheet"> + <style title="dynamicsyntax"></style> <% e.end_block(); %> <!-- head and body had been removed intentionally --> <div id="editbar" class="toolbar"> <ul class="menu_left"> - <% e.begin_block("editbarMenuLeft"); %> - <li id="bold" onClick="window.pad&&pad.editbarClick('bold');return false"> - <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a> - </li> - <li id="italic" onClick="window.pad&&pad.editbarClick('italic'); return false;"> - <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a> - </li> - <li id="underline" onClick="window.pad&&pad.editbarClick('underline');return false;" > - <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a> - </li> - <li id="strikethrough" onClick="window.pad&&pad.editbarClick('strikethrough');return false;"> - <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a> - </li> - <li class="separator"></li> - <li id="oderedlist" onClick="window.pad&&pad.editbarClick('insertorderedlist');return false;"> - <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a> - </li> - <li id="unoderedlist" onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;"> - <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a> - </li> - <li id="indent" onClick="window.pad&&pad.editbarClick('indent');return false;"> - <a class="buttonicon buttonicon-indent" title="Indent"></a> - </li> - <li id="outdent" onClick="window.pad&&pad.editbarClick('outdent');return false;"> - <a class="buttonicon buttonicon-outdent" title="Unindent"></a> - </li> - <li class="separator"></li> - <li id="undo" onClick="window.pad&&pad.editbarClick('undo');return false;"> - <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a> - </li> - <li id="redo" onClick="window.pad&&pad.editbarClick('redo');return false;"> - <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a> - </li> - <li class="separator"></li> - <li id="clearAuthorship" onClick="window.pad&&pad.editbarClick('clearauthorship');return false;"> - <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a> - </li> - <% e.end_block(); %> - </ul> + <% e.begin_block("editbarMenuLeft"); %> + <li id="bold" onClick="window.pad&&pad.editbarClick('bold');return false"> + <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a> + </li> + <li id="italic" onClick="window.pad&&pad.editbarClick('italic'); return false;"> + <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a> + </li> + <li id="underline" onClick="window.pad&&pad.editbarClick('underline');return false;" > + <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a> + </li> + <li id="strikethrough" onClick="window.pad&&pad.editbarClick('strikethrough');return false;"> + <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a> + </li> + <li class="separator"></li> + <li id="oderedlist" onClick="window.pad&&pad.editbarClick('insertorderedlist');return false;"> + <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a> + </li> + <li id="unoderedlist" onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;"> + <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a> + </li> + <li id="indent" onClick="window.pad&&pad.editbarClick('indent');return false;"> + <a class="buttonicon buttonicon-indent" title="Indent"></a> + </li> + <li id="outdent" onClick="window.pad&&pad.editbarClick('outdent');return false;"> + <a class="buttonicon buttonicon-outdent" title="Unindent"></a> + </li> + <li class="separator"></li> + <li id="undo" onClick="window.pad&&pad.editbarClick('undo');return false;"> + <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a> + </li> + <li id="redo" onClick="window.pad&&pad.editbarClick('redo');return false;"> + <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a> + </li> + <li class="separator"></li> + <li id="clearAuthorship" onClick="window.pad&&pad.editbarClick('clearauthorship');return false;"> + <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a> + </li> + <% e.end_block(); %> + </ul> <ul class="menu_right"> - <% e.begin_block("editbarMenuRight"); %> - <li onClick="window.pad&&pad.editbarClick('savedRevision');return false;"> - <a id="settingslink" title="Mark this revision as a saved revision"> - <div class="buttonicon buttonicon-savedRevision"></div> - </a> - </li> - <li id="settingslink" onClick="window.pad&&pad.editbarClick('settings');return false;"> - <a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a> - </li> - <li id="importexportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;"> - <a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a> - </li> - <li id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" > - <a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a> - </li> - <li class="separator"></li> - <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'"> - <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a> - </li> - <li id="usericon" onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users"> - <span class="buttonicon buttonicon-showusers" id="usericonback"></span> - <span id="online_count">1</span> - </li> - <% e.end_block(); %> + <% e.begin_block("editbarMenuRight"); %> + <li id="settingslink" onClick="window.pad&&pad.editbarClick('settings');return false;"> + <a class="buttonicon buttonicon-settings" title="Settings of this pad"></a> + </li> + <li id="importexportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;"> + <a class="buttonicon buttonicon-import_export" title="Import/Export from/to different document formats"></a> + </li> + <li id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;"> + <a class="buttonicon buttonicon-embed" title="Share and Embed this pad"></a> + </li> + <li id="revisionlink" onClick="window.pad&&pad.editbarClick('savedRevision');return false;"> + <a class="buttonicon buttonicon-savedRevision" title="Mark this revision as a saved revision"></a> + </li> + <li class="separator"></li> + <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'"> + <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a> + </li> + <li id="usericon" onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users"> + <span class="buttonicon buttonicon-showusers" id="usericonback"></span> + <span id="online_count">1</span> + </li> + <% e.end_block(); %> </ul> </div> @@ -95,17 +93,17 @@ <button id="mycolorpickersave">Save</button> <button id="mycolorpickercancel">Cancel</button> <span id="mycolorpickerpreview" class="myswatchboxhoverable"></span> - </div> + </div> <div id="myswatchbox"><div id="myswatch"></div></div> <div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled"></div> - <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div> + <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div> </div> <div id="otherusers"> <div id="guestprompts"></div> <table id="otheruserstable" cellspacing="0" cellpadding="0" border="0"> <tr><td></td></tr> </table> - <div id="nootherusers"></div> + <div id="nootherusers"></div> </div> <div id="userlistbuttonarea"></div> </div> @@ -150,20 +148,20 @@ <div class="column"> <h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br> <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data"> - <div class="importformdiv" id="importformfilediv"> - <input type="file" name="file" size="15" id="importfileinput"> - <div class="importmessage" id="importmessagefail"></div> - </div> + <div class="importformdiv" id="importformfilediv"> + <input type="file" name="file" size="15" id="importfileinput"> + <div class="importmessage" id="importmessagefail"></div> + </div> <div id="import"></div> - <div class="importmessage" id="importmessagesuccess">Successful!</div> - <div class="importformdiv" id="importformsubmitdiv"> - <input type="hidden" name="padId" value="blpmaXT35R"> - <span class="nowrap"> - <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput"> - <img alt="" id="importstatusball" src="../static/img/loading.gif" align="top"> - <img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top"> - </span> - </div> + <div class="importmessage" id="importmessagesuccess">Successful!</div> + <div class="importformdiv" id="importformsubmitdiv"> + <input type="hidden" name="padId" value="blpmaXT35R"> + <span class="nowrap"> + <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput"> + <img alt="" id="importstatusball" src="../static/img/loading.gif" align="top"> + <img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top"> + </span> + </div> </form> </div> <div class="column"> @@ -223,79 +221,85 @@ <div id="modaloverlay"> <div id="modaloverlay-inner"></div> </div> - + <div id="mainmodals"> <% e.begin_block("modals"); %> - <div id="connectionbox" class="modaldialog"> - <div id="connectionboxinner" class="modaldialog-inner"> - <div class="connecting">Connecting...</div> - <div class="reconnecting">Reestablishing connection...</div> - <div class="disconnected"> - <h2 class="h2_disconnect">Disconnected.</h2> - <h2 class="h2_userdup">Opened in another window.</h2> - <h2 class="h2_unauth">No Authorization.</h2> - <div id="disconnected_looping"> - <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> - <div id="disconnected_initsocketfail"> - <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> - <div id="disconnected_userdup"> - <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> - <div id="disconnected_unknown"> - <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p> - </div> - <div id="disconnected_slowcommit"> - <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p> - </div> - <div id="disconnected_unauth"> - <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p> - </div> - <div id="disconnected_deleted"> - <p>This pad was deleted.</p> - </div> - <div id="reconnect_advise"> - <p>If this continues to happen, please let us know</p> - </div> - <div id="reconnect_form"> - <button id="forcereconnect">Reconnect Now</button> - </div> + <div id="connectionbox" class="modaldialog"> + <div id="connectionboxinner" class="modaldialog-inner"> + <div class="connecting">Connecting...</div> + <div class="reconnecting">Reestablishing connection...</div> + <div class="disconnected"> + <h2 class="h2_disconnect">Disconnected.</h2> + <h2 class="h2_userdup">Opened in another window.</h2> + <h2 class="h2_unauth">No Authorization.</h2> + <div id="disconnected_looping"> + <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> + <div id="disconnected_initsocketfail"> + <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> + <div id="disconnected_userdup"> + <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> + <div id="disconnected_unknown"> + <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p> + </div> + <div id="disconnected_slowcommit"> + <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p> + </div> + <div id="disconnected_unauth"> + <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p> + </div> + <div id="disconnected_deleted"> + <p>This pad was deleted.</p> + </div> + <div id="reconnect_advise"> + <p>If this continues to happen, please let us know</p> + </div> + <div id="reconnect_form"> + <button id="forcereconnect">Reconnect Now</button> </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> + <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> <% e.end_block(); %> </div> - + <% e.begin_block("scripts"); %> - <script type="text/javascript" src="../static/js/require-kernel.js"></script> - <script type="text/javascript" src="../static/js/jquery.js"></script> - <script type="text/javascript" src="../socket.io/socket.io.js"></script> - <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> - <script type="text/javascript"> - document.domain = document.domain; - var clientVars = {}; - (function () { - require.setRootURI("../javascripts/src"); - require.setLibraryURI("../javascripts/lib"); - require.setGlobalKeyPath("require"); + <script type="text/javascript" src="../static/js/require-kernel.js"></script> + <script type="text/javascript" src="../static/js/jquery.js"></script> + <script type="text/javascript" src="../socket.io/socket.io.js"></script> + <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> + <script type="text/javascript"> + document.domain = document.domain; + var clientVars = {}; + (function () { + + var baseURL = '../'; + + require.setRootURI(baseURL + "javascripts/src"); + require.setLibraryURI(baseURL + "javascripts/lib"); + require.setGlobalKeyPath("require"); - var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); - plugins.update(function () { - require('ep_etherpad-lite/static/js/pad').init(); - }); + var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); + plugins.baseURL = baseURL; + plugins.update(function () { + var pad = require('ep_etherpad-lite/static/js/pad'); + pad.baseURL = baseURL; + 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> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index 9cea2c50..cfbad64c 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -164,22 +164,30 @@ </div> </div> -<script type="text/javascript" src="../../../static/js/require-kernel.js"></script> -<script type="text/javascript" src="../../../static/js/jquery.js"></script> -<script type="text/javascript" src="../../../socket.io/socket.io.js"></script> -<script type="text/javascript" src="../../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script> -<script type="text/javascript" src="../../../static/custom/timeslider.js"></script> +<script type="text/javascript" src="../../static/js/require-kernel.js"></script> +<script type="text/javascript" src="../../static/js/jquery.js"></script> +<script type="text/javascript" src="../../socket.io/socket.io.js"></script> +<script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script> +<script type="text/javascript" src="../../static/custom/timeslider.js"></script> + <script type="text/javascript" > document.domain = document.domain; var clientVars = {}; + (function () { - require.setRootURI("../../../javascripts/src"); - require.setLibraryURI("../../../javascripts/lib"); + var baseURL = '../../'; + + require.setRootURI(baseURL + "javascripts/src"); + require.setLibraryURI(baseURL + "javascripts/lib"); require.setGlobalKeyPath("require"); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); + plugins.baseURL = baseURL; + plugins.update(function () { - require('ep_etherpad-lite/static/js/timeslider').init(); + var timeslider = require('ep_etherpad-lite/static/js/timeslider') + timeslider.baseURL = baseURL; + timeslider.init(); /* TODO: These globals shouldn't exist. */ padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; |