diff --git a/extensions/freebase/build.xml b/extensions/freebase/build.xml
index a5f1d937f..f2afc2bbd 100644
--- a/extensions/freebase/build.xml
+++ b/extensions/freebase/build.xml
@@ -43,7 +43,7 @@
-
+
diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
index 8b9596d83..b5639f797 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
@@ -168,7 +168,7 @@ ExtendDataPreviewDialog.prototype._update = function() {
};
$.post(
- "/command/freebase/preview-extend-data?" + $.param(params),
+ "command/freebase/preview-extend-data?" + $.param(params),
{
rowIndices: JSON.stringify(this._rowIndices),
extension: JSON.stringify(this._extension)
diff --git a/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.js b/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.js
index e8eaa918d..b81e68f11 100644
--- a/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.js
@@ -47,7 +47,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
var loadButton = this._elmts.loadButton;
var check_authorization = function(cont) {
- var check_authorization_url = "/command/freebase/check-authorization/" + provider;
+ var check_authorization_url = "command/freebase/check-authorization/" + provider;
$.get(check_authorization_url, function(data) {
if ("status" in data && data.code == "/api/status/ok") {
authorization.html('Signed in as: ' + data.username + ' | Sign Out').show();
@@ -96,7 +96,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
"guid": null
}];
- $.post("/command/freebase/mqlwrite/" + provider,
+ $.post("command/freebase/mqlwrite/" + provider,
{ "query" : JSON.stringify(mql_query) },
function(data) {
if ("status" in data && data.code == "/api/status/ok") {
@@ -112,7 +112,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
var show_triples = function(cont) {
$.post(
- "/command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
+ "command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
{
protograph: JSON.stringify(theProject.overlayModels.freebaseProtograph || {}),
engine: JSON.stringify(ui.browsingEngine.getJSON())
@@ -144,7 +144,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
});
$.getJSON(
- "/command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobName" }),
+ "command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobName" }),
null,
function(data) {
self._elmts.source_name[0].value = (data.value) ? data.value : theProject.metadata.name;
@@ -182,7 +182,7 @@ FreebaseLoadingDialog.prototype._load = function() {
var dismissBusy = DialogSystem.showBusy();
$.post(
- "/command/freebase/upload-data",
+ "command/freebase/upload-data",
{
"project" : theProject.id,
"qa" : qa,
diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js
index 210bf44be..0394591c6 100644
--- a/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js
@@ -285,7 +285,7 @@ SchemaAlignmentDialog.prototype.preview = function(initial) {
var protograph = this.getJSON();
$.post(
- "/command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
+ "command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
{ protograph: JSON.stringify(protograph), engine: JSON.stringify(ui.browsingEngine.getJSON()) },
function(data) {
if ("mqllike" in data) {
diff --git a/extensions/freebase/module/scripts/extension.js b/extensions/freebase/module/scripts/extension.js
index bee6f4881..d5c9d6dd8 100644
--- a/extensions/freebase/module/scripts/extension.js
+++ b/extensions/freebase/module/scripts/extension.js
@@ -37,7 +37,7 @@ FreebaseExtension.handlers.setFreebaseApiKey = function() {
var value = window.prompt("Set Freebase API Key:");
if (value !== null) {
$.post(
- "/command/core/set-preference",
+ "command/core/set-preference",
{
name : "freebase.api.key",
value : JSON.stringify(value)
@@ -75,7 +75,7 @@ FreebaseExtension.handlers.browseToDataLoad = function() {
var w = window.open("about:blank", "dataload");
$.getJSON(
- "/command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobID" }),
+ "command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobID" }),
null,
function(data) {
if (data.value == null) {
diff --git a/extensions/gdata/module/scripts/index/gdata-source-ui.js b/extensions/gdata/module/scripts/index/gdata-source-ui.js
index 5306914ca..570bce2fb 100644
--- a/extensions/gdata/module/scripts/index/gdata-source-ui.js
+++ b/extensions/gdata/module/scripts/index/gdata-source-ui.js
@@ -54,7 +54,7 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
);
});
this._body.find('.gdata-signout.button').click(function() {
- $.get("/command/gdata/deauthorize" );
+ $.get("command/gdata/deauthorize" );
self._body.find('.gdata-page').hide();
self._elmts.signinPage.show();
});
@@ -92,7 +92,7 @@ Refine.GDataSourceUI.prototype._listDocuments = function() {
var self = this;
$.post(
- "/command/core/importing-controller?" + $.param({
+ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller",
"subCommand": "list-documents"
}),
diff --git a/extensions/gdata/module/scripts/index/importing-controller.js b/extensions/gdata/module/scripts/index/importing-controller.js
index ce87e5b97..ce77eb55b 100644
--- a/extensions/gdata/module/scripts/index/importing-controller.js
+++ b/extensions/gdata/module/scripts/index/importing-controller.js
@@ -49,11 +49,11 @@ Refine.GDataImportingController.prototype.startImportingDocument = function(doc)
var self = this;
$.post(
- "/command/core/create-importing-job",
+ "command/core/create-importing-job",
null,
function(data) {
$.post(
- "/command/core/importing-controller?" + $.param({
+ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller",
"subCommand": "initialize-parser-ui",
"docUrl": doc.docSelfLink,
@@ -272,7 +272,7 @@ Refine.GDataImportingController.prototype._updatePreview = function() {
this._parsingPanelElmts.progressPanel.show();
$.post(
- "/command/core/importing-controller?" + $.param({
+ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller",
"jobID": this._jobID,
"subCommand": "parse-preview"
@@ -303,7 +303,7 @@ Refine.GDataImportingController.prototype._getPreviewData = function(callback, n
var result = {};
$.post(
- "/command/core/get-models?" + $.param({ "importingJobID" : this._jobID }),
+ "command/core/get-models?" + $.param({ "importingJobID" : this._jobID }),
null,
function(data) {
for (var n in data) {
@@ -313,7 +313,7 @@ Refine.GDataImportingController.prototype._getPreviewData = function(callback, n
}
$.post(
- "/command/core/get-rows?" + $.param({
+ "command/core/get-rows?" + $.param({
"importingJobID" : self._jobID,
"start" : 0,
"limit" : numRows || 100 // More than we parse for preview anyway
@@ -342,7 +342,7 @@ Refine.GDataImportingController.prototype._createProject = function() {
var options = this.getOptions();
options.projectName = projectName;
$.post(
- "/command/core/importing-controller?" + $.param({
+ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller",
"jobID": this._jobID,
"subCommand": "create-project"
diff --git a/extensions/gdata/module/scripts/project/exporters.js b/extensions/gdata/module/scripts/project/exporters.js
index 00399b0be..e65c31ddc 100644
--- a/extensions/gdata/module/scripts/project/exporters.js
+++ b/extensions/gdata/module/scripts/project/exporters.js
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if (name) {
var dismiss = DialogSystem.showBusy('Uploading...');
$.post(
- "/command/gdata/upload",
+ "command/gdata/upload",
{
"project" : theProject.id,
"engine" : exportAllRows ? '' : JSON.stringify(ui.browsingEngine.getJSON()),
diff --git a/extensions/sample/build.xml b/extensions/sample/build.xml
index 54e9ddc52..964b1150f 100644
--- a/extensions/sample/build.xml
+++ b/extensions/sample/build.xml
@@ -43,7 +43,7 @@
-
+
diff --git a/main/webapp/WEB-INF/butterfly.properties b/main/webapp/WEB-INF/butterfly.properties
index ca73e3601..81393533c 100644
--- a/main/webapp/WEB-INF/butterfly.properties
+++ b/main/webapp/WEB-INF/butterfly.properties
@@ -24,7 +24,7 @@ butterfly.default.mountpoint = /extension
# ---------- Module ------
butterfly.modules.path = modules
-butterfly.modules.path = ../../extensions/
+butterfly.modules.path = ../../extensions
# Add more paths here if your extensions live elsewhere.
# Relative paths are relative to refine/main/webapp/
diff --git a/main/webapp/WEB-INF/web.xml b/main/webapp/WEB-INF/web.xml
index d5f8a2687..4de8ff326 100644
--- a/main/webapp/WEB-INF/web.xml
+++ b/main/webapp/WEB-INF/web.xml
@@ -5,6 +5,8 @@
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+ Google Refine
+ Google Refine Webapp
diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js
index 2dc6fb61c..45177f03b 100644
--- a/main/webapp/modules/core/MOD-INF/controller.js
+++ b/main/webapp/modules/core/MOD-INF/controller.js
@@ -521,7 +521,7 @@ function process(path, request, response) {
);
} else {
if (path == "/" || path == "") {
- path = "/index";
+ path = "index";
} else if (path.endsWith("/")) {
path = path.substring(0, path.length - 1);
}
@@ -585,7 +585,7 @@ function process(path, request, response) {
var styleInjection = [];
for each (var qualifiedPath in styles) {
styleInjection.push(
- '');
+ '');
}
context.styleInjection = styleInjection.join("\n");
@@ -596,7 +596,7 @@ function process(path, request, response) {
var scriptInjection = [];
for each (var qualifiedPath in scripts) {
scriptInjection.push(
- '');
+ '');
}
context.scriptInjection = scriptInjection.join("\n");
}
diff --git a/main/webapp/modules/core/error.vt b/main/webapp/modules/core/error.vt
index 1f9cdefb7..f885d2d83 100644
--- a/main/webapp/modules/core/error.vt
+++ b/main/webapp/modules/core/error.vt
@@ -38,11 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Error - Google Refine
-
+
-
+
Something went wrong!
diff --git a/main/webapp/modules/core/index.vt b/main/webapp/modules/core/index.vt
index 081e88ee5..1c343c3a7 100644
--- a/main/webapp/modules/core/index.vt
+++ b/main/webapp/modules/core/index.vt
@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.