mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-04 14:19:13 -04:00
Merge e88805ee62 into 1151ec3278
This commit is contained in:
GitHub Merge Button
commit
e05ec2fbf7
7 changed files with 1497 additions and 1000 deletions
1986
static/css/pad.css
1986
static/css/pad.css
File diff suppressed because it is too large
Load diff
|
|
@ -192,6 +192,7 @@ float:right;
|
|||
line-height: 29px;
|
||||
margin-top: 0;
|
||||
padding-right: 6pt;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
BIN
static/img/etherpad_lite_icons.png
Normal file
BIN
static/img/etherpad_lite_icons.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
|
|
@ -2,32 +2,36 @@
|
|||
<html>
|
||||
<title>Etherpad Lite</title>
|
||||
<style>
|
||||
* { margin: 0; padding: 0; }
|
||||
*{
|
||||
margin:0;
|
||||
padding:0;
|
||||
}
|
||||
body {
|
||||
background: rgba(0, 0, 0, .05);
|
||||
background: rgba(0,0,0,.05);
|
||||
color: #333;
|
||||
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;
|
||||
background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||
background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||
background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||
background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
|
||||
overflow-x: hidden;
|
||||
border-top: 8px solid rgba(51,51,51,.8)
|
||||
}
|
||||
#container {
|
||||
text-shadow: 0 1px 1px #fff;
|
||||
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);
|
||||
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);
|
||||
box-shadow: 0px 1px 8px rgba(0,0,0,0.3)
|
||||
}
|
||||
#button {
|
||||
margin: 0 auto;
|
||||
|
|
@ -40,85 +44,77 @@
|
|||
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: -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)
|
||||
}
|
||||
#button:hover {
|
||||
cursor: pointer;
|
||||
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);
|
||||
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)
|
||||
}
|
||||
#button:active {
|
||||
box-shadow: inset 0 1px 12px rgba(0, 0, 0, 0.9);
|
||||
background: #444;
|
||||
box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
|
||||
background: #444
|
||||
}
|
||||
#label {
|
||||
text-align: left;
|
||||
margin: 0 auto;
|
||||
width: 300px;
|
||||
width: 300px
|
||||
}
|
||||
input {
|
||||
vertical-align: middle;
|
||||
font-weight: bold;
|
||||
font-size: 15px
|
||||
}
|
||||
input[type="text"] {
|
||||
font-weight: bold;
|
||||
font-size: 17px;
|
||||
padding: 5px;
|
||||
width: 245px;
|
||||
width: 243px;
|
||||
padding: 10px 47px 10px 10px;
|
||||
background: #fff;
|
||||
border: 1px solid #bbb;
|
||||
outline: none;
|
||||
border-radius: 3px;
|
||||
text-shadow: 0 0 1px #fff
|
||||
}
|
||||
input[type="submit"] {
|
||||
height: 35px;
|
||||
width: 40px;
|
||||
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>
|
||||
<link href="static/custom/index.css" rel="stylesheet">
|
||||
<script src="static/custom/index.js"></script>
|
||||
<div id="container">
|
||||
<div id="button" onclick="go2Random()">New Pad</div>
|
||||
<br>
|
||||
<div id="label">or create/open a Pad with the name</div>
|
||||
<div id="button" onclick="go2Random()">New Pad</div><br><div id="label">or create/open a Pad with the name</div>
|
||||
<form action="#" onsubmit="go2Name();return false;">
|
||||
<input type="text" id="padname" autofocus>
|
||||
<input type="submit" value="OK">
|
||||
</form>
|
||||
</div>
|
||||
<script>
|
||||
function go2Name()
|
||||
{
|
||||
var padname = document.getElementById("padname").value;
|
||||
if (padname.length > 0)
|
||||
{
|
||||
window.location = "p/" + padname;
|
||||
function go2Name() {
|
||||
var a = document.getElementById("padname").value;
|
||||
a.length > 0 ? window.location = "p/" + a : alert("Please enter a name")
|
||||
}
|
||||
else
|
||||
{
|
||||
alert("Please enter a name");
|
||||
function go2Random() {
|
||||
window.location = "p/" + randomPadName()
|
||||
}
|
||||
function randomPadName() {
|
||||
for (var a = "", b = 0; b < 10; b++) {
|
||||
var c = Math.floor(Math.random() * 62);
|
||||
a += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".substring(c, c + 1)
|
||||
}
|
||||
|
||||
function go2Random()
|
||||
{
|
||||
window.location = "p/" + randomPadName();
|
||||
return a
|
||||
}
|
||||
|
||||
function randomPadName()
|
||||
{
|
||||
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||
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;
|
||||
}
|
||||
|
||||
//start the costum js
|
||||
if(typeof costumStart == "function") costumStart();
|
||||
typeof costumStart == "function" && costumStart();
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -114,6 +114,7 @@ var padeditbar = (function()
|
|||
{
|
||||
var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/"));
|
||||
var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
|
||||
$('#readonlyImage').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=H|0&chl=" + readonlyLink);
|
||||
$('#readonlyInput').val(readonlyLink);
|
||||
self.toogleDropDown("readonly");
|
||||
$('#readonlyInput').focus().select();
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@ Embed code:<input id="embedinput" type="text" value="">
|
|||
<div id="readonly">
|
||||
<div id="readonlyUrl">
|
||||
Use this link to share a read-only version of your pad:<input id="readonlyInput" type="text" value="">
|
||||
<img id="readonlyImage" src="" alt="" style="margin: 10px 90px">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue