mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-13 18:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge branch 'develop' of github.com:sciunto/etherpad-lite

Browse source 
Conflicts:
	src/package.json
	src/templates/timeslider.html
This commit is contained in:
François Boulogne 2012-11-15 20:46:59 +01:00
commit 7761409374
43 changed files with 530 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/templates/index.html
View file

@ -2,6 +2,29 @@
<html>
<title>Etherpad Lite</title>
<script>
/*
|@licstart The following is the entire license notice for the
JavaScript code in this page.|
Copyright 2011 Peter Martischka, Primary Technology.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
|@licend The above is the entire license notice
for the JavaScript code in this page.|
*/
</script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
@ -9,9 +32,11 @@
<link rel="shortcut icon" href="favicon.ico">
<style>
html, body {
height: 100%;
}
body {
margin: 0;
height: 100%;
color: #333;
font: 14px helvetica, sans-serif;
background: #ddd;
@ -30,7 +55,6 @@
background: -moz-linear-gradient(#fff,#ccc);
background: -ms-linear-gradient(#fff,#ccc);
background: -o-linear-gradient(#fff,#ccc);
opacity: .9;
box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
}
#inner {

28
src/templates/pad.html
View file

@ -3,8 +3,30 @@
%>
<!doctype html>
<html>
<title>Etherpad Lite</title>
<script>
/*
|@licstart The following is the entire license notice for the
JavaScript code in this page.|
Copyright 2011 Peter Martischka, Primary Technology.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
|@licend The above is the entire license notice
for the JavaScript code in this page.|
*/
</script>
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
@ -234,7 +256,7 @@
</div>
<div class="reconnecting">
<h1>Reestablishing connection...</h1>
<p><img alt="" border="0" src="/static/img/connectingbar.gif" /></p>
<p><img alt="" border="0" src="../static/img/connectingbar.gif" /></p>
</div>
<div class="userdup">
<h1>Opened in another window.</h1>
@ -313,7 +335,7 @@
<div id="chattext" class="authorColors"></div>
<div id="chatinputbox">
<form>
<input id="chatinput" type="text" maxlength="140">
<input id="chatinput" type="text" maxlength="999">
</form>
</div>
</div>

8
src/templates/timeslider.html
View file

@ -31,9 +31,13 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
<<<<<<< HEAD
<link rel="shortcut icon" href="<%=settings.favicon%>">
<script type="text/javascript" src="../../static/js/l10n.js"></script>
<link rel="resource" type="application/l10n" href="../../locales.ini" />
=======
<link rel="shortcut icon" href="../../favicon.ico">
>>>>>>> 1c847dbde3c36d473a93f06e26ffa97bd82582ba
<link rel="stylesheet" href="../../static/css/pad.css">
<link rel="stylesheet" href="../../static/css/timeslider.css">
<link rel="stylesheet" href="../../static/custom/timeslider.css">
@ -108,7 +112,11 @@
<h2 data-l10n-id="pad.modals.connected"></h2>
</div>
<div class="reconnecting">
<<<<<<< HEAD
<h1 data-l10n-id="pad.modals.reconnecting"></h1>
=======
<h1>Reestablishing connection...</h1>
>>>>>>> 1c847dbde3c36d473a93f06e26ffa97bd82582ba
<p><img alt="" border="0" src="../../static/img/connectingbar.gif" /></p>
</div>
<div class="userdup">