From c8b6b026936b3702f97aa98b82345fb48e92c935 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 14:10:06 +0000 Subject: [PATCH 1/6] Testing something --- static/pad.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/pad.html b/static/pad.html index 980905e99..e5352de51 100644 --- a/static/pad.html +++ b/static/pad.html @@ -3,7 +3,7 @@ - Etherpad Lite + Etherpad Lite -- Test From 5b95e445c3a8b8439422c5b767139434bb8969b5 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 15:00:06 +0000 Subject: [PATCH 2/6] Fixes issue where etherpad ltie wont install deps because npm is 1.1 alpha-- Bit of a harsh fix but it works fine --- bin/installDeps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 088260853..a49c46b13 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -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 From e6eac69f55a861b50e9cf02855c2d4a397b627f5 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 15:16:50 +0000 Subject: [PATCH 3/6] Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233 --- static/js/pad_userlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 8680fc2e6..9bb5f95db 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -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; From 457d4f180ae0b08458e48027487666a441dd1526 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 15:26:14 +0000 Subject: [PATCH 4/6] slight clean up --- static/js/pad2.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/static/js/pad2.js b/static/js/pad2.js index 6f398bade..eb8e3a8cb 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -102,7 +102,6 @@ function getParams() $('#editorcontainer').css({"top":"0px"}); } } - if(showChat) { if(showChat == "false") @@ -110,7 +109,6 @@ function getParams() $('#chaticon').hide(); } } - if(showLineNumbers) { if(showLineNumbers == "false") @@ -118,7 +116,6 @@ function getParams() LineNumbersDisabled = true; } } - if(useMonospaceFont) { if(useMonospaceFont == "true") @@ -126,8 +123,6 @@ 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. From 8256c71cd2da19d90985024c7bfa3fda2cfc1a3b Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 15:29:34 +0000 Subject: [PATCH 5/6] When noColors is set hide the clearAuthorship colors button --- static/js/pad2.js | 1 + static/pad.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/static/js/pad2.js b/static/js/pad2.js index eb8e3a8cb..5d436dddd 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -92,6 +92,7 @@ function getParams() if(IsnoColors == "true") { noColors = true; + $('#clearAuthorship').hide(); } } if(showControls) diff --git a/static/pad.html b/static/pad.html index 2813081fa..7ab260764 100644 --- a/static/pad.html +++ b/static/pad.html @@ -71,7 +71,7 @@
  • -
  • +
  •  From 601b74705e14ae6542a890e3a666994690ce78f1 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 4 Dec 2011 15:33:56 +0000 Subject: [PATCH 6/6] Add support for hiding QR code via a parameter --- static/js/pad2.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/js/pad2.js b/static/js/pad2.js index 5d436dddd..debd25512 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -21,6 +21,7 @@ var LineNumbersDisabled = false; var noColors = false; var useMonospaceFontGlobal = false; var globalUserName = false; +var hideQRCode = false; $(document).ready(function() { @@ -86,6 +87,7 @@ function getParams() var showLineNumbers = params["showLineNumbers"]; var useMonospaceFont = params["useMonospaceFont"]; var IsnoColors = params["noColors"]; + var hideQRCode = params["hideQRCode"]; if(IsnoColors) { @@ -129,6 +131,10 @@ function getParams() // 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()