Merge branch 'develop' into gh-pages

This commit is contained in:
Bengt Brodersen 2015-11-24 18:00:51 +01:00
commit e77c5fecc4

View File

@ -85,9 +85,9 @@
jQuery("#hide-due-date-checkbox").attr('checked', readCookie("card_printer_hide_due_date", 'false') == 'true'); jQuery("#hide-due-date-checkbox").attr('checked', readCookie("card_printer_hide_due_date", 'false') == 'true');
jQuery("#hide-status-checkbox").attr('checked', readCookie("card_printer_hide_status", 'true') == 'true'); jQuery("#hide-status-checkbox").attr('checked', readCookie("card_printer_hide_status", 'true') == 'true');
jQuery("#card-print-dialog-title").text("Card Printer - Loading issues..."); jQuery("#card-print-dialog-title").text("Card Printer " + version + " - Loading issues...");
renderCards(issueKeyList, function() { renderCards(issueKeyList, function() {
jQuery("#card-print-dialog-title").text("Card Printer"); jQuery("#card-print-dialog-title").text("Card Printer " + version);
//print(); //print();
}); });
@ -322,14 +322,14 @@
// substract one pixel due to rounding problems // substract one pixel due to rounding problems
var cardMaxWidth = Math.floor(jQuery(".card", printDocument).outerWidth() / columnCount); var cardMaxWidth = Math.floor(jQuery(".card", printDocument).outerWidth() / columnCount);
var cardMinWidth = jQuery(".card", printDocument).css("min-width").replace("px", ""); var cardMinWidth = jQuery(".card", printDocument).css("min-width").replace("px", "");
var scaleWidth = cardMaxWidth / cardMinWidth; var scaleWidth = cardMaxWidth / cardMinWidth - (columnCount * 0.02);
// scale vertical // scale vertical
// substract one pixel due to rounding problems // substract one pixel due to rounding problems
// dont know why to multiply outer height with 2 // dont know why to multiply outer height with 2
var cardMaxHeight = Math.floor(jQuery(".card", printDocument).outerHeight() * 2 / rowCount); var cardMaxHeight = Math.floor(jQuery(".card", printDocument).outerHeight() * 2 / rowCount);
var cardMinHeight = jQuery(".card", printDocument).css("min-height").replace("px", ""); var cardMinHeight = jQuery(".card", printDocument).css("min-height").replace("px", "");
var scaleHeight = cardMaxHeight / cardMinHeight; var scaleHeight = cardMaxHeight / cardMinHeight - (rowCount * 0.02);
// scale down // scale down
var scale = Math.min(scaleWidth, scaleHeight, 1); var scale = Math.min(scaleWidth, scaleHeight, 1);