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

composer.json

@@ -103,7 +103,7 @@
         "phpoffice/phpword": "^0.12.1",
         "facebook/php-sdk-v4" : "~5.0",
         "kigkonsult/icalcreator" : "0.1.0",
-        "essence/essence": "2.6.0",
+        "essence/essence": "2.6.1",
         "pclzip/pclzip": "2.8.2"
     },
     "require-dev": {

main/template/default/skill/badge_create.tpl

@@ -652,6 +652,14 @@
                                                                 <option value="youtube-square">Youtube (Square)</option>
                                                             </select>
                                                         </p>
+                                                        <h3 class="label"><label for="size-glyph">{{ "Size" | get_lang }}</label></h3>
+                                                        <p class="item">
+                                                            <select name="size-glyph" class="form-control" id="size-glyph">
+                                                                <option value="200">200 %</option>
+                                                                <option value="100" selected>100 %</option>
+                                                                <option value="50">50 %</option>
+                                                            </select>
+                                                        </p>
                                                     </div>
                                                     <div class="col-md-12 text-center">
                                                         <a id="set-custom-badge" class="btn btn-primary"><em class="fa fa-check"></em> {{ 'UseThisBadge' | get_lang }}</a>
@@ -737,11 +745,17 @@
 {{ badge_studio.script_js }}
 <script>
     $(document).ready(function() {
-      $('#set-custom-badge').click(function () {
-          var data = $('#raster').attr('src');
-          $('#badge_studio_image').val(data);
-          $('#badge-preview').attr('src', data);
-          $('#badge-container').removeClass('hide');
-      });
+        $('#set-custom-badge').click(function () {
+            var data = $('#raster').attr('src');
+            $('#badge_studio_image').val(data);
+            $('#badge-preview').attr('src', data);
+            $('#badge-container').removeClass('hide');
+        });
+
+        $('#size-glyph').change(function () {
+            window.size = parseInt($(this).val());
+            updateGlyph();
+        });
+
     })
 </script>