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

Merge branch 'master' of /home/jose/etherpad-lite/

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-20 18:23:58 +01:00
commit 42662d73d0
10 changed files with 602 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
static/pad.html
View file

@ -119,18 +119,20 @@
<div id="myuser">
<div id="mycolorpicker">
<div id="colorpicker"></div>
<!--
<ul id="colorpickerswatches">
</ul>
-->
<span id="mycolorpickersave">
<a onclick="closeColorPicker()">Save</a>
</span>
<span id="mycolorpickercancel">
<a onclick="closeColorPicker()">Cancel</a>
</span>
<span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
</div>
<div id="mycolorpickersave">Save</div>
<div id="mycolorpickercancel">Cancel</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>