Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite
This commit is contained in:
Peter 'Pita' Martischka
commit
89adffed74
|
|
@ -436,7 +436,7 @@ function handleClientReady(client, message)
|
|||
},
|
||||
"collab_client_vars": {
|
||||
"initialAttributedText": atext,
|
||||
"clientIp": client.request.connection.remoteAddress,
|
||||
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
||||
//"clientAgent": "Anonymous Agent",
|
||||
"padId": message.padId,
|
||||
"historicalAuthorData": {},
|
||||
|
|
@ -445,7 +445,7 @@ function handleClientReady(client, message)
|
|||
"globalPadId": message.padId
|
||||
},
|
||||
"colorPalette": ["#ffc7c7", "#fff1c7", "#e3ffc7", "#c7ffd5", "#c7ffff", "#c7d5ff", "#e3c7ff", "#ffc7f1", "#ff8f8f", "#ffe38f", "#c7ff8f", "#8fffab", "#8fffff", "#8fabff", "#c78fff", "#ff8fe3", "#d97979", "#d9c179", "#a9d979", "#79d991", "#79d9d9", "#7991d9", "#a979d9", "#d979c1", "#d9a9a9", "#d9cda9", "#c1d9a9", "#a9d9b5", "#a9d9d9", "#a9b5d9", "#c1a9d9", "#d9a9cd"],
|
||||
"clientIp": client.request.connection.remoteAddress,
|
||||
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
|
||||
"userIsGuest": true,
|
||||
"userColor": authorManager.getAuthorColorId(author),
|
||||
"padId": message.padId,
|
||||
|
|
|
|||
|
|
@ -1,16 +1,128 @@
|
|||
/* @override
|
||||
http://localhost:9001/static/css/pad_lite.css */
|
||||
|
||||
*,html.body,p { margin: 0; padding: 0; }
|
||||
h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; font-style: normal;
|
||||
text-decoration: none; margin: 0; padding: 0; }
|
||||
|
||||
*,html,body,p{ margin: 0; padding: 0; }
|
||||
.clear { clear: both; }
|
||||
|
||||
html { font-size: 62.5%; }
|
||||
body { background: #ccc;}
|
||||
body, textarea { font-family: Helvetica, Arial, sans-serif; }
|
||||
|
||||
body { background: #ebebeb url(/static/img/jun09/pad/backgrad.gif) repeat-x left top; }
|
||||
body, textarea { font-family: Arial, sans-serif; }
|
||||
a img
|
||||
{
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/* menu */
|
||||
#editbar ul
|
||||
{
|
||||
position: relative;
|
||||
list-style: none;
|
||||
padding-right: 3px;
|
||||
padding-left: 1px;
|
||||
z-index: 2;
|
||||
height: 31px;
|
||||
overflow: hidden;
|
||||
|
||||
}
|
||||
|
||||
#editbar
|
||||
{
|
||||
background-color: #F3F7F9;
|
||||
width: 100%;
|
||||
height: 31px;
|
||||
padding-top: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#editbar ul li
|
||||
{
|
||||
float: left;
|
||||
margin-left: 2px;
|
||||
background-color: #fff;
|
||||
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
|
||||
border: 1px solid #ccc;
|
||||
padding: 4px 6px;
|
||||
|
||||
height: 18px;
|
||||
|
||||
overflow: hidden;
|
||||
|
||||
background: white; /* fallback for older/unsupporting browsers */
|
||||
background: -moz-linear-gradient(top, #eee, white 20%, white 20%);
|
||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), color-stop(20%, white), color-stop(20%, white));
|
||||
}
|
||||
|
||||
#editbar ul li:hover
|
||||
{
|
||||
border: 1px solid #888;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
#editbar ul li.separator
|
||||
{
|
||||
border: inherit;
|
||||
background: inherit;
|
||||
}
|
||||
#editbar ul li a
|
||||
{
|
||||
display: block;
|
||||
}
|
||||
#editbar ul li a img
|
||||
{
|
||||
padding: 1px;
|
||||
}
|
||||
|
||||
|
||||
#editbar ul
|
||||
{
|
||||
float: left;
|
||||
}
|
||||
#editbar ul#menu_right
|
||||
{
|
||||
float: right;
|
||||
}
|
||||
|
||||
#users
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
|
||||
#editorcontainer
|
||||
{
|
||||
position: absolute;
|
||||
|
||||
width: 100%;
|
||||
|
||||
top: 36px;
|
||||
left: 0px;
|
||||
bottom: 0px;
|
||||
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
#editorcontainer iframe {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#editorloadingbox { padding-top: 100px; padding-bottom: 100px; font-size: 2.5em; color: #aaa;
|
||||
text-align: center; position: absolute; width: 100%; height: 30px; z-index: 100; }
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
||||
OLD
|
||||
*/
|
||||
|
||||
/* @override
|
||||
http://localhost:9001/static/css/pad_lite.css */
|
||||
|
||||
#padpage {
|
||||
position: absolute;
|
||||
|
|
@ -30,20 +142,6 @@ body.fullwidth #padpage { width: auto; margin-left: 6px; margin-right: 6px; }
|
|||
body.squish1width #padpage { width: 800px; }
|
||||
body.squish2width #padpage { width: 700px; }
|
||||
|
||||
#topbar { height: 25px; background: #326cbd url(/static/img/jun09/pad/padtopback2.gif) repeat-x left top;
|
||||
position: relative; }
|
||||
|
||||
#topbarleft { float: left; height: 100%; overflow: hidden;
|
||||
background: url(/static/img/jun09/pad/padtop5.gif) no-repeat left top; width: 5px;
|
||||
|
||||
}
|
||||
#topbarright { float: right; height: 100%; overflow: hidden;
|
||||
background: url(/static/img/jun09/pad/padtop5.gif) no-repeat right top; width: 5px; }
|
||||
|
||||
.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.gif) repeat-x 0 -25px; }
|
||||
.propad #topbarleft { background: url(/static/img/jun09/pad/protop.gif) no-repeat left top; }
|
||||
.propad #topbarright { background: url(/static/img/jun09/pad/protop.gif) no-repeat right top; }
|
||||
|
||||
a#backtoprosite, #accountnav {
|
||||
display: block; position: absolute; height: 15px; line-height: 15px;
|
||||
width: auto; top: 5px; font-size: 1.2em; display:none;
|
||||
|
|
@ -209,34 +307,6 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
|
|||
z-index: 10;
|
||||
}
|
||||
|
||||
#editbar { height: 36px;
|
||||
background: #a5bfe2 url(/static/img/jun09/pad/editbar_background.gif) repeat-x;
|
||||
height:36px;
|
||||
left:0;
|
||||
position:absolute;
|
||||
right:0;
|
||||
top:0;
|
||||
color: #444444;
|
||||
}
|
||||
|
||||
#editbarinner {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#editbarleft { float: left; height: 100%; overflow: hidden;
|
||||
background: url(/static/img/jun09/pad/editbar_background_left.gif) no-repeat left top; width: 2px; }
|
||||
#editbarright { float: right; height: 100%; overflow: hidden;
|
||||
background: url(/static/img/jun09/pad/editbar_background_right.gif) no-repeat right top; width: 2px; }
|
||||
|
||||
#editbartable
|
||||
{
|
||||
position:absolute;
|
||||
top: 6px;
|
||||
left: 7px;
|
||||
width: 250px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
#editbarsavetable
|
||||
{
|
||||
position:absolute;
|
||||
|
|
@ -289,27 +359,6 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
|
|||
background: url(/static/img/jun09/pad/syncdone.gif) no-repeat center center;
|
||||
right: 38px; top: 5px; display: none; }
|
||||
|
||||
#editorcontainerbox {
|
||||
border-left: 1px solid #c4c4c4; border-right: 1px solid #c4c4c4;
|
||||
/* border-bottom: 1px solid #c4c4c4;*/
|
||||
background: #fff;
|
||||
bottom:0;
|
||||
left:0;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 36px;
|
||||
zoom: 1;
|
||||
z-index: 11;
|
||||
}
|
||||
|
||||
#editorcontainer { height: 100%; }
|
||||
|
||||
#editorcontainer iframe { width: 100%; height: 100%; padding: 0; margin: 0; }
|
||||
|
||||
#editorloadingbox { padding-top: 100px; padding-bottom: 100px; font-size: 2.5em; color: #aaa;
|
||||
text-align: center; position: absolute; width: 100%; height: 30px; z-index: 100; }
|
||||
|
||||
#padsidebar {
|
||||
bottom: 0px;
|
||||
position: absolute;
|
||||
|
|
@ -512,6 +561,7 @@ table#otheruserstable { display: none; }
|
|||
|
||||
#reconnect_form button {
|
||||
font-size: 12pt;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
/* We give docbar a higher z-index than its descendant impexp-wrapper in
|
||||
|
|
@ -851,7 +901,6 @@ form#reconnectform { display: none; }
|
|||
border: 1px solid #999;
|
||||
}
|
||||
.modaldialog .modaldialog-inner { padding: 10pt; }
|
||||
.modaldialog .modaldialog-inner * { margin: 2pt; }
|
||||
.modaldialog .modaldialog-hide {
|
||||
float: right;
|
||||
background-repeat: no-repeat;
|
||||
|
|
@ -1021,30 +1070,6 @@ padding-left:4px;
|
|||
margin-left:4px;
|
||||
}
|
||||
|
||||
#users{
|
||||
display:none;
|
||||
position:absolute;
|
||||
height:30px;
|
||||
top:42px;
|
||||
font-size:14px;
|
||||
width:100%;
|
||||
}
|
||||
|
||||
#users ul li
|
||||
{
|
||||
float: left;
|
||||
list-style: none;
|
||||
margin-left: 10px;
|
||||
padding-right: 10px;
|
||||
border-right: 1px solid #000;
|
||||
}
|
||||
|
||||
#users ul li a:hover
|
||||
{
|
||||
text-decoration: underline;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
ul#colorpickerswatches
|
||||
{
|
||||
padding-left: 3px;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
270
static/padhtml
270
static/padhtml
|
|
@ -18,14 +18,12 @@ var clientVars = {}; // ]]>
|
|||
<!-- <script type="text/javascript" src="/static/js/client.js"></script>-->
|
||||
<script type="text/javascript" src="/static/js/plugins.js"></script>
|
||||
<script type="text/javascript" src="/static/js/undo-xpopup.js"></script>
|
||||
<!--
|
||||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
|
||||
-->
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/json.js"></script>
|
||||
<!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>-->
|
||||
<!-- <script type="text/javascript" src="/static/js/json.js"></script> -->
|
||||
<script type="text/javascript" src="/static/js/json2.js"></script>
|
||||
<script type="text/javascript" src="/static/js/colorutils.js"></script>
|
||||
<script type="text/javascript" src="/static/js/draggable.js"></script>
|
||||
<!--<script type="text/javascript" src="/static/js/colorutils.js"></script>-->
|
||||
<!--<script type="text/javascript" src="/static/js/draggable.js"></script>-->
|
||||
<script type="text/javascript" src="/static/js/pad_utils.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_cookie.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_editor.js"></script>
|
||||
|
|
@ -41,154 +39,128 @@ var clientVars = {}; // ]]>
|
|||
<script type="text/javascript" src="/static/js/pad2.js"></script>
|
||||
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
|
||||
</head>
|
||||
<body id="padbody" class="limwidth nonpropad nonprouser">
|
||||
<div id="padeditor">
|
||||
<div id="editbar" class="disabledtoolbar">
|
||||
<table cellpadding="0" cellspacing="0" border="0" id="editbartable">
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)"><img src="/static/img/jun09/pad/editbar_bold.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('italic'));" title="Italics (ctrl-I)"><img src="/static/img/jun09/pad/editbar_italic.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)"><img src="/static/img/jun09/pad/editbar_underline.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough"><img src="/static/img/jun09/pad/editbar_strikethrough.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List"><img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List"><img src="/static/img/jun09/pad/editbar_indent.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List"><img src="/static/img/jun09/pad/editbar_outdent.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td width="100%">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table cellpadding="0" cellspacing="0" border="0" id="editbarsavetable">
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('showusers'));" title="Show connected users"><img id="showusersicon" src="/static/img/mar11/editbar_showusers.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors">
|
||||
<img src="/static/img/jun09/pad/editbar_clearauthorship.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)"><img src="/static/img/jun09/pad/editbar_undo.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)"><img src="/static/img/jun09/pad/editbar_redo.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision"><img src="/static/img/jun09/pad/editbar_save.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad"><img src="/static/img/mar11/editbar_embed.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<!-- The below is completely temporary and should be deleted CAKE -->
|
||||
<script type="text/javascript">
|
||||
function shinyshiny(){
|
||||
$('#showusersicon').fadeOut('fast');
|
||||
$('#showusersicon').fadeIn('fast');
|
||||
$('#showusersicon').fadeOut('fast');
|
||||
$('#showusersicon').fadeIn('fast');
|
||||
}
|
||||
</script>
|
||||
<input type="button" onclick="shinyshiny();" value="shiny">
|
||||
<!-- end of temporary section designed to be deleted -->
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<select id="viewzoommenu">
|
||||
<option value="z85">85%</option>
|
||||
<option value="z100">100%</option>
|
||||
<option value="z115">115%</option>
|
||||
<option value="z150">150%</option>
|
||||
<option value="z200">200%</option>
|
||||
<option value="z300">300%</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<body>
|
||||
|
||||
<div id="users">
|
||||
<ul>
|
||||
<li><a onclick="showColorPicker();" title="Change my name/color">John</a></li>
|
||||
<li>Joe</li>
|
||||
</ul>
|
||||
<!-- some example code so I can make the css -->
|
||||
<div id="mycolorpicker">
|
||||
<ul id="colorpickerswatches">
|
||||
</ul>
|
||||
<div id="mycolorpickersave">
|
||||
<a onclick="closeColorPicker()">Save</a>
|
||||
</div>
|
||||
<div id="mycolorpickercancel">
|
||||
<a onclick="closeColorPicker()">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="embed">
|
||||
<div id="editbar">
|
||||
|
||||
<ul id="menu_left">
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)">
|
||||
<img src="/static/img/jun09/pad/editbar_bold.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('italic'));" title="Italics (ctrl-I)">
|
||||
<img src="/static/img/jun09/pad/editbar_italic.gif">
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)">
|
||||
<img src="/static/img/jun09/pad/editbar_underline.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough">
|
||||
<img src="/static/img/jun09/pad/editbar_strikethrough.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li class="separator"></li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List">
|
||||
<img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List">
|
||||
<img src="/static/img/jun09/pad/editbar_indent.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List">
|
||||
<img src="/static/img/jun09/pad/editbar_outdent.gif" />
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<ul id="menu_right">
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('showusers'));" title="Show connected users">
|
||||
<img id="showusersicon" src="/static/img/mar11/editbar_showusers.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li class="separator"></li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors">
|
||||
<img src="/static/img/jun09/pad/editbar_clearauthorship.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)">
|
||||
<img src="/static/img/jun09/pad/editbar_undo.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)">
|
||||
<img src="/static/img/jun09/pad/editbar_redo.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision">
|
||||
<img src="/static/img/jun09/pad/editbar_save.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad">
|
||||
<img src="/static/img/mar11/editbar_embed.gif" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<select id="viewzoommenu">
|
||||
<option value="z85">85%</option>
|
||||
<option value="z100">100%</option>
|
||||
<option value="z115">115%</option>
|
||||
<option value="z150">150%</option>
|
||||
<option value="z200">200%</option>
|
||||
<option value="z300">300%</option>
|
||||
</select>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="users">
|
||||
<ul>
|
||||
<li><a onclick="showColorPicker();" title="Change my name/color">John</a></li>
|
||||
<li>Joe</li>
|
||||
</ul>
|
||||
<!-- some example code so I can make the css -->
|
||||
<div id="mycolorpicker">
|
||||
<ul id="colorpickerswatches">
|
||||
</ul>
|
||||
<span id="mycolorpickersave">
|
||||
<a onclick="closeColorPicker()">Save</a>
|
||||
</span>
|
||||
<span id="mycolorpickercancel">
|
||||
<a onclick="closeColorPicker()">Cancel</a>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="editorcontainerbox">
|
||||
<div id="editorloadingbox">
|
||||
Loading Etherpad Lite...
|
||||
</div>
|
||||
<div id="editorcontainer">
|
||||
<!-- -->
|
||||
</div>
|
||||
<div id="editorcontainer">
|
||||
|
||||
<div id="editor">
|
||||
<!-- -->
|
||||
</div>
|
||||
<div id="editorloading">
|
||||
<!-- Loading Etherpad Lite...-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- needed? -->
|
||||
<div id="embed"></div>
|
||||
|
||||
<!-- /padeditor -->
|
||||
<div id="modaloverlay">
|
||||
<div id="modaloverlay-inner">
|
||||
|
|
@ -252,8 +224,6 @@ var clientVars = {}; // ]]>
|
|||
</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"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,268 @@
|
|||
<!DOCTYPE html PUBLIC
|
||||
"-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
|
||||
<meta http-equiv="Content-Language" content="en-us"/>
|
||||
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW"/>
|
||||
<title>Etherpad Lite v0.0.1: test</title>
|
||||
<!-- <base href="http://localhost:9001/" />-->
|
||||
<!-- CSS -->
|
||||
<link href="/static/css/pad_lite.css" rel="stylesheet" type="text/css"/>
|
||||
<!-- javascript -->
|
||||
<script type="text/javascript">
|
||||
// <![CDATA[
|
||||
var clientVars = {}; // ]]>
|
||||
</script>
|
||||
<!-- <script type="text/javascript" src="/static/js/client.js"></script>-->
|
||||
<script type="text/javascript" src="/static/js/plugins.js"></script>
|
||||
<script type="text/javascript" src="/static/js/undo-xpopup.js"></script>
|
||||
<!--
|
||||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
|
||||
-->
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/json.js"></script>
|
||||
<script type="text/javascript" src="/static/js/json2.js"></script>
|
||||
<script type="text/javascript" src="/static/js/colorutils.js"></script>
|
||||
<script type="text/javascript" src="/static/js/draggable.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_utils.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_cookie.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_editor.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_editbar.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_docbar.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_modals.js"></script>
|
||||
<script type="text/javascript" src="/static/js/ace.js"></script>
|
||||
<script type="text/javascript" src="/static/js/collab_client.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_userlist.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_impexp.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_savedrevs.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad_connectionstatus.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pad2.js"></script>
|
||||
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
|
||||
</head>
|
||||
<body id="padbody" class="limwidth nonpropad nonprouser">
|
||||
<div id="padeditor">
|
||||
<div id="editbar" class="disabledtoolbar">
|
||||
<table cellpadding="0" cellspacing="0" border="0" id="editbartable">
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)"><img src="/static/img/jun09/pad/editbar_bold.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('italic'));" title="Italics (ctrl-I)"><img src="/static/img/jun09/pad/editbar_italic.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)"><img src="/static/img/jun09/pad/editbar_underline.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough"><img src="/static/img/jun09/pad/editbar_strikethrough.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List"><img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List"><img src="/static/img/jun09/pad/editbar_indent.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List"><img src="/static/img/jun09/pad/editbar_outdent.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td width="100%">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table cellpadding="0" cellspacing="0" border="0" id="editbarsavetable">
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('showusers'));" title="Show connected users"><img id="showusersicon" src="/static/img/mar11/editbar_showusers.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors">
|
||||
<img src="/static/img/jun09/pad/editbar_clearauthorship.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)"><img src="/static/img/jun09/pad/editbar_undo.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)"><img src="/static/img/jun09/pad/editbar_redo.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision"><img src="/static/img/jun09/pad/editbar_save.gif"></a>
|
||||
</td>
|
||||
<td class="editbarbutton">
|
||||
<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad"><img src="/static/img/mar11/editbar_embed.gif"></a>
|
||||
</td>
|
||||
<td>
|
||||
<!-- The below is completely temporary and should be deleted CAKE -->
|
||||
<script type="text/javascript">
|
||||
function shinyshiny(){
|
||||
$('#showusersicon').fadeOut('fast');
|
||||
$('#showusersicon').fadeIn('fast');
|
||||
$('#showusersicon').fadeOut('fast');
|
||||
$('#showusersicon').fadeIn('fast');
|
||||
}
|
||||
</script>
|
||||
<input type="button" onclick="shinyshiny();" value="shiny">
|
||||
<!-- end of temporary section designed to be deleted -->
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
|
||||
</td>
|
||||
<td class="editbarbutton editbargroupsfirst">
|
||||
<select id="viewzoommenu">
|
||||
<option value="z85">85%</option>
|
||||
<option value="z100">100%</option>
|
||||
<option value="z115">115%</option>
|
||||
<option value="z150">150%</option>
|
||||
<option value="z200">200%</option>
|
||||
<option value="z300">300%</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div id="users">
|
||||
<ul>
|
||||
<li><a onclick="showColorPicker();" title="Change my name/color">John</a></li>
|
||||
<li>Joe</li>
|
||||
</ul>
|
||||
<!-- some example code so I can make the css -->
|
||||
<div id="mycolorpicker">
|
||||
<ul id="colorpickerswatches">
|
||||
</ul>
|
||||
<div id="mycolorpickersave">
|
||||
<a onclick="closeColorPicker()">Save</a>
|
||||
</div>
|
||||
<div id="mycolorpickercancel">
|
||||
<a onclick="closeColorPicker()">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="embed">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="editorcontainerbox">
|
||||
|
||||
<div id="editorcontainer">
|
||||
<!-- -->
|
||||
</div>
|
||||
<div id="editorloadingbox">
|
||||
Loading Etherpad Lite...
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- /padeditor -->
|
||||
<div id="modaloverlay">
|
||||
<div id="modaloverlay-inner">
|
||||
<!-- -->
|
||||
</div>
|
||||
</div>
|
||||
<div id="mainmodals">
|
||||
<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="reconnect_advise">
|
||||
<p>
|
||||
If this continues to happen, please <a target="_blank" href="/ep/support">let us know</a>
|
||||
(opens in new window).
|
||||
</p>
|
||||
</div>
|
||||
<div id="reconnect_form">
|
||||
<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>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue