Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW Popup for preview of image add a button "Original size"

Browse Source
This commit is contained in:
Laurent Destailleur
2017-08-22 13:14:10 +02:00
parent 927da89c89
commit 5cf684f5a2
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/core/js/lib_head.js.php
View File

@@ -983,6 +983,8 @@ function newpopup(url,title) {
function document_preview(file, type, title)
{
var ValidImageTypes = ["image/gif", "image/jpeg", "image/png"];
var showOriginalSizeButton = false;
console.log("document_preview A click was done. file="+file+", type="+type+", title="+title);
if ($.inArray(type, ValidImageTypes) < 0) {
@@ -991,7 +993,7 @@ function document_preview(file, type, title)
var height = $( window ).height()*0.90;
var object_height='98%';
show_preview();
show_preview('notimage');
} else {
var object_width=0;
@@ -1005,23 +1007,38 @@ function document_preview(file, type, title)
width = $( window ).width()*0.90;
if(object_width < width){
console.log("Object width is small, we set width of popup according to image width.");
width = object_width + 30
}
height = $( window ).height()*0.85;
if(object_height < height){
console.log("Object height is small, we set height of popup according to image height.");
height = object_height + 80
}
else
{
showOriginalSizeButton = true;
}
show_preview();
show_preview('image');
};
img.src = file;
}
function show_preview(){
/* console.log("file="+file+" type="+type+" width="+width+" height="+height); */
function show_preview(mode) {
console.log("mode="+mode+" file="+file+" type="+type+" width="+width+" height="+height);
var newElem = '<object name="objectpreview" data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'" param="noparam"></object>';
optionsbuttons = {}
if (mode == 'image' && showOriginalSizeButton)
{
optionsbuttons = {
"<?php echo dol_escape_js($langs->trans("OriginalSize")); ?>": function() { console.log("Click on original size"); jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "none" }); },
"<?php echo dol_escape_js($langs->trans("Close")); ?>": function() { $( this ).dialog( "close" ); }
};
}
$("#dialogforpopup").html(newElem);
$("#dialogforpopup").dialog({
closeOnEscape: true,
@@ -1029,8 +1046,14 @@ function document_preview(file, type, title)
width: width,
height: height,
modal: true,
title: title
title: title,
buttons: optionsbuttons
});
if (showOriginalSizeButton)
{
jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "100%", "width": "auto", "margin-left": "auto", "margin-right": "auto", "display": "block" });
}
}
}

1
htdocs/langs/en_US/main.lang
View File

@@ -460,6 +460,7 @@ Discount=Discount
Unknown=Unknown
General=General
Size=Size
OriginalSize=Original size
Received=Received
Paid=Paid
Topic=Subject

13
htdocs/theme/eldy/style.css.php
View File

@@ -3148,6 +3148,19 @@ div.titre {
font-size: <?php print $fontsize; ?>px !important;
}
/* ============================================================================== */
/* For content of image preview */
/* ============================================================================== */
/*
.ui-dialog-content.ui-widget-content > object {
max-height: none;
width: auto; margin-left: auto; margin-right: auto; display: block;
}
*/
/* ============================================================================== */
/* Formulaire confirmation (When HTML is used) */
/* ============================================================================== */