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

main/auth/profile.php

@@ -79,6 +79,20 @@ $(document).ready(function() {
         $cropButton.addClass("hidden");
         return false;
     });
+
+    $(\'#id_generate_api_key\').on(\'click\', function (e) {
+        e.preventDefault();
+
+        $.ajax({
+            contentType: "application/x-www-form-urlencoded",
+            type: "POST",
+            url: "'.api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=generate_api_key",
+            data: "num_key_id="+"",
+            success: function(datos) {
+                $("#div_api_key").html(datos);
+            }
+        });
+    });
 });
 
 function confirmation(name) {
@@ -94,19 +108,6 @@ function show_image(image,width,height) {
     window_x = window.open(image,\'windowX\',\'width=\'+ width + \', height=\'+ height + \'\');
 
 }
-function generate_open_id_form() {
-    $.ajax({
-        contentType: "application/x-www-form-urlencoded",
-        beforeSend: function(objeto) {
-        /*$("#div_api_key").html("Loading...");*/ },
-        type: "POST",
-        url: "'.api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=generate_api_key",
-        data: "num_key_id="+"",
-        success: function(datos) {
-         $("#div_api_key").html(datos);
-        }
-    });
-}
 
 function hide_icon_edit(element_html)  {
     ident="#edit_image";
@@ -404,15 +405,15 @@ if (api_get_setting('profile', 'apikeys') == 'true') {
         array('size' => 40, 'id' => 'id_api_key_generate')
     );
     $form->addElement('html', '</div>');
-    $form->addElement(
+    $form->addButton(
-        'button',
         'generate_api_key',
         get_lang('GenerateApiKey'),
-        array(
+        'cogs',
-            'id' => 'id_generate_api_key',
+        'default',
-            'onclick' => 'generate_open_id_form(); return false;',
+        'default',
-        )
+        null,
-    ); //generate_open_id_form()
+        ['id' => 'id_generate_api_key']
+    );
 }
 //    SUBMIT
 if (is_profile_editable()) {

main/inc/ajax/user_manager.ajax.php

@@ -95,10 +95,10 @@ switch ($action) {
             $num = UserManager::update_api_key($user_id, $api_service);
             $array_list_key = UserManager::get_api_keys($user_id, $api_service);
             ?>
-            <div class="row">
+            <div class="form-group">
-                <div class="label"><?php echo get_lang('MyApiKey'); ?></div>
+                <label class="col-sm-2 control-label"><?php echo get_lang('MyApiKey'); ?></label>
-                <div class="formw">
+                <div class="col-sm-8">
-                <input type="text" name="api_key_generate" id="id_api_key_generate" size="40" value="<?php echo $array_list_key[$num]; ?>"/>
+                    <input type="text" name="api_key_generate" id="id_api_key_generate" class="form-control" value="<?php echo $array_list_key[$num]; ?>"/>
                 </div>
             </div>
             <?php