Añadiendo presentación. Cambiando estructura

Rafaherrero · Jun 17, 2017 · b6679db · b6679db
1 parent 4b39029
commit b6679db
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 4 deletions.
diff --git a/code/js/myjs.js b/code/js/myjs.js
@@ -2,7 +2,7 @@ const loadJsonFile = require('load-json-file');
 
 //Variable to control the loading of json files
 //This variable has to set to false when packaging
-var desarrollo = false;
+var desarrollo = true;
 
 $(window).on('resize', function(){
     if (($(window).width() <= 1200)||($(window).height() <= 700)){

diff --git a/code/json/template_exercise.json b/code/json/template_exercise.json
@@ -10,11 +10,15 @@
     "english_language":[
         {
             "title": "Exercise x: ",
-           "description_game": "",
+            "description_game": "",
             "goal": "",
             "text_1": ""
         }
     ],
     "blocks":[""],
     "value": "levelx_exercisey"
-}
+}
+
+
+
+
diff --git a/pres/Makefile → pres/LaTeX/Makefile b/pres/Makefile → pres/LaTeX/Makefile
diff --git a/pres/img/etsii.eps → pres/LaTeX/img/etsii.eps b/pres/img/etsii.eps → pres/LaTeX/img/etsii.eps
diff --git a/pres/img/figura1.eps → pres/LaTeX/img/figura1.eps b/pres/img/figura1.eps → pres/LaTeX/img/figura1.eps
diff --git a/pres/img/ullesc.eps → pres/LaTeX/img/ullesc.eps b/pres/img/ullesc.eps → pres/LaTeX/img/ullesc.eps
diff --git a/pres/slides.pdf → pres/LaTeX/slides.pdf b/pres/slides.pdf → pres/LaTeX/slides.pdf
diff --git a/pres/slides.tex → pres/LaTeX/slides.tex b/pres/slides.tex → pres/LaTeX/slides.tex
diff --git a/pres/tables/table.tex → pres/LaTeX/tables/table.tex b/pres/tables/table.tex → pres/LaTeX/tables/table.tex
diff --git a/pres/Presentacion.pptx b/pres/Presentacion.pptx
diff --git a/tareas/README.md b/tareas/README.md