Commit 9a208594a638e8a7700a0b503fba12d1fa5531ae
1 parent
5eedfb59
Exists in
master
and in
1 other branch
Novas tarefas adicionadas.
Showing
11 changed files
with
220 additions
and
176 deletions
Show diff stats
view/assets/css/main.css
@@ -3,11 +3,11 @@ | @@ -3,11 +3,11 @@ | ||
3 | 3 | ||
4 | /* Main */ | 4 | /* Main */ |
5 | body nav.navbar:first-child { | 5 | body nav.navbar:first-child { |
6 | - display: none; | 6 | + display: none; |
7 | } | 7 | } |
8 | 8 | ||
9 | footer { | 9 | footer { |
10 | - display: none; | 10 | + display: none; |
11 | } | 11 | } |
12 | 12 | ||
13 | @font-face { | 13 | @font-face { |
@@ -29,9 +29,9 @@ body { | @@ -29,9 +29,9 @@ body { | ||
29 | 29 | ||
30 | /* Nav-bar */ | 30 | /* Nav-bar */ |
31 | .wl-logo { | 31 | .wl-logo { |
32 | - position: fixed; | ||
33 | - top: 8px; | ||
34 | - z-index: 9999; | 32 | + position: fixed; |
33 | + top: 8px; | ||
34 | + z-index: 9999; | ||
35 | } | 35 | } |
36 | 36 | ||
37 | .wl-logo img { | 37 | .wl-logo img { |
@@ -40,17 +40,18 @@ body { | @@ -40,17 +40,18 @@ body { | ||
40 | } | 40 | } |
41 | 41 | ||
42 | .navbar-wl { | 42 | .navbar-wl { |
43 | - z-index: 9998; | ||
44 | - position: fixed; | ||
45 | - top: 0; | ||
46 | - width: 100%; | ||
47 | - margin: 0; | ||
48 | - left: 0; | ||
49 | - background-color: #6958b4; | ||
50 | - opacity: 0.95; | 43 | + z-index: 9998; |
44 | + position: fixed; | ||
45 | + top: 0; | ||
46 | + width: 100%; | ||
47 | + margin: 0; | ||
48 | + left: 0; | ||
49 | + background-color: #6958b4; | ||
50 | + opacity: 0.95; | ||
51 | } | 51 | } |
52 | + | ||
52 | .navbar-default .navbar-nav>li>a { | 53 | .navbar-default .navbar-nav>li>a { |
53 | - color: #FFFFFF; | 54 | + color: #FFFFFF; |
54 | } | 55 | } |
55 | 56 | ||
56 | .col-centered { | 57 | .col-centered { |
@@ -85,7 +86,7 @@ body { | @@ -85,7 +86,7 @@ body { | ||
85 | } | 86 | } |
86 | 87 | ||
87 | #main-container { | 88 | #main-container { |
88 | - padding-top: 45px; | 89 | + padding-top: 42px; |
89 | } | 90 | } |
90 | 91 | ||
91 | .sub-main-container { | 92 | .sub-main-container { |
@@ -367,7 +368,7 @@ ul.rig.columns-4 li { | @@ -367,7 +368,7 @@ ul.rig.columns-4 li { | ||
367 | width: 60%; | 368 | width: 60%; |
368 | } | 369 | } |
369 | 370 | ||
370 | -.box-panel-option { | 371 | +.box-panel-option, .video-panel-option { |
371 | max-width: 100%; | 372 | max-width: 100%; |
372 | border-radius: 5px; | 373 | border-radius: 5px; |
373 | border: 3px solid #80A8D2; | 374 | border: 3px solid #80A8D2; |
@@ -378,11 +379,12 @@ ul.rig.columns-4 li { | @@ -378,11 +379,12 @@ ul.rig.columns-4 li { | ||
378 | cursor: pointer; | 379 | cursor: pointer; |
379 | } | 380 | } |
380 | 381 | ||
381 | -.box-panel-option:hover, .box-panel-option[select=true] { | 382 | +.box-panel-option:hover, .box-panel-option[select=true], |
383 | + .video-panel-option[select=true], .video-panel-option-hover { | ||
382 | border-color: #9678b0; | 384 | border-color: #9678b0; |
383 | } | 385 | } |
384 | 386 | ||
385 | -.box-panel-option[select=false] { | 387 | +.box-panel-option { |
386 | border-color: #80A8D2; | 388 | border-color: #80A8D2; |
387 | } | 389 | } |
388 | 390 | ||
@@ -399,7 +401,7 @@ ul.rig.columns-4 li { | @@ -399,7 +401,7 @@ ul.rig.columns-4 li { | ||
399 | display: none; | 401 | display: none; |
400 | } | 402 | } |
401 | 403 | ||
402 | -.single-column-option-container .box-panel-option { | 404 | +.single-column-option-container .video-panel-option { |
403 | height: 100px; | 405 | height: 100px; |
404 | } | 406 | } |
405 | 407 | ||
@@ -420,8 +422,8 @@ ul.rig.columns-4 li { | @@ -420,8 +422,8 @@ ul.rig.columns-4 li { | ||
420 | } | 422 | } |
421 | 423 | ||
422 | .subconfiguration-options-container { | 424 | .subconfiguration-options-container { |
423 | - height: 45px; | ||
424 | - overflow: hidden; | 425 | + height: 45px; |
426 | + overflow: hidden; | ||
425 | } | 427 | } |
426 | 428 | ||
427 | .subconfiguration-panel { | 429 | .subconfiguration-panel { |
@@ -511,4 +513,4 @@ ul.rig.columns-4 li { | @@ -511,4 +513,4 @@ ul.rig.columns-4 li { | ||
511 | 513 | ||
512 | #completed-all-task-msg { | 514 | #completed-all-task-msg { |
513 | display: none; | 515 | display: none; |
514 | -} | 516 | +} |
515 | \ No newline at end of file | 517 | \ No newline at end of file |
view/assets/js/articulation.js
1 | (function(articulation, $, undefined) { | 1 | (function(articulation, $, undefined) { |
2 | 2 | ||
3 | - var server_host = ''; | ||
4 | - var MAX_COLUMNS = 14; | ||
5 | - | ||
6 | - function _updateASelector(container, ballSelector, step) { | ||
7 | - var pointSelector = parseInt(step) == 2 ? "A" : "B"; | ||
8 | - $(container + ' .ball-selector.active').each(function() { | ||
9 | - $(this).removeClass('active'); | ||
10 | - $(this).find('.point-selector').remove(); | ||
11 | - }); | ||
12 | - ballSelector.addClass('active'); | ||
13 | - ballSelector.append('<div class="point-selector"><img src="' + server_host + '/img/pa/' | ||
14 | - + pointSelector + '-Seletor.png" class="point-selector" alt=""></div>'); | ||
15 | - $(container + ' .selection-panel-option[select=true]').attr('select', false); | ||
16 | - $(ballSelector).attr('select', true); | ||
17 | - } | ||
18 | - | ||
19 | - function _getSelectedY(hand, subConfig, step) { | ||
20 | - step = parseInt(step) - 1; | ||
21 | - var previousStepId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + | ||
22 | - subConfig + '][step=' + step + '] .module-x-y'; | ||
23 | - return $(previousStepId).attr("data-y"); | ||
24 | - } | ||
25 | - | ||
26 | - function _setupModuleZ(hand, subConfig, step, selectedY) { | ||
27 | - if (typeof selectedY == 'undefined' || selectedY == '') return; | ||
28 | - | ||
29 | - var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + | ||
30 | - subConfig + '][step=' + step + ']'; | ||
31 | - var articulation_z = base_id + ' .module-z'; | ||
32 | - $(articulation_z + ' .ball-selector').hide(); | ||
33 | - $(articulation_z + ' .row-number-' + selectedY + ' .ball-selector').show(); | ||
34 | - | ||
35 | - var z = $(articulation_z).attr('data-z'); | ||
36 | - if (typeof z != 'undefined') { | ||
37 | - var ball_selector = $(articulation_z + ' .row-number-' + selectedY + ' .ball-' + z); | ||
38 | - _updateASelector(articulation_z, ball_selector, step); | ||
39 | - } | ||
40 | - } | ||
41 | - | ||
42 | - function _setupBallSelectorXY(hand, subConfig, step) { | ||
43 | - var base_id = '.selection-panel-body[mainConfig=' + hand + | ||
44 | - '][subConfig=' + subConfig + '][step=' + step + ']'; | ||
45 | - var articulation_x_y = base_id + ' .module-x-y'; | ||
46 | - $(articulation_x_y + ' .ball-selector').off('click').on('click', function(a) { | ||
47 | - var b = $(a.target); | ||
48 | - if (!b.hasClass('ball-selector')) { | ||
49 | - dynworkflow.userSelectedAnOption(); | ||
50 | - return; | ||
51 | - } | ||
52 | - var c = b.parent('.grid-row'), | ||
53 | - d = $(articulation_x_y), | ||
54 | - f = b.attr('data-x'), | ||
55 | - g = c.attr('data-y'); | ||
56 | - d.attr('data-x', f), d.attr('data-y', g); | ||
57 | - | ||
58 | - var nextStep = parseInt(step) + 1; | ||
59 | - _updateASelector(articulation_x_y, b, nextStep); | ||
60 | - _setupModuleZ(hand, subConfig, nextStep, g); | ||
61 | - | ||
62 | - wikilibras.updateTempParameterJSON(hand, subConfig, step, f + ';' + g); | ||
63 | - dynworkflow.userSelectedAnOption(); | ||
64 | - }); | ||
65 | - } | ||
66 | - | ||
67 | - function _setupBallSelectorZ(hand, subConfig, step) { | ||
68 | - var base_id = '.selection-panel-body[mainConfig=' + hand + | ||
69 | - '][subConfig=' + subConfig + '][step=' + step + ']'; | ||
70 | - var articulation_z = base_id + ' .module-z'; | ||
71 | - $(articulation_z + ' .ball-selector').off('click').on('click', function(a) { | ||
72 | - var b = $(a.target); | ||
73 | - if (!b.hasClass('ball-selector')) { | ||
74 | - dynworkflow.userSelectedAnOption(); | ||
75 | - return; | ||
76 | - } | ||
77 | - var c = b.parent('.grid-row'), | ||
78 | - e = $(articulation_z), | ||
79 | - h = b.attr('data-z'); | ||
80 | - b.attr('data-z') && e.attr('data-z', h), _updateASelector(articulation_z, b, step); | ||
81 | - | ||
82 | - wikilibras.updateTempParameterJSON(hand, subConfig, step, h); | ||
83 | - dynworkflow.userSelectedAnOption(); | ||
84 | - }); | ||
85 | - } | ||
86 | - | ||
87 | - function _calculateArticulationPointIndex(hand, xValue, yValue, zValue) { | ||
88 | - var x = xValue; | ||
89 | - var y = yValue; | ||
90 | - var z = zValue; | ||
91 | - if (hand == 'left-hand') { | ||
92 | - x = MAX_COLUMNS - x + 1; | ||
93 | - } | ||
94 | - | ||
95 | - var value = (z - 1) * MAX_COLUMNS + x + 3 * MAX_COLUMNS * (y - 1); | ||
96 | - //console.log(value); | ||
97 | - return value; | ||
98 | - } | ||
99 | - | ||
100 | - articulation.processValue = function(hand, selectionArray) { | ||
101 | - var xyValueSplit = selectionArray[0].split(';'); | ||
102 | - var xValue = parseInt(xyValueSplit[0]); | ||
103 | - var yValue = parseInt(xyValueSplit[1]); | ||
104 | - var zValue = parseInt(selectionArray[1]); | ||
105 | - return _calculateArticulationPointIndex(hand, xValue, yValue, zValue); | ||
106 | - }; | ||
107 | - | ||
108 | - articulation.setupModuleXY = function(serverhost, hand, subConfig, step) { | ||
109 | - server_host = serverhost; | ||
110 | - _setupBallSelectorXY(hand, subConfig, step); | ||
111 | - }; | ||
112 | - | ||
113 | - articulation.setupModuleZ = function(serverhost, hand, subConfig, step) { | ||
114 | - server_host = serverhost; | ||
115 | - _setupBallSelectorZ(hand, subConfig, step); | ||
116 | - | ||
117 | - var selectedY = _getSelectedY(hand, subConfig, step); | ||
118 | - _setupModuleZ(hand, subConfig, step, selectedY); | ||
119 | - }; | 3 | + var server_host = ''; |
4 | + var MAX_COLUMNS = 14; | ||
5 | + | ||
6 | + function _updateASelector(container, ballSelector, step) { | ||
7 | + var pointSelector = parseInt(step) == 2 ? 'A' : 'B'; | ||
8 | + $(container + ' .ball-selector.active').each(function() { | ||
9 | + $(this).removeClass('active'); | ||
10 | + $(this).find('.point-selector').remove(); | ||
11 | + }); | ||
12 | + ballSelector.addClass('active'); | ||
13 | + ballSelector.append('<div class="point-selector"><img src="' | ||
14 | + + server_host + '/img/pa/' + pointSelector | ||
15 | + + '-Seletor.png" class="point-selector" alt=""></div>'); | ||
16 | + $(container + ' .selection-panel-option[select=true]').attr('select', | ||
17 | + false); | ||
18 | + $(ballSelector).attr('select', true); | ||
19 | + } | ||
20 | + | ||
21 | + function _getSelectedY(hand, subConfig, step) { | ||
22 | + step = parseInt(step) - 1; | ||
23 | + var previousStepId = '.selection-panel-body[mainConfig=' + hand | ||
24 | + + '][subConfig=' + subConfig + '][step=' + step | ||
25 | + + '] .module-x-y'; | ||
26 | + return $(previousStepId).attr('data-y'); | ||
27 | + } | ||
28 | + | ||
29 | + function _setupModuleZ(hand, subConfig, step, selectedY) { | ||
30 | + if (typeof selectedY == 'undefined' || selectedY == '') | ||
31 | + return; | ||
32 | + | ||
33 | + var base_id = '.selection-panel-body[mainConfig=' + hand | ||
34 | + + '][subConfig=' + subConfig + '][step=' + step + ']'; | ||
35 | + var articulation_z = base_id + ' .module-z'; | ||
36 | + $(articulation_z + ' .ball-selector').hide(); | ||
37 | + $(articulation_z + ' .row-number-' + selectedY + ' .ball-selector') | ||
38 | + .show(); | ||
39 | + | ||
40 | + var z = $(articulation_z).attr('data-z'); | ||
41 | + if (typeof z != 'undefined') { | ||
42 | + var ball_selector = $(articulation_z + ' .row-number-' + selectedY | ||
43 | + + ' .ball-' + z); | ||
44 | + _updateASelector(articulation_z, ball_selector, step); | ||
45 | + } | ||
46 | + } | ||
47 | + | ||
48 | + function _setupBallSelectorXY(hand, subConfig, step) { | ||
49 | + var base_id = '.selection-panel-body[mainConfig=' + hand | ||
50 | + + '][subConfig=' + subConfig + '][step=' + step + ']'; | ||
51 | + var articulation_x_y = base_id + ' .module-x-y'; | ||
52 | + $(articulation_x_y + ' .ball-selector') | ||
53 | + .off('click') | ||
54 | + .on( | ||
55 | + 'click', | ||
56 | + function(a) { | ||
57 | + var b = $(a.target); | ||
58 | + if (!b.hasClass('ball-selector')) { | ||
59 | + dynworkflow.userSelectedAnOption(); | ||
60 | + return; | ||
61 | + } | ||
62 | + var c = b.parent('.grid-row'), d = $(articulation_x_y), f = b | ||
63 | + .attr('data-x'), g = c.attr('data-y'); | ||
64 | + d.attr('data-x', f), d.attr('data-y', g); | ||
65 | + | ||
66 | + var nextStep = parseInt(step) + 1; | ||
67 | + _updateASelector(articulation_x_y, b, nextStep); | ||
68 | + _setupModuleZ(hand, subConfig, nextStep, g); | ||
69 | + | ||
70 | + wikilibras.updateTempParameterJSON(hand, subConfig, | ||
71 | + step, f + ';' + g); | ||
72 | + dynworkflow.userSelectedAnOption(); | ||
73 | + }); | ||
74 | + } | ||
75 | + | ||
76 | + function _setupBallSelectorZ(hand, subConfig, step) { | ||
77 | + var base_id = '.selection-panel-body[mainConfig=' + hand | ||
78 | + + '][subConfig=' + subConfig + '][step=' + step + ']'; | ||
79 | + var articulation_z = base_id + ' .module-z'; | ||
80 | + $(articulation_z + ' .ball-selector').off('click').on( | ||
81 | + 'click', | ||
82 | + function(a) { | ||
83 | + var b = $(a.target); | ||
84 | + if (!b.hasClass('ball-selector')) { | ||
85 | + dynworkflow.userSelectedAnOption(); | ||
86 | + return; | ||
87 | + } | ||
88 | + var c = b.parent('.grid-row'), e = $(articulation_z), h = b | ||
89 | + .attr('data-z'); | ||
90 | + b.attr('data-z') && e.attr('data-z', h), _updateASelector( | ||
91 | + articulation_z, b, step); | ||
92 | + | ||
93 | + wikilibras | ||
94 | + .updateTempParameterJSON(hand, subConfig, step, h); | ||
95 | + dynworkflow.userSelectedAnOption(); | ||
96 | + }); | ||
97 | + } | ||
98 | + | ||
99 | + function _calculateArticulationPointIndex(hand, xValue, yValue, zValue) { | ||
100 | + var x = xValue; | ||
101 | + var y = yValue; | ||
102 | + var z = zValue; | ||
103 | + if (hand == 'left-hand') { | ||
104 | + x = MAX_COLUMNS - x + 1; | ||
105 | + } | ||
106 | + | ||
107 | + var value = (z - 1) * MAX_COLUMNS + x + 3 * MAX_COLUMNS * (y - 1); | ||
108 | + //console.log(value); | ||
109 | + return value; | ||
110 | + } | ||
111 | + | ||
112 | + articulation.processValue = function(hand, selectionArray) { | ||
113 | + var xyValueSplit = selectionArray[0].split(';'); | ||
114 | + var xValue = parseInt(xyValueSplit[0]); | ||
115 | + var yValue = parseInt(xyValueSplit[1]); | ||
116 | + var zValue = parseInt(selectionArray[1]); | ||
117 | + return _calculateArticulationPointIndex(hand, xValue, yValue, zValue); | ||
118 | + }; | ||
119 | + | ||
120 | + articulation.setupModuleXY = function(serverhost, hand, subConfig, step) { | ||
121 | + server_host = serverhost; | ||
122 | + _setupBallSelectorXY(hand, subConfig, step); | ||
123 | + }; | ||
124 | + | ||
125 | + articulation.setupModuleZ = function(serverhost, hand, subConfig, step) { | ||
126 | + server_host = serverhost; | ||
127 | + _setupBallSelectorZ(hand, subConfig, step); | ||
128 | + | ||
129 | + var selectedY = _getSelectedY(hand, subConfig, step); | ||
130 | + _setupModuleZ(hand, subConfig, step, selectedY); | ||
131 | + }; | ||
132 | + | ||
133 | + articulation.clean = function() { | ||
134 | + $('.ball-selector.active').each(function() { | ||
135 | + $(this).removeClass('active'); | ||
136 | + $(this).find('.point-selector').remove(); | ||
137 | + }); | ||
138 | + $('.module-x-y').attr('data-x', ''); | ||
139 | + $('.module-x-y').attr('data-y', ''); | ||
140 | + $('.module-z').attr('data-z', ''); | ||
141 | + } | ||
120 | 142 | ||
121 | }(window.articulation = window.articulation || {}, jQuery)); | 143 | }(window.articulation = window.articulation || {}, jQuery)); |
view/assets/js/dynamic-loading-engine.js
@@ -75,8 +75,6 @@ | @@ -75,8 +75,6 @@ | ||
75 | dynengine.render = function(serverUrl, templatePath, target, prepend, callback) { | 75 | dynengine.render = function(serverUrl, templatePath, target, prepend, callback) { |
76 | var url = serverUrl + templatePath; | 76 | var url = serverUrl + templatePath; |
77 | $.get(url, function(data) { | 77 | $.get(url, function(data) { |
78 | - console.log('got: ' + url); | ||
79 | - | ||
80 | var processedHtml = _preprocessHtml(data, serverUrl); | 78 | var processedHtml = _preprocessHtml(data, serverUrl); |
81 | if (prepend) { | 79 | if (prepend) { |
82 | $(target).prepend(processedHtml); | 80 | $(target).prepend(processedHtml); |
@@ -87,11 +85,11 @@ | @@ -87,11 +85,11 @@ | ||
87 | .done(function() { | 85 | .done(function() { |
88 | callback && callback(); // call if defined | 86 | callback && callback(); // call if defined |
89 | }); | 87 | }); |
90 | - }, | 88 | + }; |
91 | 89 | ||
92 | dynengine.clean = function(target) { | 90 | dynengine.clean = function(target) { |
93 | $(target).html(''); | 91 | $(target).html(''); |
94 | - }, | 92 | + }; |
95 | 93 | ||
96 | dynengine.load = function() { | 94 | dynengine.load = function() { |
97 | var url = $('#server-url').data('url'); | 95 | var url = $('#server-url').data('url'); |
view/assets/js/facial.js
1 | (function(facial, $, undefined) { | 1 | (function(facial, $, undefined) { |
2 | 2 | ||
3 | - facial.setup = function(subConfig) { | ||
4 | - var baseId = '.selection-panel-body[mainConfig=facial][subConfig=' + subConfig + ']'; | ||
5 | - $(baseId + ' .selection-panel-option').off('click').on( | ||
6 | - 'click', function() { | ||
7 | - wikilibras.selectAnOption(baseId, this); | ||
8 | - dynworkflow.userSelectedAnOption(); | ||
9 | - }); | ||
10 | - }; | 3 | + facial.setup = function(subConfig) { |
4 | + var baseId = '.selection-panel-body[mainConfig=facial][subConfig=' | ||
5 | + + subConfig + ']'; | ||
6 | + $(baseId + ' .selection-panel-option').off('click').on('click', | ||
7 | + function() { | ||
8 | + wikilibras.selectAnOption(baseId, this); | ||
9 | + dynworkflow.userSelectedAnOption(); | ||
10 | + }); | ||
11 | + $(baseId + ' .video-panel-option').off('mouseenter').on('mouseenter', | ||
12 | + function(event) { | ||
13 | + $(this).addClass('video-panel-option-hover'); | ||
14 | + }); | ||
15 | + $(baseId + ' .video-panel-option').off('mouseleave').on('mouseleave', | ||
16 | + function(event) { | ||
17 | + $(this).removeClass('video-panel-option-hover'); | ||
18 | + }); | ||
19 | + }; | ||
11 | 20 | ||
12 | }(window.facial = window.facial || {}, jQuery)); | 21 | }(window.facial = window.facial || {}, jQuery)); |
view/assets/js/movement.js
@@ -12,5 +12,13 @@ | @@ -12,5 +12,13 @@ | ||
12 | wikilibras.selectAnOption(baseId, this); | 12 | wikilibras.selectAnOption(baseId, this); |
13 | dynworkflow.selectMovement($(this).attr('value')); | 13 | dynworkflow.selectMovement($(this).attr('value')); |
14 | }); | 14 | }); |
15 | + $(baseId + ' .video-panel-option').off('mouseenter').on('mouseenter', | ||
16 | + function(event) { | ||
17 | + $(this).addClass('video-panel-option-hover'); | ||
18 | + }); | ||
19 | + $(baseId + ' .video-panel-option').off('mouseleave').on('mouseleave', | ||
20 | + function(event) { | ||
21 | + $(this).removeClass('video-panel-option-hover'); | ||
22 | + }); | ||
15 | }; | 23 | }; |
16 | }(window.movement = window.movement || {}, jQuery)); | 24 | }(window.movement = window.movement || {}, jQuery)); |
view/assets/js/wikilibras.js
@@ -265,7 +265,7 @@ | @@ -265,7 +265,7 @@ | ||
265 | } | 265 | } |
266 | 266 | ||
267 | function _selectAnOption(parentId, el) { | 267 | function _selectAnOption(parentId, el) { |
268 | - $(parentId + ' .selection-panel-option[select=true]').attr('select', false); | 268 | + $(parentId + ' .selection-panel-option[select=true]').removeAttr('select'); |
269 | $(el).attr('select', true); | 269 | $(el).attr('select', true); |
270 | 270 | ||
271 | var mainConfig = $(parentId).attr('mainConfig'); | 271 | var mainConfig = $(parentId).attr('mainConfig'); |
@@ -299,13 +299,15 @@ | @@ -299,13 +299,15 @@ | ||
299 | } | 299 | } |
300 | }); | 300 | }); |
301 | } | 301 | } |
302 | + | ||
303 | + function _getRenderedAvatarUrl(userId, signName) { | ||
304 | + return api_url + '/public/' + userId + '/' + signName + ".webm"; | ||
305 | + } | ||
302 | 306 | ||
303 | function _showRenderedAvatar() { | 307 | function _showRenderedAvatar() { |
304 | - var user_id = parsedParameterJSON['userId']; | ||
305 | - var sign_name = parsedParameterJSON['sinal']; | ||
306 | - var rendered_avatar_url = api_url + '/public/' + user_id + '/' + | ||
307 | - sign_name + ".webm"; | ||
308 | - $("#render-avatar video").attr("src", rendered_avatar_url); | 308 | + var userId = parsedParameterJSON['userId']; |
309 | + var signName = parsedParameterJSON['sinal']; | ||
310 | + $("#render-avatar video").attr("src", _getRenderedAvatarUrl(userId, signName)); | ||
309 | $("#render-avatar").fadeIn(300); | 311 | $("#render-avatar").fadeIn(300); |
310 | } | 312 | } |
311 | 313 | ||
@@ -325,10 +327,12 @@ | @@ -325,10 +327,12 @@ | ||
325 | $("#finish-button").removeClass("disabled"); | 327 | $("#finish-button").removeClass("disabled"); |
326 | _showRenderedAvatar(); | 328 | _showRenderedAvatar(); |
327 | }); | 329 | }); |
330 | + //$("#finish-button").removeClass("disabled"); | ||
328 | } | 331 | } |
329 | 332 | ||
330 | function _clearGUI() { | 333 | function _clearGUI() { |
331 | - $(".selection-panel-option").removeAttr("select"); | 334 | + articulation.clean(); |
335 | + $(".selection-panel-option").removeAttr('select'); | ||
332 | $(".icon_container").removeAttr("select"); | 336 | $(".icon_container").removeAttr("select"); |
333 | $(".icon_container[complete=true]").each( | 337 | $(".icon_container[complete=true]").each( |
334 | function() { | 338 | function() { |
@@ -389,7 +393,6 @@ | @@ -389,7 +393,6 @@ | ||
389 | deferred.resolve(); | 393 | deferred.resolve(); |
390 | }, 2500); | 394 | }, 2500); |
391 | });*/ | 395 | });*/ |
392 | - | ||
393 | setTimeout(function() { | 396 | setTimeout(function() { |
394 | $("#thanks-screen").hide(); | 397 | $("#thanks-screen").hide(); |
395 | deferred.resolve(); | 398 | deferred.resolve(); |
@@ -400,6 +403,8 @@ | @@ -400,6 +403,8 @@ | ||
400 | $("#completed-task-msg").hide(); | 403 | $("#completed-task-msg").hide(); |
401 | $("#completed-all-task-msg").show(); | 404 | $("#completed-all-task-msg").show(); |
402 | $("#thanks-screen").fadeIn(300); | 405 | $("#thanks-screen").fadeIn(300); |
406 | + // It removes the PyBossa default message | ||
407 | + $(".row .col-md-12 p").remove(); | ||
403 | } | 408 | } |
404 | 409 | ||
405 | pybossa.presentTask(function(task, deferred) { | 410 | pybossa.presentTask(function(task, deferred) { |
view/facial/duracao/passo-1.html
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | <div class="single-column-option"> | 6 | <div class="single-column-option"> |
7 | <video src="{{ server }}/img/exf/duration-slow.webm" | 7 | <video src="{{ server }}/img/exf/duration-slow.webm" |
8 | preload="metadata" value="lento" | 8 | preload="metadata" value="lento" |
9 | - class="box-panel-option selection-panel-option" autoplay loop> | 9 | + class="video-panel-option selection-panel-option" autoplay loop> |
10 | <source type="video/webm"> | 10 | <source type="video/webm"> |
11 | </div> | 11 | </div> |
12 | <img class="single-column-option" | 12 | <img class="single-column-option" |
@@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
16 | <div class="single-column-option"> | 16 | <div class="single-column-option"> |
17 | <video src="{{ server }}/img/exf/duration-normal.webm" | 17 | <video src="{{ server }}/img/exf/duration-normal.webm" |
18 | preload="metadata" value="normal" | 18 | preload="metadata" value="normal" |
19 | - class="box-panel-option selection-panel-option" autoplay loop> | 19 | + class="video-panel-option selection-panel-option" autoplay loop> |
20 | <source type="video/webm"> | 20 | <source type="video/webm"> |
21 | </div> | 21 | </div> |
22 | <img class="single-column-option" | 22 | <img class="single-column-option" |
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | <div class="single-column-option"> | 26 | <div class="single-column-option"> |
27 | <video src="{{ server }}/img/exf/duration-fast.webm" | 27 | <video src="{{ server }}/img/exf/duration-fast.webm" |
28 | preload="metadata" value="rapido" | 28 | preload="metadata" value="rapido" |
29 | - class="box-panel-option selection-panel-option" autoplay loop> | 29 | + class="video-panel-option selection-panel-option" autoplay loop> |
30 | <source type="video/webm"> | 30 | <source type="video/webm"> |
31 | </div> | 31 | </div> |
32 | <img class="single-column-option" | 32 | <img class="single-column-option" |
view/facial/transicao/passo-1.html
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | <div class="single-column-option"> | 7 | <div class="single-column-option"> |
8 | <video src="{{ server }}/img/exf/velocity-slow.webm" | 8 | <video src="{{ server }}/img/exf/velocity-slow.webm" |
9 | preload="metadata" value="lento" | 9 | preload="metadata" value="lento" |
10 | - class="box-panel-option selection-panel-option" autoplay loop> | 10 | + class="video-panel-option selection-panel-option" autoplay loop> |
11 | <source type="video/webm"> | 11 | <source type="video/webm"> |
12 | </div> | 12 | </div> |
13 | <img class="single-column-option" | 13 | <img class="single-column-option" |
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | <div class="single-column-option"> | 17 | <div class="single-column-option"> |
18 | <video src="{{ server }}/img/exf/velocity-normal.webm" | 18 | <video src="{{ server }}/img/exf/velocity-normal.webm" |
19 | preload="metadata" value="normal" | 19 | preload="metadata" value="normal" |
20 | - class="box-panel-option selection-panel-option" autoplay loop> | 20 | + class="video-panel-option selection-panel-option" autoplay loop> |
21 | <source type="video/webm"> | 21 | <source type="video/webm"> |
22 | </div> | 22 | </div> |
23 | <img class="single-column-option" | 23 | <img class="single-column-option" |
@@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
27 | <div class="single-column-option"> | 27 | <div class="single-column-option"> |
28 | <video src="{{ server }}/img/exf/velocity-fast.webm" | 28 | <video src="{{ server }}/img/exf/velocity-fast.webm" |
29 | preload="metadata" value="rapido" | 29 | preload="metadata" value="rapido" |
30 | - class="box-panel-option selection-panel-option" autoplay loop> | 30 | + class="video-panel-option selection-panel-option" autoplay loop> |
31 | <source type="video/webm"> | 31 | <source type="video/webm"> |
32 | </div> | 32 | </div> |
33 | <img class="single-column-option" | 33 | <img class="single-column-option" |
view/hand/movimento/passo-1.html
@@ -4,35 +4,35 @@ | @@ -4,35 +4,35 @@ | ||
4 | <h8>Escolha o movimento mais parecido</h8> | 4 | <h8>Escolha o movimento mais parecido</h8> |
5 | </div> | 5 | </div> |
6 | <div class="selection-panel-inner-body"> | 6 | <div class="selection-panel-inner-body"> |
7 | - <ul class="rig columns-1"> | 7 | + <ul class="rig columns-2"> |
8 | <li><video src="{{ server }}/img/mov/PONTUAL.webm" | 8 | <li><video src="{{ server }}/img/mov/PONTUAL.webm" |
9 | preload="metadata" value="pontual" | 9 | preload="metadata" value="pontual" |
10 | - class="box-panel-option selection-panel-option" autoplay loop> | 10 | + class="video-panel-option selection-panel-option" autoplay loop> |
11 | <source type="video/webm"> | 11 | <source type="video/webm"> |
12 | </video> Pontual</li> | 12 | </video> Pontual</li> |
13 | <li><video src="{{ server }}/img/mov/RETILINEO.webm" | 13 | <li><video src="{{ server }}/img/mov/RETILINEO.webm" |
14 | preload="metadata" value="retilineo" | 14 | preload="metadata" value="retilineo" |
15 | - class="box-panel-option selection-panel-option" autoplay loop> | 15 | + class="video-panel-option selection-panel-option" autoplay loop> |
16 | <source type="video/webm"> | 16 | <source type="video/webm"> |
17 | </video> Retilíneo</li> | 17 | </video> Retilíneo</li> |
18 | <li><video src="{{ server }}/img/mov/CIRCULAR.webm" | 18 | <li><video src="{{ server }}/img/mov/CIRCULAR.webm" |
19 | preload="metadata" value="circular" | 19 | preload="metadata" value="circular" |
20 | - class="box-panel-option selection-panel-option" autoplay loop> | 20 | + class="video-panel-option selection-panel-option" autoplay loop> |
21 | <source type="video/webm"> | 21 | <source type="video/webm"> |
22 | </video> Circular</li> | 22 | </video> Circular</li> |
23 | <li><video src="{{ server }}/img/mov/SEMICIRCULAR.webm" | 23 | <li><video src="{{ server }}/img/mov/SEMICIRCULAR.webm" |
24 | preload="metadata" value="semicircular" | 24 | preload="metadata" value="semicircular" |
25 | - class="box-panel-option selection-panel-option" autoplay loop> | 25 | + class="video-panel-option selection-panel-option" autoplay loop> |
26 | <source type="video/webm"> | 26 | <source type="video/webm"> |
27 | </video> Semi-Circular</li> | 27 | </video> Semi-Circular</li> |
28 | <!-- | 28 | <!-- |
29 | - <li><img class="box-panel-option selection-panel-option" | 29 | + <li><img class="video-panel-option selection-panel-option" |
30 | src="{{ server }}/img/exf/0000.png" value="semicircular"/>Semi-Circular</li> | 30 | src="{{ server }}/img/exf/0000.png" value="semicircular"/>Semi-Circular</li> |
31 | - <li><img class="box-panel-option selection-panel-option" | 31 | + <li><img class="video-panel-option selection-panel-option" |
32 | src="{{ server }}/img/exf/0000.png" value="helicoidal"/>Espiral</li> | 32 | src="{{ server }}/img/exf/0000.png" value="helicoidal"/>Espiral</li> |
33 | - <li><img class="box-panel-option selection-panel-option" | 33 | + <li><img class="video-panel-option selection-panel-option" |
34 | src="{{ server }}/img/exf/0000.png" value="senoidal"/>Curvas</li> | 34 | src="{{ server }}/img/exf/0000.png" value="senoidal"/>Curvas</li> |
35 | - <li><img class="box-panel-option selection-panel-option" | 35 | + <li><img class="video-panel-option selection-panel-option" |
36 | src="{{ server }}/img/exf/0000.png" value="contato"/>Contato</li> | 36 | src="{{ server }}/img/exf/0000.png" value="contato"/>Contato</li> |
37 | --> | 37 | --> |
38 | </ul> | 38 | </ul> |
view/img/thumbnail.png
wikilibras.py
@@ -25,8 +25,8 @@ class Wikilibras: | @@ -25,8 +25,8 @@ class Wikilibras: | ||
25 | self.__update_project_info(project) | 25 | self.__update_project_info(project) |
26 | 26 | ||
27 | def __create_tasks(self, project): | 27 | def __create_tasks(self, project): |
28 | - #test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"] | ||
29 | - test_signs = ["CALAR"] | 28 | + test_signs = ["CALAR", "ENSINADO", "ENTANTO", "ENTENDIDO"] |
29 | + #test_signs = ["CALAR"] | ||
30 | for sign in test_signs: | 30 | for sign in test_signs: |
31 | task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) | 31 | task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) |
32 | pbclient.create_task(project.id, task) | 32 | pbclient.create_task(project.id, task) |