mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 02:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed merge conflicts

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-22 13:14:59 +01:00
parent e771542961
commit 913c3c455d
3 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/pad.html
View file

@ -237,17 +237,14 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
<div id="chaticon">
<a onClick="chat.show();return false;"
title="Open the chat for this pad">
<span id="chatlabel">Chat</span>
<span id="chatlabel">Chat</span>
<div class="buttonicon" style="background-position:0px -102px;display:inline-block;"></div>
</a>
<span id="chatcounter">0</span>
</div>
<div id="chatbox">
<div id="titlebar"><span id="titlelabel">Chat |</span>
<a id="showhistorylabel" onClick="chat.showHistory();return false;">Show History</a>
<a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a>
</div>
<div id="titlebar"><span id ="titlelabel">Chat</span><a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a></div>
<div id="chattext" class="authorColors"></div>
<div id="chatinputbox">
<form>