Download as
Browse Code »

Commit 989206b13dc899631843e86535fbda7adb8f0cc8

Authored by Adabriand Furtado
1 parent 59474b00
Exists in master and in 1 other branch dynamic

Adicionada tarefa CALAR e setup para demo.

Showing 9 changed files with 83 additions and 62 deletions   Show diff stats
view/assets/css/main.css
  Diff comments   View file @989206b
@@ -315,6 +315,14 @@ ul.rig.columns-4 li { @@ -315,6 +315,14 @@ ul.rig.columns-4 li {
315 width: 20%; 315 width: 20%;
316 } 316 }
317 317
  318 +#right-hand-moviment ul.rig.columns-2 li {
  319 + width: 60%;
  320 +}
  321 +
  322 +#left-hand-moviment ul.rig.columns-2 li {
  323 + width: 60%;
  324 +}
  325 +
318 .selection-panel-option { 326 .selection-panel-option {
319 max-width: 100%; 327 max-width: 100%;
320 border-radius: 5px; 328 border-radius: 5px;
@@ -343,15 +351,15 @@ ul.rig.columns-4 li { @@ -343,15 +351,15 @@ ul.rig.columns-4 li {
343 display: none; 351 display: none;
344 } 352 }
345 353
346 -.expression-velocity-option .selection-panel-option { 354 +.single-column-option-container .selection-panel-option {
347 height: 100px; 355 height: 100px;
348 } 356 }
349 357
350 -.expression-velocity-option { 358 +.single-column-option-container {
351 padding-bottom: 20px; 359 padding-bottom: 20px;
352 } 360 }
353 361
354 -.velocity-option { 362 +.single-column-option {
355 display: inline-block; 363 display: inline-block;
356 padding-right: 25px; 364 padding-right: 25px;
357 } 365 }
@@ -404,8 +412,11 @@ ul.rig.columns-4 li { @@ -404,8 +412,11 @@ ul.rig.columns-4 li {
404 412
405 #render-loading { 413 #render-loading {
406 display: none; 414 display: none;
  415 +}
  416 +
  417 +#loading-container {
407 position: relative; 418 position: relative;
408 - height: 405px; 419 + height: 407px;
409 } 420 }
410 421
411 #render-loading img { 422 #render-loading img {
@@ -434,5 +445,5 @@ ul.rig.columns-4 li { @@ -434,5 +445,5 @@ ul.rig.columns-4 li {
434 } 445 }
435 446
436 #completed-all-task-msg { 447 #completed-all-task-msg {
437 - display: none; 448 + display: none;
438 } 449 }
439 \ No newline at end of file 450 \ No newline at end of file
view/assets/js/wikilibras.js
  Diff comments   View file @989206b
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 } 76 }
77 77
78 _changeImage(img, check_img_url); 78 _changeImage(img, check_img_url);
79 - $(".icon_container[name=" + option + "]").attr("complete", isCheck); 79 + $(".icon_container[name=" + option + "]" + panel).attr("complete", isCheck);
80 } 80 }
81 81
82 function _isSelectingState() { 82 function _isSelectingState() {
@@ -556,8 +556,9 @@ @@ -556,8 +556,9 @@
556 }); 556 });
557 } 557 }
558 558
559 - function _cleanGUI() { 559 + function _clearGUI() {
560 $(".selection-panel-option").removeAttr("select"); 560 $(".selection-panel-option").removeAttr("select");
  561 + $(".icon_container").removeAttr("select");
561 $(".icon_container[complete=true]").each( 562 $(".icon_container[complete=true]").each(
562 function() { 563 function() {
563 _unfinishConfiguration($(this).attr("name"), $(this).attr( 564 _unfinishConfiguration($(this).attr("name"), $(this).attr(
@@ -566,7 +567,7 @@ @@ -566,7 +567,7 @@
566 } 567 }
567 568
568 function _setupGUI(task, deferred) { 569 function _setupGUI(task, deferred) {
569 - _cleanGUI(); 570 + _clearGUI();
570 _setupConfigurationPanel(); 571 _setupConfigurationPanel();
571 _setupSelectionPanel(); 572 _setupSelectionPanel();
572 573
@@ -594,12 +595,17 @@ @@ -594,12 +595,17 @@
594 answer["status"] = "FINISHED"; 595 answer["status"] = "FINISHED";
595 answer["parameter_json"] = base_parameter_json; 596 answer["parameter_json"] = base_parameter_json;
596 597
597 - pybossa.saveTask(task.id, answer).done(function() { 598 + /*pybossa.saveTask(task.id, answer).done(function() {
598 setTimeout(function() { 599 setTimeout(function() {
599 $("#thanks-screen").hide(); 600 $("#thanks-screen").hide();
600 deferred.resolve(); 601 deferred.resolve();
601 }, 2500); 602 }, 2500);
602 - }); 603 + });*/
  604 +
  605 + setTimeout(function() {
  606 + $("#thanks-screen").hide();
  607 + deferred.resolve();
  608 + }, 2500);
603 } 609 }
604 610
605 function _showCompletedAllTaskMsg() { 611 function _showCompletedAllTaskMsg() {
view/facial-configuration.html
  Diff comments   View file @989206b
1 {% macro selectionPanel() -%} 1 {% macro selectionPanel() -%}
2 -<div id="facial-expression" class="selection-panel-body" panel="facial" name="expressao"> 2 +<div id="facial-expression" class="selection-panel-body" panel="facial"
  3 + name="expressao">
3 <div class="panel-header"> 4 <div class="panel-header">
4 <h8>Expressão</h8> 5 <h8>Expressão</h8>
5 </div> 6 </div>
6 <div class="selection-panel-inner-body"> 7 <div class="selection-panel-inner-body">
7 <ul class="rig columns-3"> 8 <ul class="rig columns-3">
8 <li><img class="selection-panel-option" 9 <li><img class="selection-panel-option"
9 - src="{{ server }}/img/exf/0000.png" value="0"/> 1.</li> 10 + src="{{ server }}/img/exf/0000.png" value="0" /> 1.</li>
10 <li><img class="selection-panel-option" 11 <li><img class="selection-panel-option"
11 - src="{{ server }}/img/exf/0001.png" value="1"/> 2.</li> 12 + src="{{ server }}/img/exf/0001.png" value="1" /> 2.</li>
12 <li><img class="selection-panel-option" 13 <li><img class="selection-panel-option"
13 - src="{{ server }}/img/exf/0002.png" value="2"/> 3.</li> 14 + src="{{ server }}/img/exf/0002.png" value="2" /> 3.</li>
14 <li><img class="selection-panel-option" 15 <li><img class="selection-panel-option"
15 - src="{{ server }}/img/exf/0003.png" value="3"/> 4.</li> 16 + src="{{ server }}/img/exf/0003.png" value="3" /> 4.</li>
16 <li><img class="selection-panel-option" 17 <li><img class="selection-panel-option"
17 - src="{{ server }}/img/exf/0004.png" value="4"/> 5.</li> 18 + src="{{ server }}/img/exf/0004.png" value="4" /> 5.</li>
18 <li><img class="selection-panel-option" 19 <li><img class="selection-panel-option"
19 - src="{{ server }}/img/exf/0005.png" value="5"/> 6.</li> 20 + src="{{ server }}/img/exf/0005.png" value="5" /> 6.</li>
20 <li><img class="selection-panel-option" 21 <li><img class="selection-panel-option"
21 - src="{{ server }}/img/exf/0006.png" value="6"/> 7.</li> 22 + src="{{ server }}/img/exf/0006.png" value="6" /> 7.</li>
22 <li><img class="selection-panel-option" 23 <li><img class="selection-panel-option"
23 - src="{{ server }}/img/exf/0007.png" value="7"/> 8.</li> 24 + src="{{ server }}/img/exf/0007.png" value="7" /> 8.</li>
24 <li><img class="selection-panel-option" 25 <li><img class="selection-panel-option"
25 - src="{{ server }}/img/exf/0008.png" value="8"/> 9.</li> 26 + src="{{ server }}/img/exf/0008.png" value="8" /> 9.</li>
26 <li><img class="selection-panel-option" 27 <li><img class="selection-panel-option"
27 - src="{{ server }}/img/exf/0009.png" value="9"/>10.</li> 28 + src="{{ server }}/img/exf/0009.png" value="9" />10.</li>
28 <li><img class="selection-panel-option" 29 <li><img class="selection-panel-option"
29 - src="{{ server }}/img/exf/0010.png" value="10"/>11.</li> 30 + src="{{ server }}/img/exf/0010.png" value="10" />11.</li>
30 <li><img class="selection-panel-option" 31 <li><img class="selection-panel-option"
31 - src="{{ server }}/img/exf/0011.png" value="11"/>12.</li> 32 + src="{{ server }}/img/exf/0011.png" value="11" />12.</li>
32 <li><img class="selection-panel-option" 33 <li><img class="selection-panel-option"
33 - src="{{ server }}/img/exf/0012.png" value="12"/>13.</li> 34 + src="{{ server }}/img/exf/0012.png" value="12" />13.</li>
34 <li><img class="selection-panel-option" 35 <li><img class="selection-panel-option"
35 - src="{{ server }}/img/exf/0013.png" value="13"/>14.</li> 36 + src="{{ server }}/img/exf/0013.png" value="13" />14.</li>
36 <li><img class="selection-panel-option" 37 <li><img class="selection-panel-option"
37 - src="{{ server }}/img/exf/0014.png" value="14"/>15.</li> 38 + src="{{ server }}/img/exf/0014.png" value="14" />15.</li>
38 <li><img class="selection-panel-option" 39 <li><img class="selection-panel-option"
39 - src="{{ server }}/img/exf/0015.png" value="15"/>16.</li> 40 + src="{{ server }}/img/exf/0015.png" value="15" />16.</li>
40 <li><img class="selection-panel-option" 41 <li><img class="selection-panel-option"
41 - src="{{ server }}/img/exf/0016.png" value="16"/>17.</li> 42 + src="{{ server }}/img/exf/0016.png" value="16" />17.</li>
42 <li><img class="selection-panel-option" 43 <li><img class="selection-panel-option"
43 - src="{{ server }}/img/exf/0017.png" value="17"/>18.</li> 44 + src="{{ server }}/img/exf/0017.png" value="17" />18.</li>
44 <li><img class="selection-panel-option" 45 <li><img class="selection-panel-option"
45 - src="{{ server }}/img/exf/0018.png" value="18"/>19.</li> 46 + src="{{ server }}/img/exf/0018.png" value="18" />19.</li>
46 <li><img class="selection-panel-option" 47 <li><img class="selection-panel-option"
47 - src="{{ server }}/img/exf/0019.png" value="19"/>20.</li> 48 + src="{{ server }}/img/exf/0019.png" value="19" />20.</li>
48 <li><img class="selection-panel-option" 49 <li><img class="selection-panel-option"
49 - src="{{ server }}/img/exf/0020.png" value="20"/>21.</li> 50 + src="{{ server }}/img/exf/0020.png" value="20" />21.</li>
50 </ul> 51 </ul>
51 </div> 52 </div>
52 </div> 53 </div>
@@ -55,28 +56,28 @@ @@ -55,28 +56,28 @@
55 <div class="panel-header"> 56 <div class="panel-header">
56 <h8>Velocidade de Transição</h8> 57 <h8>Velocidade de Transição</h8>
57 </div> 58 </div>
58 - <div class="expression-velocity-option">  
59 - <div class="velocity-option"> 59 + <div class="single-column-option-container">
  60 + <div class="single-column-option">
60 <img class="selection-panel-option" 61 <img class="selection-panel-option"
61 - src="{{ server }}/img/exf/0000.png" value="lento"/> 62 + src="{{ server }}/img/exf/0000.png" value="lento" />
62 </div> 63 </div>
63 - <img class="velocity-option" 64 + <img class="single-column-option"
64 src="{{ server }}/img/slow-velocity-icon.png" /> Lento 65 src="{{ server }}/img/slow-velocity-icon.png" /> Lento
65 </div> 66 </div>
66 - <div class="expression-velocity-option">  
67 - <div class="velocity-option"> 67 + <div class="single-column-option-container">
  68 + <div class="single-column-option">
68 <img class="selection-panel-option" 69 <img class="selection-panel-option"
69 - src="{{ server }}/img/exf/0000.png" value="normal"/> 70 + src="{{ server }}/img/exf/0000.png" value="normal" />
70 </div> 71 </div>
71 - <img class="velocity-option" 72 + <img class="single-column-option"
72 src="{{ server }}/img/normal-velocity-icon.png" /> Normal 73 src="{{ server }}/img/normal-velocity-icon.png" /> Normal
73 </div> 74 </div>
74 - <div class="expression-velocity-option">  
75 - <div class="velocity-option"> 75 + <div class="single-column-option-container">
  76 + <div class="single-column-option">
76 <img class="selection-panel-option" 77 <img class="selection-panel-option"
77 - src="{{ server }}/img/exf/0000.png" value="rapido"/> 78 + src="{{ server }}/img/exf/0000.png" value="rapido" />
78 </div> 79 </div>
79 - <img class="velocity-option" 80 + <img class="single-column-option"
80 src="{{ server }}/img/fast-velocity-icon.png" /> Rápido 81 src="{{ server }}/img/fast-velocity-icon.png" /> Rápido
81 </div> 82 </div>
82 </div> 83 </div>
@@ -85,34 +86,32 @@ @@ -85,34 +86,32 @@
85 <div class="panel-header"> 86 <div class="panel-header">
86 <h8>Duração da Expressão</h8> 87 <h8>Duração da Expressão</h8>
87 </div> 88 </div>
88 - <div class="expression-velocity-option">  
89 - <div class="velocity-option"> 89 + <div class="single-column-option-container">
  90 + <div class="single-column-option">
90 <img class="selection-panel-option" 91 <img class="selection-panel-option"
91 - src="{{ server }}/img/exf/0000.png" value="lento"/> 92 + src="{{ server }}/img/exf/0000.png" value="lento" />
92 </div> 93 </div>
93 - <img class="velocity-option" 94 + <img class="single-column-option"
94 src="{{ server }}/img/long-duration-icon.png" /> Longa 95 src="{{ server }}/img/long-duration-icon.png" /> Longa
95 </div> 96 </div>
96 - <div class="expression-velocity-option">  
97 - <div class="velocity-option"> 97 + <div class="single-column-option-container">
  98 + <div class="single-column-option">
98 <img class="selection-panel-option" 99 <img class="selection-panel-option"
99 - src="{{ server }}/img/exf/0000.png" value="normal"/> 100 + src="{{ server }}/img/exf/0000.png" value="normal" />
100 </div> 101 </div>
101 - <img class="velocity-option" 102 + <img class="single-column-option"
102 src="{{ server }}/img/normal-duration-icon.png" /> Normal 103 src="{{ server }}/img/normal-duration-icon.png" /> Normal
103 </div> 104 </div>
104 - <div class="expression-velocity-option">  
105 - <div class="velocity-option"> 105 + <div class="single-column-option-container">
  106 + <div class="single-column-option">
106 <img class="selection-panel-option" 107 <img class="selection-panel-option"
107 - src="{{ server }}/img/exf/0000.png" value="rapido"/> 108 + src="{{ server }}/img/exf/0000.png" value="rapido" />
108 </div> 109 </div>
109 - <img class="velocity-option" 110 + <img class="single-column-option"
110 src="{{ server }}/img/short-duration-icon.png" /> Breve 111 src="{{ server }}/img/short-duration-icon.png" /> Breve
111 </div> 112 </div>
112 </div> 113 </div>
113 -{%- endmacro %}  
114 -  
115 -{%- macro subconfigPanel() -%} 114 +{%- endmacro %} {%- macro subconfigPanel() -%}
116 <div id="facial-subconfiguration-options" 115 <div id="facial-subconfiguration-options"
117 class="subconfiguration-options col-sm-10"> 116 class="subconfiguration-options col-sm-10">
118 <div class="icon_container" name="facial-expression" 117 <div class="icon_container" name="facial-expression"
view/hand-configuration.html
  Diff comments   View file @989206b
@@ -14,7 +14,8 @@ @@ -14,7 +14,8 @@
14 <div class="selection-panel-inner-body"> 14 <div class="selection-panel-inner-body">
15 <ul class="rig columns-2"> 15 <ul class="rig columns-2">
16 <li><img class="selection-panel-option" 16 <li><img class="selection-panel-option"
17 - src="{{ server }}/img/exf/0000.png" value="pontual"/>Pontual</li> 17 + src="{{ server }}/img/mov/CALAR.gif" value="pontual"/>Pontual</li>
  18 + <!--
18 <li><img class="selection-panel-option" 19 <li><img class="selection-panel-option"
19 src="{{ server }}/img/exf/0000.png" value="retilineo"/>Retilíneo</li> 20 src="{{ server }}/img/exf/0000.png" value="retilineo"/>Retilíneo</li>
20 <li><img class="selection-panel-option" 21 <li><img class="selection-panel-option"
@@ -27,6 +28,7 @@ @@ -27,6 +28,7 @@
27 src="{{ server }}/img/exf/0000.png" value="senoidal"/>Curvas</li> 28 src="{{ server }}/img/exf/0000.png" value="senoidal"/>Curvas</li>
28 <li><img class="selection-panel-option" 29 <li><img class="selection-panel-option"
29 src="{{ server }}/img/exf/0000.png" value="contato"/>Contato</li> 30 src="{{ server }}/img/exf/0000.png" value="contato"/>Contato</li>
  31 + -->
30 </ul> 32 </ul>
31 </div> 33 </div>
32 </div> 34 </div>
view/img/mov/CALAR.gif 0 → 100644
View file @989206b

469 KB
view/img/mov/CALAR_old.gif 0 → 100644
View file @989206b

567 KB
view/template.html
  Diff comments   View file @989206b
@@ -167,7 +167,9 @@ import &#39;facial-configuration.html&#39; as facialConfig with context %} @@ -167,7 +167,9 @@ import &#39;facial-configuration.html&#39; as facialConfig with context %}
167 <h6> 167 <h6>
168 Gerando o sinal "<span class="sign-label"></span>" 168 Gerando o sinal "<span class="sign-label"></span>"
169 </h6> 169 </h6>
170 - <img src="{{ server }}/img/loading.gif"> 170 + <div id="loading-container" class="video-border">
  171 + <img src="{{ server }}/img/loading.gif">
  172 + </div>
171 </div> 173 </div>
172 </div> 174 </div>
173 </div> 175 </div>
view/videos/CALAR_REF.webm 0 → 100644
View file @989206b
No preview for this file type
@@ -25,7 +25,8 @@ class Wikilibras: @@ -25,7 +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"] 28 + #test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"]
  29 + test_signs = ["CALAR"]
29 for sign in test_signs: 30 for sign in test_signs:
30 task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) 31 task = dict(sign_name=sign, submission_date=pyutil.get_date_now())
31 pbclient.create_task(project.id, task) 32 pbclient.create_task(project.id, task)