mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite
This commit is contained in:
commit
8214e132b7
2 changed files with 78 additions and 76 deletions
4
bin/buildForWindows.sh
Executable file → Normal file
4
bin/buildForWindows.sh
Executable file → Normal file
|
@ -30,7 +30,7 @@ hash unzip > /dev/null 2>&1 || {
|
||||||
|
|
||||||
START_FOLDER=$(pwd);
|
START_FOLDER=$(pwd);
|
||||||
|
|
||||||
echo "create a clean enviroment in /tmp/etherpad-lite-win..."
|
echo "create a clean environment in /tmp/etherpad-lite-win..."
|
||||||
rm -rf /tmp/etherpad-lite-win
|
rm -rf /tmp/etherpad-lite-win
|
||||||
cp -ar . /tmp/etherpad-lite-win
|
cp -ar . /tmp/etherpad-lite-win
|
||||||
cd /tmp/etherpad-lite-win
|
cd /tmp/etherpad-lite-win
|
||||||
|
@ -70,4 +70,4 @@ mv etherpad-lite-win.zip $START_FOLDER
|
||||||
echo "clean up..."
|
echo "clean up..."
|
||||||
rm -rf /tmp/etherpad-lite-win
|
rm -rf /tmp/etherpad-lite-win
|
||||||
|
|
||||||
echo "finished. You can find the zip in the etherpad lite root folder, its called etherpad-lite-win.zip"
|
echo "Finished. You can find the zip in the Etherpad Lite root folder, it's called etherpad-lite-win.zip"
|
||||||
|
|
|
@ -1,103 +1,105 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<title>Etherpad Lite</title>
|
<title>Etherpad Lite</title>
|
||||||
<style>
|
<style>
|
||||||
* { margin: 0; padding: 0; }
|
*{ margin:0;padding:0; }
|
||||||
body {
|
body {
|
||||||
background: rgba(0, 0, 0, .05);
|
background: rgba(0,0,0,.05);
|
||||||
color: #333;
|
color: #333;
|
||||||
text-shadow: 0 1px 0 #fff;
|
font: 14px helvetica,sans-serif;
|
||||||
font: 14px helvetica,sans-serif;
|
background: #ccc;
|
||||||
background: #ccc;
|
background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||||
background: -moz-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||||
background: -webkit-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||||
background: -ms-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||||
background: -o-radial-gradient(circle, #aaa, #eee) no-repeat center center fixed;
|
overflow-x: hidden;
|
||||||
overflow-x: hidden;
|
border-top: 8px solid rgba(51,51,51,.8)
|
||||||
}
|
}
|
||||||
#container {
|
#container {
|
||||||
border-top: 1px solid #999;
|
text-shadow: 0 1px 1px #fff;
|
||||||
margin-top: 160px;
|
border-top: 1px solid #999;
|
||||||
width: 100%;
|
margin-top: 160px;
|
||||||
text-align: center;
|
width: 100%;
|
||||||
padding: 15px;
|
text-align: center;
|
||||||
background: #eee;
|
padding: 15px;
|
||||||
background: -webkit-linear-gradient(#fff, #ccc);
|
background: #eee;
|
||||||
background: -moz-linear-gradient(#fff, #ccc);
|
background: -webkit-linear-gradient(#fff,#ccc);
|
||||||
background: -ms-linear-gradient(#fff, #ccc);
|
background: -moz-linear-gradient(#fff,#ccc);
|
||||||
background: -o-linear-gradient(#fff, #ccc);
|
background: -ms-linear-gradient(#fff,#ccc);
|
||||||
opacity: .9;
|
background: -o-linear-gradient(#fff,#ccc);
|
||||||
box-shadow: 0px 1px 8px rgba(0, 0, 0, 0.3);
|
opacity: .9;
|
||||||
|
box-shadow: 0px 1px 8px rgba(0,0,0,0.3)
|
||||||
}
|
}
|
||||||
#button {
|
#button {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font: 36px verdana,arial,sans-serif;
|
font: 36px verdana,arial,sans-serif;
|
||||||
color: white;
|
color: white;
|
||||||
text-shadow: 0 -1px 0 rgba(0,0,0,.8);
|
text-shadow: 0 -1px 0 rgba(0,0,0,.8);
|
||||||
height: 70px;
|
height: 70px;
|
||||||
line-height: 70px;
|
line-height: 70px;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
background: #555;
|
background: #555;
|
||||||
background: -webkit-linear-gradient(#5F5F5F, #565656 50%, #4C4C4C 51%, #373737);
|
background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
|
||||||
background: -moz-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: -ms-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
|
||||||
background: -o-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);
|
box-shadow: inset 0 1px 3px rgba(0,0,0,0.9)
|
||||||
}
|
}
|
||||||
#button:hover {
|
#button:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: #666;
|
background: #666;
|
||||||
background: -webkit-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
|
||||||
background: -moz-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: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
|
||||||
background: -o-linear-gradient(#707070, #666666 50%, #5B5B5B 51%, #474747);
|
background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747)
|
||||||
}
|
}
|
||||||
#button:active {
|
#button:active {
|
||||||
box-shadow: inset 0 1px 12px rgba(0, 0, 0, 0.9);
|
box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
|
||||||
background: #444;
|
background: #444
|
||||||
}
|
}
|
||||||
#label {
|
#label {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
width: 300px;
|
width: 300px
|
||||||
|
}
|
||||||
|
input {
|
||||||
|
vertical-align: middle;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 15px
|
||||||
}
|
}
|
||||||
input[type="text"] {
|
input[type="text"] {
|
||||||
font-weight: bold;
|
width: 243px;
|
||||||
font-size: 17px;
|
padding: 10px 47px 10px 10px;
|
||||||
padding: 5px;
|
background: #fff;
|
||||||
width: 245px;
|
border: 1px solid #bbb;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
border-radius: 3px;
|
||||||
input[type="submit"] {
|
text-shadow: 0 0 1px #fff
|
||||||
height: 35px;
|
|
||||||
width: 40px;
|
|
||||||
}
|
}
|
||||||
|
input[type="submit"] {
|
||||||
|
width: 45px;
|
||||||
|
margin-left: -50px;
|
||||||
|
padding: 8px
|
||||||
|
}
|
||||||
|
input[type="submit"]::-moz-focus-inner { border: 0 }
|
||||||
|
@-moz-document url-prefix() { input[type="submit"] { padding: 7px } }
|
||||||
</style>
|
</style>
|
||||||
<link href="static/custom/index.css" rel="stylesheet">
|
<link href="static/custom/index.css" rel="stylesheet">
|
||||||
<script src="static/custom/index.js"></script>
|
<script src="static/custom/index.js"></script>
|
||||||
<div id="container">
|
<div id="container">
|
||||||
<div id="button" onclick="go2Random()">New Pad</div>
|
<div id="button" onclick="go2Random()">New Pad</div><br><div id="label">or create/open a Pad with the name</div>
|
||||||
<br>
|
|
||||||
<div id="label">or create/open a Pad with the name</div>
|
|
||||||
<form action="#" onsubmit="go2Name();return false;">
|
<form action="#" onsubmit="go2Name();return false;">
|
||||||
<input type="text" id="padname" autofocus>
|
<input type="text" id="padname" autofocus>
|
||||||
<input type="submit" value="OK">
|
<input type="submit" value="OK">
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function go2Name()
|
function go2Name()
|
||||||
{
|
{
|
||||||
var padname = document.getElementById("padname").value;
|
var padname = document.getElementById("padname").value;
|
||||||
if (padname.length > 0)
|
padname.length > 0 ? window.location = "p/" + padname : alert("Please enter a name")
|
||||||
{
|
|
||||||
window.location = "p/" + padname;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
alert("Please enter a name");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function go2Random()
|
function go2Random()
|
||||||
|
@ -120,5 +122,5 @@
|
||||||
|
|
||||||
//start the costum js
|
//start the costum js
|
||||||
if(typeof costumStart == "function") costumStart();
|
if(typeof costumStart == "function") costumStart();
|
||||||
</script>
|
</script>
|
||||||
</html>
|
</html>
|
Loading…
Reference in a new issue