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

Merge 601b74705e into 324e4a0528

Browse source
This commit is contained in:
GitHub Merge Button 2011-12-04 07:34:06 -08:00
commit ec9b86509e
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/installDeps.sh
View file

@ -28,8 +28,8 @@ hash npm > /dev/null 2>&1 || {
#check npm version
NPM_VERSION=$(npm --version)
if [ ! $(echo $NPM_VERSION | cut -d "." -f 1-2) = "1.0" ]; then
echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.0.x" >&2
if [ ! $(echo $NPM_VERSION | cut -d "." -f 1) = "1" ]; then
echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x" >&2
exit 1
fi

12
static/js/pad2.js
View file

@ -21,6 +21,7 @@ var LineNumbersDisabled = false;
var noColors = false;
var useMonospaceFontGlobal = false;
var globalUserName = false;
var hideQRCode = false;
$(document).ready(function()
{
@ -86,12 +87,14 @@ function getParams()
var showLineNumbers = params["showLineNumbers"];
var useMonospaceFont = params["useMonospaceFont"];
var IsnoColors = params["noColors"];
var hideQRCode = params["hideQRCode"];
if(IsnoColors)
{
if(IsnoColors == "true")
{
noColors = true;
$('#clearAuthorship').hide();
}
}
if(showControls)
@ -102,7 +105,6 @@ function getParams()
$('#editorcontainer').css({"top":"0px"});
}
}
if(showChat)
{
if(showChat == "false")
@ -110,7 +112,6 @@ function getParams()
$('#chaticon').hide();
}
}
if(showLineNumbers)
{
if(showLineNumbers == "false")
@ -118,7 +119,6 @@ function getParams()
LineNumbersDisabled = true;
}
}
if(useMonospaceFont)
{
if(useMonospaceFont == "true")
@ -126,13 +126,15 @@ function getParams()
useMonospaceFontGlobal = true;
}
}
if(userName)
{
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
globalUserName = unescape(userName);
}
if(hideQRCode)
{
$('#qrcode').hide();
}
}
function getUrlVars()

2
static/js/pad_userlist.js
View file

@ -711,7 +711,7 @@ var paduserlist = (function()
}
$("#myswatch").css({'background-color': myUserInfo.colorId});
$("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId});
$("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
}
};
return self;

4
static/pad.html
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
<title>Etherpad Lite</title>
<title>Etherpad Lite -- Test</title>
<!-- CSS -->
<link href="../static/css/pad.css" rel="stylesheet">
<!-- javascript -->
@ -71,7 +71,7 @@
</a>
</li>
<li class="separator"></li>
<li onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" >
<li id="clearAuthorship" onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" >
<a title="Clear Authorship Colors">
<div class="buttonicon" style="background-position:0px -86px"></div>
</a>