From b5f92edec1a292f48f25dd698ed6e213c3b3f4f0 Mon Sep 17 00:00:00 2001 From: adammawson Date: Mon, 30 Apr 2012 18:24:38 +0100 Subject: [PATCH 1/2] just fixing somet paths in the checkpad script.. --- bin/checkPad.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/checkPad.js b/bin/checkPad.js index a72f0060..e77224e2 100644 --- a/bin/checkPad.js +++ b/bin/checkPad.js @@ -11,10 +11,10 @@ if(process.argv.length != 3) var padId = process.argv[2]; //initalize the database -var log4js = require("log4js"); +var log4js = require("../src/node_modules/log4js"); log4js.setGlobalLogLevel("INFO"); -var async = require("async"); -var db = require('../node/db/DB'); +var async = require("../src/node_modules/async"); +var db = require('../src/node/db/DB'); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var padManager; @@ -28,7 +28,7 @@ async.series([ //get the pad function (callback) { - padManager = require('../node/db/PadManager'); + padManager = require('../src/node/db/PadManager'); padManager.doesPadExists(padId, function(err, exists) { From def904dbed333ca78c4694082dc1f3003d63dad6 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 13 May 2012 20:20:18 +0100 Subject: [PATCH 2/2] remove wordle --- src/static/css/pad.css | 5 +---- src/static/js/pad_impexp.js | 12 ------------ src/templates/pad.html | 1 - src/templates/timeslider.html | 4 ---- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 40089bbf..41d9d80d 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -1165,9 +1165,6 @@ ul#colorpickerswatches li:hover { #exportopen { background-position: 0px -347px } -#exportwordle { - background-position: 0px -323px -} #exportdokuwiki { background-position: 0px -459px } @@ -1511,4 +1508,4 @@ input[type=checkbox] { #online_count { line-height: 24px } -} \ No newline at end of file +} diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js index 23655ba4..08dd4293 100644 --- a/src/static/js/pad_impexp.js +++ b/src/static/js/pad_impexp.js @@ -217,7 +217,6 @@ var padimpexp = (function() // build the export links $("#exporthtmla").attr("href", pad_root_path + "/export/html"); $("#exportplaina").attr("href", pad_root_path + "/export/txt"); - $("#exportwordlea").attr("href", pad_root_path + "/export/wordle"); $("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki"); //hide stuff thats not avaible if abiword is disabled @@ -280,17 +279,6 @@ var padimpexp = (function() $("#impexp-disabled-clickcatcher").hide(); $("#import").css('opacity', 1); $("#impexp-export").css('opacity', 1); - }, - export2Wordle: function() - { - var padUrl = $('#exportwordlea').attr('href').replace(/\/wordle$/, '/txt') - - $.get(padUrl, function(data) - { - $('.result').html(data); - $('#text').html(data); - $('#wordlepost').submit(); - }); } }; return self; diff --git a/src/templates/pad.html b/src/templates/pad.html index 9a5113e1..ec5495d7 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -180,7 +180,6 @@
PDF
OpenDocument
DokuWiki text
-
Wordle
<% e.end_block(); %> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index 8331062f..58d16f3e 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -116,10 +116,6 @@
PDF
OpenDocument
DokuWiki text
-
Wordle
-
-
-