From 72a328cf118198bb101a40cb67dca5bb7f6455f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C5=A0uppa?= Date: Tue, 23 Sep 2014 16:04:22 +0200 Subject: [PATCH 01/17] readme: Add formatting sugar for readibility * Added a bit more formatting for UNIX-like systems dependencies installation. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 34a824ff2..71c0b3e1e 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind ## GNU/Linux and other UNIX-like systems You'll need gzip, git, curl, libssl develop libraries, python and gcc. -*For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential` -*For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"` -*For FreeBSD*: `portinstall node, npm, git (optional)` +- *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential` +- *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"` +- *For FreeBSD*: `portinstall node, npm, git (optional)` Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, be careful of installing nodejs from apt. From 94968e69be03a78f6202b83fc958be292244f677 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 27 Sep 2014 12:30:11 +0200 Subject: [PATCH 02/17] Add support for npm 2 --- bin/installDeps.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 84f2e227f..a8bc88a87 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -36,8 +36,9 @@ hash npm > /dev/null 2>&1 || { #check npm version NPM_VERSION=$(npm --version) -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 +NPM_MAIN_VERSION=$(echo $NPM_VERSION | cut -d "." -f 1) +if [ $(echo $NPM_MAIN_VERSION) = "0" ]; then + echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x or higher" >&2 exit 1 fi From bfde869948ecd7a40f99467831caaa22877d3dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20T=C3=A9tard?= Date: Sun, 28 Sep 2014 14:53:07 +0200 Subject: [PATCH 03/17] =?UTF-8?q?If=20exportFileName=20hook=20isn=E2=80=99?= =?UTF-8?q?t=20defined=20don=E2=80=99t=20return=20empty=20filename.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit should fix #2251. If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename. --- src/node/handler/ExportHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js index a748d3f2e..5bedcce22 100644 --- a/src/node/handler/ExportHandler.js +++ b/src/node/handler/ExportHandler.js @@ -52,7 +52,7 @@ exports.doExport = function(req, res, padId, type) hooks.aCallFirst("exportFileName", padId, function(err, hookFileName){ // if fileName is set then set it to the padId, note that fileName is returned as an array. - if(hookFileName) fileName = hookFileName; + if(hookFileName.length) fileName = hookFileName; //tell the browser that this is a downloadable file From 12c1d3b05a7ed4b044a54fb842ae171885cdc920 Mon Sep 17 00:00:00 2001 From: 0ip Date: Fri, 3 Oct 2014 17:35:48 +0200 Subject: [PATCH 04/17] Fix active button ui --- src/static/css/pad.css | 19 ++++--------------- src/static/css/timeslider.css | 11 +++++++---- src/static/js/pad_editbar.js | 8 ++++---- src/templates/pad.html | 2 +- src/templates/timeslider.html | 2 +- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 4053ebbad..979eb1ef0 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -160,11 +160,11 @@ a img { border: 1px solid #ccc; outline: none; } -#usericon a { +li[data-key=showusers] > a { min-width: 30px; text-align: left; } -#usericon a #online_count { +li[data-key=showusers] > a #online_count { color: #777; font-size: 10px; position: relative; @@ -814,7 +814,7 @@ input[type=checkbox] { float: left; } #settings, -#importexport, +#import_export, #embed, #connectivity, #users { @@ -1070,15 +1070,4 @@ input[type=checkbox] { text-shadow: none; } -/* End of gritter stuff */ -.activeButton{ - background: #eee; - background: -webkit-linear-gradient(#ddd, #fff); - background: -moz-linear-gradient(#ddd, #fff); - background: -o-linear-gradient(#ddd, #fff); - background: -ms-linear-gradient(#ddd, #fff); - background: linear-gradient(#ddd, #fff); - -webkit-box-shadow: 0 0 8px rgba(0,0,0,.1) inset; - -moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset; - box-shadow: 0 0 8px rgba(0,0,0,.1) inset; -} +/* End of gritter stuff */ \ No newline at end of file diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css index f97d4f2b1..19c4ca9fc 100644 --- a/src/static/css/timeslider.css +++ b/src/static/css/timeslider.css @@ -158,16 +158,19 @@ float: right } #settings, -#importexport, +#import_export, #embed, #connectivity, #users { top: 62px; } -#importexport .popup { - width: 185px +#import_export .popup { + width: 183px; + border-top: none; + border-right: none; + border-radius: 0 0 0 6px; } -#importexport { +#import_export { top: 118px; width: 185px; } diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 859632171..6352b1296 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -206,7 +206,7 @@ var padeditbar = (function() if(module.css('display') != "none") { - $("#" + self.dropdowns[i] + "link").removeClass("selected"); + $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected"); module.slideUp("fast", cb); returned = true; } @@ -223,12 +223,12 @@ var padeditbar = (function() if(module.css('display') != "none") { - $("#" + self.dropdowns[i] + "link").removeClass("selected"); + $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected"); module.slideUp("fast"); } else if(self.dropdowns[i]==moduleName) { - $("#" + self.dropdowns[i] + "link").addClass("selected"); + $("li[data-key=" + self.dropdowns[i] + "] > a").addClass("selected"); module.slideDown("fast", cb); } } @@ -271,7 +271,7 @@ var padeditbar = (function() toolbar.registerDropdownCommand("showusers", "users"); toolbar.registerDropdownCommand("settings"); toolbar.registerDropdownCommand("connectivity"); - toolbar.registerDropdownCommand("import_export", "importexport"); + toolbar.registerDropdownCommand("import_export"); toolbar.registerDropdownCommand("embed"); toolbar.registerCommand("embed", function () { diff --git a/src/templates/pad.html b/src/templates/pad.html index 50fac86b4..a4366bd5a 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -174,7 +174,7 @@ -