Merge pull request #1238 from jloguercio/1.11.x

Fix work correction small ui
remotes/angel/1.11.x
José Loguercio 9 years ago committed by GitHub
commit 570b500f49
  1. 1
      main/inc/lib/api.lib.php
  2. 12
      main/work/work.lib.php

@ -6455,6 +6455,7 @@ function api_get_jquery_libraries_js($libraries) {
$js .= api_get_asset('blueimp-canvas-to-blob/js/canvas-to-blob.min.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.iframe-transport.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.fileupload.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-ui.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-process.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-image.js');
$js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-audio.js');

@ -2025,14 +2025,15 @@ function get_work_user_list(
$correction = '
<form
id="file_upload_'.$item_id.'"
class="work_correction_file_upload file_upload_small"
class="work_correction_file_upload file_upload_small fileinput-button"
action="'.api_get_path(WEB_AJAX_PATH).'work.ajax.php?'.api_get_cidreq().'&a=upload_correction_file&item_id='.$item_id.'" method="POST" enctype="multipart/form-data"
>
<div class="button-load">
<div class="text-center button-load">
'.get_lang('ClickOrDropOneFileHere').'
'.Display::return_icon('upload_file.png', get_lang('Correction'), [], ICON_SIZE_TINY).'
</div>
<input type="file" name="file" multiple>
<button type="submit"></button>
<input type="file" name="file" class="" multiple>
</form>
';
@ -2043,8 +2044,7 @@ function get_work_user_list(
downloadTable: $('.files'),
buildUploadRow: function (files, index) {
$('.files').show();
return
$('<tr><td>' + files[index].name + '<\/td>' +
return $('<tr><td>' + files[index].name + '<\/td>' +
'<td class=\"file_upload_progress\"><div><\/div><\/td>' +
'<td class=\"file_upload_cancel\">' +
'<button class=\"ui-state-default ui-corner-all\" title=\"".get_lang('Cancel')."\">' +

Loading…
Cancel
Save