Browse Source

Merge pull request #2209 from aragonc/1.11.x

fix css documents load
Alex Aragon Calixto 7 years ago
parent
commit
57e90405be

+ 26 - 0
app/Resources/public/css/base.css

@@ -6178,6 +6178,32 @@ ul#toolnavbox-two li a.btn{
     position: relative;
     top: -30px;
 }
+a.panel-image:hover{
+    background-color: #f5f5f5;
+}
+a.panel-image{
+    display: inline-block;
+    width: 100%;
+    border: 1px solid #DDD;
+    padding: 15px;
+    border-radius: 5px;
+}
+.files .panel-image .row{
+    margin-bottom: 0;
+}
+.file_name a{
+    color: #333;
+    font-size: 12px;
+    font-weight: bold;
+    display: inline-block;
+    padding-top: 15px;
+}
+.message-image-success,
+.message-image-danger{
+    display: inline-block;
+    width: 100%;
+    padding-top: 15px;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {

+ 6 - 6
main/inc/lib/formvalidator/FormValidator.class.php

@@ -1645,12 +1645,12 @@ EOT;
                 // which actually support image resizing, but fail to
                 // send Blob objects via XHR requests:
                 disableImageResize: /Android(?!.*Chrome)|Opera/.test(window.navigator.userAgent),
-                previewMaxWidth: 100,
-                previewMaxHeight: 100,
+                previewMaxWidth: 50,
+                previewMaxHeight: 50,
                 previewCrop: true,
                 dropzone: $('#dropzone'),                                
             }).on('fileuploadadd', function (e, data) {
-                data.context = $('<div class=\"row\" style=\"margin-bottom:35px\" />').appendTo('#files');
+                data.context = $('<div class=\"row\" />').appendTo('#files');
                 $.each(data.files, function (index, file) {
                     var node = $('<div class=\"col-sm-5 file_name\">').text(file.name);                    
                     node.appendTo(data.context);
@@ -1683,15 +1683,15 @@ EOT;
                 $.each(data.result.files, function (index, file) {
                     if (file.url) {
                         var link = $('<a>')
-                            .attr('target', '_blank')
+                            .attr({target: '_blank', class : 'panel-image'})
                             .prop('href', file.url);
                         $(data.context.children()[index]).parent().wrap(link);
                         // Update file name with new one from Chamilo
                         $(data.context.children()[index]).parent().find('.file_name').html(file.name);                        
-                        var successMessage = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-success\"/>').text('".addslashes(get_lang('UplUploadSucceeded'))."'));
+                        var successMessage = $('<div class=\"col-sm-3\">').html($('<span class=\"message-image-success\"/>').text('".addslashes(get_lang('UplUploadSucceeded'))."'));
                         $(data.context.children()[index]).parent().append(successMessage);                    
                     } else if (file.error) {
-                        var error = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-danger\"/>').text(file.error));
+                        var error = $('<div class=\"col-sm-3\">').html($('<span class=\"message-image-danger\"/>').text(file.error));
                         $(data.context.children()[index]).parent().append(error);                        
                     }
                 });