mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #703 from cweider/remove-onclick

Browse source 
Remove onclick
This commit is contained in:
John McLear 2012-05-19 05:41:49 -07:00
commit 53bfc380af
5 changed files with 126 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/static/css/pad.css
View file

@ -64,34 +64,17 @@ a img {
height: 32px; height: 32px;
} }
.toolbar ul li { .toolbar ul li {
background: #fff;
background: -webkit-linear-gradient(#fff, #f0f0f0);
background: -moz-linear-gradient(#fff, #f0f0f0);
background: -o-linear-gradient(#fff, #f0f0f0);
background: -ms-linear-gradient(#fff, #f0f0f0);
background: linear-gradient(#fff, #f0f0f0);
border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
cursor: pointer;
float: left; float: left;
height: 18px;
margin-left: 2px; margin-left: 2px;
overflow: hidden;
padding: 4px 5px;
width: 18px;
} }
.toolbar ul li a { .toolbar ul li a:hover {
text-decoration: none; text-decoration: none;
color: #ccc;
position: absolute;
} }
.toolbar ul li a span { .toolbar ul li a span {
position: relative; position: relative;
top: -2px; top: -2px;
} }
.toolbar ul li:hover { .toolbar ul li a:hover {
background: #fff; background: #fff;
background: -webkit-linear-gradient(#f4f4f4, #e4e4e4); background: -webkit-linear-gradient(#f4f4f4, #e4e4e4);
background: -moz-linear-gradient(#f4f4f4, #e4e4e4); background: -moz-linear-gradient(#f4f4f4, #e4e4e4);
@ -99,7 +82,7 @@ a img {
background: -ms-linear-gradient(#f4f4f4, #e4e4e4); background: -ms-linear-gradient(#f4f4f4, #e4e4e4);
background: linear-gradient(#f4f4f4, #e4e4e4); background: linear-gradient(#f4f4f4, #e4e4e4);
} }
.toolbar ul li:active { .toolbar ul li a:active {
background: #eee; background: #eee;
background: -webkit-linear-gradient(#ddd, #fff); background: -webkit-linear-gradient(#ddd, #fff);
background: -moz-linear-gradient(#ddd, #fff); background: -moz-linear-gradient(#ddd, #fff);
@ -115,12 +98,30 @@ a img {
background: inherit; background: inherit;
visibility: hidden; visibility: hidden;
width: 0px; width: 0px;
padding: 5px;
} }
.toolbar ul li a { .toolbar ul li a {
display: block background: #fff;
background: -webkit-linear-gradient(#fff, #f0f0f0);
background: -moz-linear-gradient(#fff, #f0f0f0);
background: -o-linear-gradient(#fff, #f0f0f0);
background: -ms-linear-gradient(#fff, #f0f0f0);
background: linear-gradient(#fff, #f0f0f0);
border: 1px solid #ccc;
border-radius: 4px;
color: #ccc;
cursor: pointer;
display: inline-block;
min-height: 18px;
overflow: hidden;
padding: 4px 5px;
text-align: center;
text-decoration: none;
min-width: 18px;
} }
.toolbar ul li a img { .toolbar ul li a .buttonicon {
padding: 1px position: relative;
top: 1px;
} }
.toolbar ul { .toolbar ul {
float: left float: left
@ -428,6 +429,7 @@ a#hidetopmsg {
top: 0; top: 0;
width: 56px; width: 56px;
z-index: 10; z-index: 10;
display: inline-block;
} }
.toolbarsavetable { .toolbarsavetable {
position: absolute; position: absolute;
@ -1214,8 +1216,8 @@ ul#colorpickerswatches li:hover {
height: 16px; height: 16px;
background-image: url('../../static/img/etherpad_lite_icons.png'); background-image: url('../../static/img/etherpad_lite_icons.png');
background-repeat: no-repeat; background-repeat: no-repeat;
margin-left: 1px; display: inline-block;
margin-top: 1px; vertical-align: middle;
} }
.buttonicon-bold { .buttonicon-bold {
background-position: 0px -116px background-position: 0px -116px
@ -1264,20 +1266,13 @@ ul#colorpickerswatches li:hover {
} }
.buttonicon-chat { .buttonicon-chat {
background-position: 0px -102px; background-position: 0px -102px;
display: inline-block;
vertical-align: middle;
margin: 0 !important;
} }
.buttonicon-showusers { .buttonicon-showusers {
background-position: 0px -183px; background-position: 0px -183px;
display: inline-block;
} }
.buttonicon-savedRevision { .buttonicon-savedRevision {
background-position: 0px -493px background-position: 0px -493px
} }
#usericon {
width: 33px !important
}
#focusprotector { #focusprotector {
z-index: 100; z-index: 100;
position: absolute; position: absolute;
@ -1293,9 +1288,6 @@ ul#colorpickerswatches li:hover {
} }
#online_count { #online_count {
color: #888; color: #888;
font-size: 11px;
line-height: 18px;
position: fixed;
} }
.rtl { .rtl {
direction: RTL direction: RTL
@ -1399,13 +1391,16 @@ input[type=checkbox] {
} }
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.toolbar ul li { .toolbar ul li.separator {
padding: 1px;
}
.toolbar ul li a {
padding: 4px 1px padding: 4px 1px
} }
} }
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) { @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
.toolbar ul li { .toolbar ul li a {
padding: 4px 3px padding: 4px 5px;
} }
#users { #users {
right: 0; right: 0;
@ -1436,15 +1431,6 @@ input[type=checkbox] {
bottom: 0; bottom: 0;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }
.toolbar ul.menu_right li:last-child {
height: 24px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
margin-top: 0;
border: 0;
float: right;
}
#chaticon { #chaticon {
bottom: 3px; bottom: 3px;
right: 55px; right: 55px;
@ -1466,19 +1452,27 @@ input[type=checkbox] {
border-top-right-radius: 0; border-top-right-radius: 0;
border-right: none; border-right: none;
} }
.toolbar ul li a span {
top: -3px
}
#usericonback { #usericonback {
margin-top: 4px margin-top: 4px
} }
.toolbar ul.menu_right li:not(:last-child) { .toolbar ul.menu_right > li:last-child {
display: block float: right;
}
.toolbar ul.menu_right > li:not(:last-child) a {
display: block;
} }
.toolbar ul.menu_right > li { .toolbar ul.menu_right > li {
background: none; padding: 0;
}
.toolbar ul.menu_right > li a {
height: 24px;
line-height: 24px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
border: none; border: none;
margin-top: 4px; background: none;
margin: 0;
padding: 4px 8px; padding: 4px 8px;
} }
.selected { .selected {

7
src/static/js/pad.js
View file

@ -682,13 +682,6 @@ var pad = {
paduserlist.removeGuestPrompt(msg.guestId); paduserlist.removeGuestPrompt(msg.guestId);
} }
}, },
editbarClick: function(cmd)
{
if (padeditbar)
{
padeditbar.toolbarClick(cmd);
}
},
dmesg: function(m) dmesg: function(m)
{ {
if (pad.getIsDebugEnabled()) if (pad.getIsDebugEnabled())

7
src/static/js/pad_editbar.js
View file

@ -97,8 +97,15 @@ var padeditbar = (function()
var self = { var self = {
init: function() init: function()
{ {
var self = this;
$("#editbar .editbarbutton").attr("unselectable", "on"); // for IE $("#editbar .editbarbutton").attr("unselectable", "on"); // for IE
$("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar"); $("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar");
$("#editbar [data-key]").each(function (i, e) {
$(e).click(function (event) {
self.toolbarClick($(e).attr('data-key'));
event.preventDefault();
});
});
}, },
isEnabled: function() isEnabled: function()
{ {

4
src/static/js/pad_userlist.js
View file

@ -724,11 +724,11 @@ var paduserlist = (function()
$("#myswatch").css({'background-color': myUserInfo.colorId}); $("#myswatch").css({'background-color': myUserInfo.colorId});
if ($.browser.msie && parseInt($.browser.version) <= 8) { if ($.browser.msie && parseInt($.browser.version) <= 8) {
$("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId}); $("#usericon a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
} }
else else
{ {
$("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId}); $("#usericon a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId});
} }
} }
}; };

104
src/templates/pad.html
View file

@ -22,65 +22,99 @@
<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&amp;&amp;pad.editbarClick('bold');return false"> <li id="bold" data-key="bold">
<a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a> <a title="Bold (ctrl-B)">
<span class="buttonicon buttonicon-bold"></span>
</a>
</li> </li>
<li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;"> <li id="italic" data-key="italic">
<a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a> <a title="Italics (ctrl-I)">
<span class="buttonicon buttonicon-italic"></span>
</a>
</li> </li>
<li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" > <li id="underline" data-key="underline">
<a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a> <a title="Underline (ctrl-U)">
<span class="buttonicon buttonicon-underline"></span>
</a>
</li> </li>
<li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;"> <li id="strikethrough" data-key="strikethrough">
<a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a> <a title="Strikethrough">
<span class="buttonicon buttonicon-strikethrough"></span>
</a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;"> <li id="oderedlist" data-key="insertorderedlist">
<a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a> <a title="Toggle Ordered List">
<span class="buttonicon buttonicon-insertorderedlist"></span>
</a>
</li> </li>
<li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;"> <li id="unoderedlist" data-key="insertunorderedlist">
<a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a> <a title="Toggle Bullet List">
<span class="buttonicon buttonicon-insertunorderedlist"></span>
</a>
</li> </li>
<li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;"> <li id="indent" data-key="indent">
<a class="buttonicon buttonicon-indent" title="Indent"></a> <a title="Indent">
<span class="buttonicon buttonicon-indent"></span>
</a>
</li> </li>
<li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;"> <li id="outdent" data-key="outdent">
<a class="buttonicon buttonicon-outdent" title="Unindent"></a> <a title="Unindent">
<span class="buttonicon buttonicon-outdent"></span>
</a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;"> <li id="undo" data-key="undo">
<a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a> <a title="Undo (ctrl-Z)">
<span class="buttonicon buttonicon-undo"></span>
</a>
</li> </li>
<li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;"> <li id="redo" data-key="redo">
<a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a> <a title="Redo (ctrl-Y)">
<span class="buttonicon buttonicon-redo"></span>
</a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;"> <li id="clearAuthorship" data-key="clearauthorship">
<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a> <a title="Clear Authorship Colors">
<span class="buttonicon buttonicon-clearauthorship"></span>
</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 id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;"> <li data-key="settings">
<a class="buttonicon buttonicon-settings" title="Settings of this pad"></a> <a id="settingslink" title="Settings of this pad">
<span class="buttonicon buttonicon-settings"></span>
</a>
</li> </li>
<li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;"> <li data-key="import_export">
<a class="buttonicon buttonicon-import_export" title="Import/Export from/to different document formats"></a> <a id="importexportlink" title="Import/Export from/to different document formats">
<span class="buttonicon buttonicon-import_export"></span>
</a>
</li> </li>
<li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;"> <li data-key="embed">
<a class="buttonicon buttonicon-embed" title="Share and Embed this pad"></a> <a id="embedlink" title="Share and Embed this pad">
<span class="buttonicon buttonicon-embed"></span>
</a>
</li> </li>
<li id="revisionlink" onClick="window.pad&amp;&amp;pad.editbarClick('savedRevision');return false;"> <li data-key="savedRevision">
<a class="buttonicon buttonicon-savedRevision" title="Mark this revision as a saved revision"></a> <a id="revisionlink" title="Mark this revision as a saved revision">
<span class="buttonicon buttonicon-savedRevision"></span>
</a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'"> <li onClick="document.location = document.location.pathname+ '/timeslider'">
<a class="buttonicon buttonicon-history" title="Show the history of this pad"></a> <a id="timesliderlink" title="Show the history of this pad">
<span class="buttonicon buttonicon-history"></span>
</a>
</li> </li>
<li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users"> <li id="usericon" data-key="showusers">
<span class="buttonicon buttonicon-showusers" id="usericonback"></span> <a title="Show connected users">
<span id="online_count">1</span> <span class="buttonicon buttonicon-showusers" id="usericonback"></span>
<span id="online_count">1</span>
</a>
</li> </li>
<% e.end_block(); %> <% e.end_block(); %>
</ul> </ul>