Merge pull request #641 from 0ip/highlight_module
Fix | Highlight currently opened module
This commit is contained in:
John McLear
commit
9fe8a7530d
|
|
@ -182,7 +182,7 @@ var padeditbar = (function()
|
||||||
//hide all modules
|
//hide all modules
|
||||||
if(moduleName == "none")
|
if(moduleName == "none")
|
||||||
{
|
{
|
||||||
$("#editbar ul#menu_right > li").removeClass("selected");
|
$(".toolbar ul.menu_right li").removeClass("selected");
|
||||||
for(var i=0;i<modules.length;i++)
|
for(var i=0;i<modules.length;i++)
|
||||||
{
|
{
|
||||||
//skip the userlist
|
//skip the userlist
|
||||||
|
|
@ -200,11 +200,11 @@ var padeditbar = (function()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var nth_child = indexOf(modules, moduleName) + 1;
|
var nth_child = indexOf(modules, moduleName) + 1;
|
||||||
if (nth_child > 0 && nth_child <= (modules.length-1)) {
|
if (nth_child > 0 && nth_child <= (modules.length-1)) {
|
||||||
$("#editbar ul#menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected");
|
$(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected");
|
||||||
$("#editbar ul#menu_right li:nth-child(" + nth_child + ")").toggleClass("selected");
|
$(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected");
|
||||||
}
|
}
|
||||||
if(modules[modules.length-1] === moduleName) $("#editbar ul#menu_right li").removeClass("selected");
|
if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected");
|
||||||
//hide all modules that are not selected and show the selected one
|
//hide all modules that are not selected and show the selected one
|
||||||
for(var i=0;i<modules.length;i++)
|
for(var i=0;i<modules.length;i++)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -11,79 +11,77 @@
|
||||||
<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">
|
||||||
|
|
||||||
<% e.begin_block("styles"); %>
|
<% e.begin_block("styles"); %>
|
||||||
<link href="../static/css/pad.css" rel="stylesheet">
|
<link href="../static/css/pad.css" rel="stylesheet">
|
||||||
<link href="../static/custom/pad.css" rel="stylesheet">
|
<link href="../static/custom/pad.css" rel="stylesheet">
|
||||||
<style title="dynamicsyntax"></style>
|
<style title="dynamicsyntax"></style>
|
||||||
<% e.end_block(); %>
|
<% e.end_block(); %>
|
||||||
|
|
||||||
<!-- head and body had been removed intentionally -->
|
<!-- head and body had been removed intentionally -->
|
||||||
|
|
||||||
<div id="editbar" class="toolbar">
|
<div id="editbar" class="toolbar">
|
||||||
<ul class="menu_left">
|
<ul class="menu_left">
|
||||||
<% e.begin_block("editbarMenuLeft"); %>
|
<% e.begin_block("editbarMenuLeft"); %>
|
||||||
<li id="bold" onClick="window.pad&&pad.editbarClick('bold');return false">
|
<li id="bold" onClick="window.pad&&pad.editbarClick('bold');return false">
|
||||||
<a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
|
<a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="italic" onClick="window.pad&&pad.editbarClick('italic'); return false;">
|
<li id="italic" onClick="window.pad&&pad.editbarClick('italic'); return false;">
|
||||||
<a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
|
<a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="underline" onClick="window.pad&&pad.editbarClick('underline');return false;" >
|
<li id="underline" onClick="window.pad&&pad.editbarClick('underline');return false;" >
|
||||||
<a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
|
<a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="strikethrough" onClick="window.pad&&pad.editbarClick('strikethrough');return false;">
|
<li id="strikethrough" onClick="window.pad&&pad.editbarClick('strikethrough');return false;">
|
||||||
<a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
|
<a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="separator"></li>
|
<li class="separator"></li>
|
||||||
<li id="oderedlist" onClick="window.pad&&pad.editbarClick('insertorderedlist');return false;">
|
<li id="oderedlist" onClick="window.pad&&pad.editbarClick('insertorderedlist');return false;">
|
||||||
<a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
|
<a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="unoderedlist" onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;">
|
<li id="unoderedlist" onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;">
|
||||||
<a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
|
<a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="indent" onClick="window.pad&&pad.editbarClick('indent');return false;">
|
<li id="indent" onClick="window.pad&&pad.editbarClick('indent');return false;">
|
||||||
<a class="buttonicon buttonicon-indent" title="Indent"></a>
|
<a class="buttonicon buttonicon-indent" title="Indent"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="outdent" onClick="window.pad&&pad.editbarClick('outdent');return false;">
|
<li id="outdent" onClick="window.pad&&pad.editbarClick('outdent');return false;">
|
||||||
<a class="buttonicon buttonicon-outdent" title="Unindent"></a>
|
<a class="buttonicon buttonicon-outdent" title="Unindent"></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="separator"></li>
|
<li class="separator"></li>
|
||||||
<li id="undo" onClick="window.pad&&pad.editbarClick('undo');return false;">
|
<li id="undo" onClick="window.pad&&pad.editbarClick('undo');return false;">
|
||||||
<a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
|
<a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
|
||||||
</li>
|
</li>
|
||||||
<li id="redo" onClick="window.pad&&pad.editbarClick('redo');return false;">
|
<li id="redo" onClick="window.pad&&pad.editbarClick('redo');return false;">
|
||||||
<a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
|
<a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="separator"></li>
|
<li class="separator"></li>
|
||||||
<li id="clearAuthorship" onClick="window.pad&&pad.editbarClick('clearauthorship');return false;">
|
<li id="clearAuthorship" onClick="window.pad&&pad.editbarClick('clearauthorship');return false;">
|
||||||
<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
|
<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
|
||||||
</li>
|
</li>
|
||||||
<% e.end_block(); %>
|
<% e.end_block(); %>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="menu_right">
|
<ul class="menu_right">
|
||||||
<% e.begin_block("editbarMenuRight"); %>
|
<% e.begin_block("editbarMenuRight"); %>
|
||||||
<li onClick="window.pad&&pad.editbarClick('savedRevision');return false;">
|
<li id="settingslink" onClick="window.pad&&pad.editbarClick('settings');return false;">
|
||||||
<a id="settingslink" title="Mark this revision as a saved revision">
|
<a class="buttonicon buttonicon-settings" title="Settings of this pad"></a>
|
||||||
<div class="buttonicon buttonicon-savedRevision"></div>
|
</li>
|
||||||
</a>
|
<li id="importexportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;">
|
||||||
</li>
|
<a class="buttonicon buttonicon-import_export" title="Import/Export from/to different document formats"></a>
|
||||||
<li id="settingslink" onClick="window.pad&&pad.editbarClick('settings');return false;">
|
</li>
|
||||||
<a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a>
|
<li id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;">
|
||||||
</li>
|
<a class="buttonicon buttonicon-embed" title="Share and Embed this pad"></a>
|
||||||
<li id="importexportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;">
|
</li>
|
||||||
<a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a>
|
<li id="revisionlink" onClick="window.pad&&pad.editbarClick('savedRevision');return false;">
|
||||||
</li>
|
<a class="buttonicon buttonicon-savedRevision" title="Mark this revision as a saved revision"></a>
|
||||||
<li id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" >
|
</li>
|
||||||
<a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a>
|
<li class="separator"></li>
|
||||||
</li>
|
<li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
|
||||||
<li class="separator"></li>
|
<a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
|
||||||
<li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
|
</li>
|
||||||
<a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
|
<li id="usericon" onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users">
|
||||||
</li>
|
<span class="buttonicon buttonicon-showusers" id="usericonback"></span>
|
||||||
<li id="usericon" onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users">
|
<span id="online_count">1</span>
|
||||||
<span class="buttonicon buttonicon-showusers" id="usericonback"></span>
|
</li>
|
||||||
<span id="online_count">1</span>
|
<% e.end_block(); %>
|
||||||
</li>
|
|
||||||
<% e.end_block(); %>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -95,17 +93,17 @@
|
||||||
<button id="mycolorpickersave">Save</button>
|
<button id="mycolorpickersave">Save</button>
|
||||||
<button id="mycolorpickercancel">Cancel</button>
|
<button id="mycolorpickercancel">Cancel</button>
|
||||||
<span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
|
<span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
|
||||||
</div>
|
</div>
|
||||||
<div id="myswatchbox"><div id="myswatch"></div></div>
|
<div id="myswatchbox"><div id="myswatch"></div></div>
|
||||||
<div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled"></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>
|
||||||
<div id="otherusers">
|
<div id="otherusers">
|
||||||
<div id="guestprompts"></div>
|
<div id="guestprompts"></div>
|
||||||
<table id="otheruserstable" cellspacing="0" cellpadding="0" border="0">
|
<table id="otheruserstable" cellspacing="0" cellpadding="0" border="0">
|
||||||
<tr><td></td></tr>
|
<tr><td></td></tr>
|
||||||
</table>
|
</table>
|
||||||
<div id="nootherusers"></div>
|
<div id="nootherusers"></div>
|
||||||
</div>
|
</div>
|
||||||
<div id="userlistbuttonarea"></div>
|
<div id="userlistbuttonarea"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -150,20 +148,20 @@
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
|
<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">
|
<form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
|
||||||
<div class="importformdiv" id="importformfilediv">
|
<div class="importformdiv" id="importformfilediv">
|
||||||
<input type="file" name="file" size="15" id="importfileinput">
|
<input type="file" name="file" size="15" id="importfileinput">
|
||||||
<div class="importmessage" id="importmessagefail"></div>
|
<div class="importmessage" id="importmessagefail"></div>
|
||||||
</div>
|
</div>
|
||||||
<div id="import"></div>
|
<div id="import"></div>
|
||||||
<div class="importmessage" id="importmessagesuccess">Successful!</div>
|
<div class="importmessage" id="importmessagesuccess">Successful!</div>
|
||||||
<div class="importformdiv" id="importformsubmitdiv">
|
<div class="importformdiv" id="importformsubmitdiv">
|
||||||
<input type="hidden" name="padId" value="blpmaXT35R">
|
<input type="hidden" name="padId" value="blpmaXT35R">
|
||||||
<span class="nowrap">
|
<span class="nowrap">
|
||||||
<input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput">
|
<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="importstatusball" src="../static/img/loading.gif" align="top">
|
||||||
<img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top">
|
<img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top">
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="column">
|
<div class="column">
|
||||||
|
|
@ -223,79 +221,79 @@
|
||||||
<div id="modaloverlay">
|
<div id="modaloverlay">
|
||||||
<div id="modaloverlay-inner"></div>
|
<div id="modaloverlay-inner"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="mainmodals">
|
<div id="mainmodals">
|
||||||
<% e.begin_block("modals"); %>
|
<% e.begin_block("modals"); %>
|
||||||
<div id="connectionbox" class="modaldialog">
|
<div id="connectionbox" class="modaldialog">
|
||||||
<div id="connectionboxinner" class="modaldialog-inner">
|
<div id="connectionboxinner" class="modaldialog-inner">
|
||||||
<div class="connecting">Connecting...</div>
|
<div class="connecting">Connecting...</div>
|
||||||
<div class="reconnecting">Reestablishing connection...</div>
|
<div class="reconnecting">Reestablishing connection...</div>
|
||||||
<div class="disconnected">
|
<div class="disconnected">
|
||||||
<h2 class="h2_disconnect">Disconnected.</h2>
|
<h2 class="h2_disconnect">Disconnected.</h2>
|
||||||
<h2 class="h2_userdup">Opened in another window.</h2>
|
<h2 class="h2_userdup">Opened in another window.</h2>
|
||||||
<h2 class="h2_unauth">No Authorization.</h2>
|
<h2 class="h2_unauth">No Authorization.</h2>
|
||||||
<div id="disconnected_looping">
|
<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>
|
<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>
|
||||||
<div id="disconnected_initsocketfail">
|
<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>
|
<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>
|
||||||
<div id="disconnected_userdup">
|
<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>
|
<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>
|
||||||
<div id="disconnected_unknown">
|
<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>
|
<p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="disconnected_slowcommit">
|
<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>
|
<p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="disconnected_unauth">
|
<div id="disconnected_unauth">
|
||||||
<p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
|
<p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="disconnected_deleted">
|
<div id="disconnected_deleted">
|
||||||
<p>This pad was deleted.</p>
|
<p>This pad was deleted.</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="reconnect_advise">
|
<div id="reconnect_advise">
|
||||||
<p>If this continues to happen, please let us know</p>
|
<p>If this continues to happen, please let us know</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="reconnect_form">
|
<div id="reconnect_form">
|
||||||
<button id="forcereconnect">Reconnect Now</button>
|
<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;">
|
||||||
|
<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(); %>
|
<% e.end_block(); %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% e.begin_block("scripts"); %>
|
<% e.begin_block("scripts"); %>
|
||||||
<script type="text/javascript" src="../static/js/require-kernel.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="../static/js/jquery.js"></script>
|
||||||
<script type="text/javascript" src="../socket.io/socket.io.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" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
document.domain = document.domain;
|
document.domain = document.domain;
|
||||||
var clientVars = {};
|
var clientVars = {};
|
||||||
(function () {
|
(function () {
|
||||||
require.setRootURI("../javascripts/src");
|
require.setRootURI("../javascripts/src");
|
||||||
require.setLibraryURI("../javascripts/lib");
|
require.setLibraryURI("../javascripts/lib");
|
||||||
require.setGlobalKeyPath("require");
|
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. */
|
/* TODO: These globals shouldn't exist. */
|
||||||
pad = require('ep_etherpad-lite/static/js/pad').pad;
|
pad = require('ep_etherpad-lite/static/js/pad').pad;
|
||||||
chat = require('ep_etherpad-lite/static/js/chat').chat;
|
chat = require('ep_etherpad-lite/static/js/chat').chat;
|
||||||
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
|
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
|
||||||
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
|
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
|
||||||
}());
|
}());
|
||||||
</script>
|
</script>
|
||||||
<% e.end_block(); %>
|
<% e.end_block(); %>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue