diff --git a/view/assets/css/main.css b/view/assets/css/main.css index 1189f43..68e9f01 100755 --- a/view/assets/css/main.css +++ b/view/assets/css/main.css @@ -315,6 +315,14 @@ ul.rig.columns-4 li { width: 20%; } +#right-hand-moviment ul.rig.columns-2 li { + width: 60%; +} + +#left-hand-moviment ul.rig.columns-2 li { + width: 60%; +} + .selection-panel-option { max-width: 100%; border-radius: 5px; @@ -343,15 +351,15 @@ ul.rig.columns-4 li { display: none; } -.expression-velocity-option .selection-panel-option { +.single-column-option-container .selection-panel-option { height: 100px; } -.expression-velocity-option { +.single-column-option-container { padding-bottom: 20px; } -.velocity-option { +.single-column-option { display: inline-block; padding-right: 25px; } @@ -404,8 +412,11 @@ ul.rig.columns-4 li { #render-loading { display: none; +} + +#loading-container { position: relative; - height: 405px; + height: 407px; } #render-loading img { @@ -434,5 +445,5 @@ ul.rig.columns-4 li { } #completed-all-task-msg { - display: none; + display: none; } \ No newline at end of file diff --git a/view/assets/js/wikilibras.js b/view/assets/js/wikilibras.js index f84a434..4dcb9e8 100644 --- a/view/assets/js/wikilibras.js +++ b/view/assets/js/wikilibras.js @@ -76,7 +76,7 @@ } _changeImage(img, check_img_url); - $(".icon_container[name=" + option + "]").attr("complete", isCheck); + $(".icon_container[name=" + option + "]" + panel).attr("complete", isCheck); } function _isSelectingState() { @@ -556,8 +556,9 @@ }); } - function _cleanGUI() { + function _clearGUI() { $(".selection-panel-option").removeAttr("select"); + $(".icon_container").removeAttr("select"); $(".icon_container[complete=true]").each( function() { _unfinishConfiguration($(this).attr("name"), $(this).attr( @@ -566,7 +567,7 @@ } function _setupGUI(task, deferred) { - _cleanGUI(); + _clearGUI(); _setupConfigurationPanel(); _setupSelectionPanel(); @@ -594,12 +595,17 @@ answer["status"] = "FINISHED"; answer["parameter_json"] = base_parameter_json; - pybossa.saveTask(task.id, answer).done(function() { + /*pybossa.saveTask(task.id, answer).done(function() { setTimeout(function() { $("#thanks-screen").hide(); deferred.resolve(); }, 2500); - }); + });*/ + + setTimeout(function() { + $("#thanks-screen").hide(); + deferred.resolve(); + }, 2500); } function _showCompletedAllTaskMsg() { diff --git a/view/facial-configuration.html b/view/facial-configuration.html index 7a5efd8..51426aa 100644 --- a/view/facial-configuration.html +++ b/view/facial-configuration.html @@ -1,52 +1,53 @@ {% macro selectionPanel() -%} -
+
Expressão
  • 1.
    • + src="{{ server }}/img/exf/0000.png" value="0" /> 1.
  • 2.
    • + src="{{ server }}/img/exf/0001.png" value="1" /> 2.
  • 3.
    • + src="{{ server }}/img/exf/0002.png" value="2" /> 3.
  • 4.
    • + src="{{ server }}/img/exf/0003.png" value="3" /> 4.
  • 5.
    • + src="{{ server }}/img/exf/0004.png" value="4" /> 5.
  • 6.
    • + src="{{ server }}/img/exf/0005.png" value="5" /> 6.
  • 7.
    • + src="{{ server }}/img/exf/0006.png" value="6" /> 7.
  • 8.
    • + src="{{ server }}/img/exf/0007.png" value="7" /> 8.
  • 9.
    • + src="{{ server }}/img/exf/0008.png" value="8" /> 9.
  • 10.
    • + src="{{ server }}/img/exf/0009.png" value="9" />10.
  • 11.
    • + src="{{ server }}/img/exf/0010.png" value="10" />11.
  • 12.
    • + src="{{ server }}/img/exf/0011.png" value="11" />12.
  • 13.
    • + src="{{ server }}/img/exf/0012.png" value="12" />13.
  • 14.
    • + src="{{ server }}/img/exf/0013.png" value="13" />14.
  • 15.
    • + src="{{ server }}/img/exf/0014.png" value="14" />15.
  • 16.
    • + src="{{ server }}/img/exf/0015.png" value="15" />16.
  • 17.
    • + src="{{ server }}/img/exf/0016.png" value="16" />17.
  • 18.
    • + src="{{ server }}/img/exf/0017.png" value="17" />18.
  • 19.
    • + src="{{ server }}/img/exf/0018.png" value="18" />19.
  • 20.
    • + src="{{ server }}/img/exf/0019.png" value="19" />20.
  • 21.
    • + src="{{ server }}/img/exf/0020.png" value="20" />21.
@@ -55,28 +56,28 @@
Velocidade de Transição
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="lento" />
- Lento
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="normal" />
- Normal
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="rapido" />
- Rápido
@@ -85,34 +86,32 @@
Duração da Expressão
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="lento" />
- Longa
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="normal" />
- Normal
-
-
+
+
+ src="{{ server }}/img/exf/0000.png" value="rapido" />
- Breve
-{%- endmacro %} - -{%- macro subconfigPanel() -%} +{%- endmacro %} {%- macro subconfigPanel() -%}
  • Pontual
    • + src="{{ server }}/img/mov/CALAR.gif" value="pontual"/>Pontual +
diff --git a/view/img/mov/CALAR.gif b/view/img/mov/CALAR.gif new file mode 100644 index 0000000..6ee943e Binary files /dev/null and b/view/img/mov/CALAR.gif differ diff --git a/view/img/mov/CALAR_old.gif b/view/img/mov/CALAR_old.gif new file mode 100644 index 0000000..6060a14 Binary files /dev/null and b/view/img/mov/CALAR_old.gif differ diff --git a/view/template.html b/view/template.html index b190a67..f0cf869 100755 --- a/view/template.html +++ b/view/template.html @@ -167,7 +167,9 @@ import 'facial-configuration.html' as facialConfig with context %}
Gerando o sinal ""
- +
+ +
diff --git a/view/videos/CALAR_REF.webm b/view/videos/CALAR_REF.webm new file mode 100644 index 0000000..48aa8b6 Binary files /dev/null and b/view/videos/CALAR_REF.webm differ diff --git a/wikilibras.py b/wikilibras.py index 0620ce8..9acd812 100644 --- a/wikilibras.py +++ b/wikilibras.py @@ -25,7 +25,8 @@ class Wikilibras: self.__update_project_info(project) def __create_tasks(self, project): - test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"] + #test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"] + test_signs = ["CALAR"] for sign in test_signs: task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) pbclient.create_task(project.id, task) -- libgit2 0.21.2