diff --git a/settings_local.py.tmpl b/settings_local.py.tmpl
index 4e2709a..7036153 100644
--- a/settings_local.py.tmpl
+++ b/settings_local.py.tmpl
@@ -4,6 +4,8 @@ SERVER_HOST = "localhost"
SERVER_PORT = 8003
AGREEMENT_NUMBER = 2
API_HOST = "http://localhost:5001"
+UPLOAD_SIGN_HOST = "http://150.165.205.112:3000/addsinal"
+HOMEPAGE_URL = "http://150.165.205.112"
# Apache Configuration
APACHE_HOST = False
diff --git a/view/assets/js/submit-sign.js b/view/assets/js/submit-sign.js
index b9fec1a..6871b30 100644
--- a/view/assets/js/submit-sign.js
+++ b/view/assets/js/submit-sign.js
@@ -1,6 +1,6 @@
(function(submitSign, $, undefined) {
- var submitUrl = 'http://150.165.205.112:3000/addsinal';
+ var submitUrl = '';
function _isEmpty(str) {
return (!str || 0 === str.length);
@@ -33,7 +33,8 @@
$('#input-sign-upload').show();
}
- submitSign.setup = function() {
+ submitSign.setup = function(uploadSignHost) {
+ submitUrl = uploadSignHost;
$('#submit-sign-container form').fileupload(
{
url : submitUrl,
diff --git a/view/assets/js/teached-signs.js b/view/assets/js/teached-signs.js
index a34ce22..406acc1 100644
--- a/view/assets/js/teached-signs.js
+++ b/view/assets/js/teached-signs.js
@@ -3,7 +3,7 @@
var totalTasks = 0;
var doneTasks = 0;
var userId = -1;
- var pybossaUrl = '/';
+ var pybossaUrl = '/pybossa/';
var projectname = 'wikilibras';
var projectId = -1;
@@ -42,6 +42,7 @@
function _createSigns(answers) {
_updateTeachedSignsMessage();
+ $("#signs-list-container").html("");
for (i = 0; i < answers.length; i++) {
_addSign(answers[i].info);
}
@@ -73,7 +74,6 @@
}
function _updateTeachedSignsContainer() {
- $("#signs-list-container").html("");
_getAnswers().done(function(answers) {
_createSigns(answers);
});
@@ -91,18 +91,8 @@
doneTasks = response.done;
userId = response.user_id;
_updateTeachedSignsContainer();
-
- console.log(totalTasks);
- console.log(doneTasks);
- console.log(userId);
});
});
};
- teachedSigns.addNewSignal = function(answer) {
- doneTasks = doneTasks + 1;
- _updateTeachedSignsMessage();
- _addSign(answer);
- }
-
}(window.teachedSigns = window.teachedSigns || {}, jQuery));
diff --git a/view/assets/js/wikilibras.js b/view/assets/js/wikilibras.js
index 538119e..a962ef2 100644
--- a/view/assets/js/wikilibras.js
+++ b/view/assets/js/wikilibras.js
@@ -4,6 +4,7 @@
var base_url = '';
var server_backend_url = '';
var api_url = '';
+ var upload_signs_url = '';
var current_task_id = -1;
var tmpParameterJSON = {};
var parsedParameterJSON = {};
@@ -447,7 +448,6 @@
function _saveAnswer(task, deferred, answer) {
pybossa.saveTask(task.id, answer).done(function() {
- teachedSigns.addNewSignal(answer);
setTimeout(function() {
$("#thanks-screen").hide();
deferred.resolve();
@@ -466,7 +466,7 @@
function _loadMainComponents(task) {
dynengine.load();
dynworkflow.load();
- submitSign.setup();
+ submitSign.setup(upload_signs_url);
teachedSigns.setup();
}
@@ -483,15 +483,18 @@
// Private methods
function _run(projectname) {
+ pybossa.setEndpoint("/pybossa");
pybossa.run(projectname);
}
// Public methods
- wikilibras.run = function(serverhost, serverbackend, projectname, apihost) {
+ wikilibras.run = function(serverhost, serverbackend, projectname,
+ apihost, uploadsignshost) {
base_url = serverhost;
server_backend_url = serverbackend;
videos_url = base_url + "/videos/";
api_url = apihost;
+ upload_signs_url = uploadsignshost;
_run(projectname);
};
diff --git a/view/template.html b/view/template.html
index 0142cb2..5cfd477 100755
--- a/view/template.html
+++ b/view/template.html
@@ -1,7 +1,7 @@
server-url
-