Fixed merge conflicts + changed the design of the front page a bit
Peter 'Pita' Martischka
commit
ba677c6e30
|
|
@ -52,7 +52,7 @@ If you're new to git and github, start here <http://learn.github.com/p/intro.htm
|
||||||
|
|
||||||
If you're new to node.js, start with this video <http://youtu.be/jo_B4LTHi3I>.
|
If you're new to node.js, start with this video <http://youtu.be/jo_B4LTHi3I>.
|
||||||
|
|
||||||
If you wanna find out how Etherpads Easysync works (the library that makes it realy realtime), start with this [PDF](https://github.com/Pita/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf) (complex, but worth reading it).
|
If you wanna find out how Etherpads Easysync works (the library that makes it really realtime), start with this [PDF](https://github.com/Pita/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf) (complex, but worth reading it).
|
||||||
|
|
||||||
You know all this and just want to know how you can help? Look at the [TODO list](https://github.com/Pita/etherpad-lite/wiki/TODO).
|
You know all this and just want to know how you can help? Look at the [TODO list](https://github.com/Pita/etherpad-lite/wiki/TODO).
|
||||||
You can join the [mailinglist](http://groups.google.com/group/etherpad-lite-dev) or go to the freenode irc channel [#etherpad-lite-dev](http://webchat.freenode.net?channels=#etherpad-lite-dev)
|
You can join the [mailinglist](http://groups.google.com/group/etherpad-lite-dev) or go to the freenode irc channel [#etherpad-lite-dev](http://webchat.freenode.net?channels=#etherpad-lite-dev)
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,8 @@ a img
|
||||||
|
|
||||||
height: 18px;
|
height: 18px;
|
||||||
|
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
background: white; /* fallback for older/unsupporting browsers */
|
background: white; /* fallback for older/unsupporting browsers */
|
||||||
|
|
|
||||||
|
|
@ -1,92 +1,166 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<head>
|
<html>
|
||||||
<title>Etherpad Lite</title>
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
font-family: Helvetica, Verdana, Sans-Serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
html, body {
|
<title>Etherpad Lite</title>
|
||||||
height:100%;
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wrapper {
|
<style>
|
||||||
margin:0 auto;
|
* {
|
||||||
margin-top: 200px;
|
margin: 0; padding: 0;
|
||||||
width: 300px;
|
}
|
||||||
height: 200px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#button {
|
body {
|
||||||
width: 300px;
|
background: rgba(0, 0, 0, .05);
|
||||||
height: 80px;
|
color: #555;
|
||||||
|
text-shadow: 0 1px 0 #fff;
|
||||||
|
font: 14px helvetica,sans-serif;
|
||||||
|
background: #ccc;
|
||||||
|
background: -moz-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
||||||
|
background: -webkit-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
||||||
|
background: -ms-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
||||||
|
background: -o-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
display: block;
|
#container {
|
||||||
|
border-top: 1px solid #999;
|
||||||
|
margin-top: 160px;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
padding: 15px;
|
||||||
|
background: #eee;
|
||||||
|
background: -webkit-linear-gradient(#fff, #ccc);
|
||||||
|
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);
|
||||||
|
-webkit-animation: pop .3s ease-in 1;
|
||||||
|
-moz-animation: pop .3s ease-in 1;
|
||||||
|
}
|
||||||
|
|
||||||
margin:auto;
|
@-webkit-keyframes pop {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
border: 2px solid #999;
|
@-moz-keyframes pop {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
-moz-border-radius: 4px;
|
#button {
|
||||||
border-radius: 4px;
|
margin: 0 auto;
|
||||||
|
border-radius: 3px;
|
||||||
|
text-align: center;
|
||||||
|
font: 36px verdana,arial,sans-serif;
|
||||||
|
color: white;
|
||||||
|
text-shadow: 0 -1px 0 rgba(0,0,0,.8);
|
||||||
|
height: 70px;
|
||||||
|
line-height: 70px;
|
||||||
|
width: 300px;
|
||||||
|
background: #555;
|
||||||
|
background: -webkit-linear-gradient(#5F5F5F, #565656 50%, #4C4C4C 51%, #373737);
|
||||||
|
background: -moz-linear-gradient(#5F5F5F, #565656 50%, #4C4C4C 51%, #373737);
|
||||||
|
background: -ms-linear-gradient(#5F5F5F, #565656 50%, #4C4C4C 51%, #373737);
|
||||||
|
background: -o-linear-gradient(#5F5F5F, #565656 50%, #4C4C4C 51%, #373737);
|
||||||
|
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.9);
|
||||||
|
}
|
||||||
|
|
||||||
background #fff;
|
#button:hover {
|
||||||
background: -moz-linear-gradient(top, #aaa, white 70%, white 70%);
|
cursor: pointer;
|
||||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#aaa), color-stop(70%, white), color-stop(70%, white));
|
background: #666;
|
||||||
|
background: -webkit-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
||||||
|
background: -moz-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
||||||
|
background: -ms-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
||||||
|
background: -o-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
||||||
|
}
|
||||||
|
|
||||||
text-decoration: none;
|
#button:active {
|
||||||
text-align: center;
|
box-shadow: inset 0 1px 12px rgba(0, 0, 0, 0.9);
|
||||||
}
|
background: #444;
|
||||||
|
background: -webkit-linear-gradient(#565656, #4C4C4C 50%, #424242 51%, #2D2D2D);
|
||||||
|
background: -moz-linear-gradient(#565656, #4C4C4C 50%, #424242 51%, #2D2D2D);
|
||||||
|
background: -ms-linear-gradient(#565656, #4C4C4C 50%, #424242 51%, #2D2D2D);
|
||||||
|
background: -o-linear-gradient(#565656, #4C4C4C 50%, #424242 51%, #2D2D2D);
|
||||||
|
}
|
||||||
|
|
||||||
#button span {
|
input[type="text"] {
|
||||||
display: block;
|
font-weight: bold;
|
||||||
margin-top:15px;
|
font-size: 14px;
|
||||||
font-size: 40px;
|
padding: 5px;
|
||||||
color: #333;
|
width: 245px;
|
||||||
font-weight:bold;
|
}
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#nameWrapper {
|
input[type="submit"] {
|
||||||
text-align: center;
|
height: 30px;
|
||||||
}
|
width: 40px;
|
||||||
</style>
|
}
|
||||||
<script type="text/javascript">
|
|
||||||
function go2Name()
|
|
||||||
{
|
|
||||||
var padname = document.getElementById("padname").value;
|
|
||||||
if(padname.length > 0)
|
|
||||||
{
|
|
||||||
window.location = "p/" + padname;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function go2Random()
|
::selection {
|
||||||
{
|
background-color:rgba(119,119,119,.8);
|
||||||
window.location = "p/" + randomPadName() ;
|
color:#fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::-moz-selection {
|
||||||
|
background-color:rgba(119,119,119,.8);
|
||||||
|
color:#fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#label {
|
||||||
|
color:black;
|
||||||
|
text-align:left;
|
||||||
|
margin: 0 auto;
|
||||||
|
width:300px;
|
||||||
|
padding-left: 3px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<div id="container">
|
||||||
|
<div id="button" onclick="go2Random()">New Pad</div>
|
||||||
|
<br><br>
|
||||||
|
<div id="label">or create/open a Pad with the name</div>
|
||||||
|
<input type="text" id="padname"> <input type="submit" value="OK" onclick="go2Name();return false;">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function go2Name()
|
||||||
|
{
|
||||||
|
var padname = document.getElementById("padname").value;
|
||||||
|
if (padname.length > 0)
|
||||||
|
{
|
||||||
|
window.location = "p/" + padname;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert("Please enter a name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function go2Random()
|
||||||
|
{
|
||||||
|
window.location = "p/" + randomPadName();
|
||||||
|
}
|
||||||
|
|
||||||
|
function randomPadName()
|
||||||
|
{
|
||||||
|
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
|
||||||
|
var string_length = 10;
|
||||||
|
var randomstring = '';
|
||||||
|
for (var i = 0; i < string_length; i++)
|
||||||
|
{
|
||||||
|
var rnum = Math.floor(Math.random() * chars.length);
|
||||||
|
randomstring += chars.substring(rnum, rnum + 1);
|
||||||
|
}
|
||||||
|
return randomstring;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
function randomPadName()
|
|
||||||
{
|
|
||||||
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
|
|
||||||
var string_length = 10;
|
|
||||||
var randomstring = '';
|
|
||||||
for (var i=0; i<string_length; i++) {
|
|
||||||
var rnum = Math.floor(Math.random() * chars.length);
|
|
||||||
randomstring += chars.substring(rnum,rnum+1);
|
|
||||||
}
|
|
||||||
return randomstring;
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="wrapper">
|
|
||||||
<a href="javascript:go2Random()" id="button"><span>New Pad</span></a>
|
|
||||||
<div id="nameWrapper"><form>
|
|
||||||
<span><br>or create a Pad with the name <br></span> <input type="text" id="padname"/> <input type="submit" value="OK" onclick="go2Name();return false;">
|
|
||||||
</form></div></a>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,19 @@
|
||||||
<!DOCTYPE html PUBLIC
|
<!doctype html>
|
||||||
"-//W3C//DTD XHTML 1.0 Transitional//EN"
|
<html lang="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>
|
<head>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="Content-Language" content="en-us"/>
|
<meta name="robots" content="noindex, nofollow">
|
||||||
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW"/>
|
<title>Etherpad Lite</title>
|
||||||
<title>Etherpad Lite</title>
|
<!-- CSS -->
|
||||||
<!-- CSS -->
|
<link href="../static/css/pad.css" rel="stylesheet">
|
||||||
<link href="../static/css/pad.css" rel="stylesheet" type="text/css"/>
|
<!-- javascript -->
|
||||||
<!-- javascript -->
|
<script type="text/javascript">
|
||||||
<script type="text/javascript">
|
|
||||||
// <![CDATA[
|
// <![CDATA[
|
||||||
var clientVars = {}; // ]]>
|
var clientVars = {}; // ]]>
|
||||||
</script>
|
</script>
|
||||||
|
<script src="../socket.io/socket.io.js"></script>
|
||||||
<script type="text/javascript" src="../socket.io/socket.io.js"></script>
|
<script src="../minified/pad.js"></script>
|
||||||
<script type="text/javascript" src="../minified/pad.js"></script>
|
<style type="text/css" title="dynamicsyntax"></style>
|
||||||
<style type="text/css" title="dynamicsyntax"></style>
|
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
@ -230,7 +225,7 @@ We removed this feature cause its not worth the space it needs in the editbar
|
||||||
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
|
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
|
||||||
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
|
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
|
||||||
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
|
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
|
||||||
<a id="exportwordlea" target="_blank" onClick="padimpexp.export2Wordle();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
|
<a id="exportwordlea" target="_blank" onClick="loadCont();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
|
||||||
<form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;">
|
<form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;">
|
||||||
<div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div>
|
<div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,15 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
<!doctype html>
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<html lang="en">
|
||||||
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="Content-Language" content="en-us" />
|
<meta name="robots" content="noindex, nofollow">
|
||||||
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
|
|
||||||
|
|
||||||
<title>Etherpad Lite Timeslider</title>
|
<title>Etherpad Lite Timeslider</title>
|
||||||
<link href="../../static/css/pad.css" rel="stylesheet" type="text/css" />
|
<link rel="stylesheet" href="../../static/css/pad.css">
|
||||||
<link href="../../static/css/timeslider.css" rel="stylesheet" type="text/css" />
|
<link rel="stylesheet" href="../../static/css/timeslider.css">
|
||||||
<style type="text/css" title="dynamicsyntax"></style>
|
<style type="text/css" title="dynamicsyntax"></style>
|
||||||
<script type="text/javascript" src="../../static/js/jquery.min.js"></script>
|
<script src="../../static/js/jquery.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
// <![CDATA[
|
// <![CDATA[
|
||||||
var clientVars = {};
|
var clientVars = {};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue