Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

main/admin/skills.php

@@ -18,6 +18,7 @@ if (api_get_setting('allow_skills_tool') != 'true') {
 
 //Adds the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_js('jquery.jsPlumb.all.js');
+$htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');
 $htmlHeadXtra[] = api_get_js('skills.js');
 
 $skill  = new Skill();

main/exercice/admin.php

@@ -336,6 +336,7 @@ function multiple_answer_true_false_onchange(variable) {
 
 </script>';
 
+$htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');
 $htmlHeadXtra[] = api_get_js('jquery.jsPlumb.all.js');
 
 $template = new Template();

main/exercice/exercise_submit.php

@@ -50,6 +50,7 @@ if ($showGlossary) {
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
 
+$htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');
 $htmlHeadXtra[] = api_get_js('jquery.jsPlumb.all.js');
 $htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 

main/inc/lib/javascript/jqueryui-touch-punch/jquery.ui.touch-punch.min.js

@@ -0,0 +1,11 @@
+/*!
+ * jQuery UI Touch Punch 0.2.3
+ *
+ * Copyright 2011–2014, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);

main/lang/english/trad4all.inc.php

@@ -7565,4 +7565,6 @@ $SkillAcquiredAt = "Skill acquired at";
 $BasicSkills = "Basic skills";
 $TimeXThroughCourseY = "<strong>%s</strong> through <em>%s</em>";
 $ExportBadge = "Export badge";
+$SelectToSearch = "Select to search";
+$PlaceOnTheWheel = "Place on the wheel";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -7590,4 +7590,6 @@ $SkillAcquiredAt = "Competencia adquirida el";
 $BasicSkills = "Competencias simples";
 $TimeXThroughCourseY = "%s en el curso %s";
 $ExportBadge = "Exportar la insignia";
+$SelectToSearch = "Seleccionar para buscar";
+$PlaceOnTheWheel = "Ubicar en la rueda";
 ?>

main/social/skills_tree.php

@@ -18,6 +18,7 @@ if (api_get_setting('allow_skills_tool') != 'true') {
 
 //Adds the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
+$htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');
 $htmlHeadXtra[] = api_get_js('jquery.jsPlumb.all.js');
 $htmlHeadXtra[] = api_get_js('skills.js');