diff --git a/bookmarklet.js b/bookmarklet.js index ca504d3..72a3cc7 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -143,7 +143,7 @@ global.appFunctions.getCardData(issueKey, function(cardData) { //console.log("cardData: " + cardData); if (global.isProd) { - ga('send', 'event', 'task', 'generate', 'card', cardData.type); + ga('send', 'event', 'card', 'generate', cardData.type); } fillCard(page, cardData); page.show(); @@ -264,16 +264,12 @@ var printWindow = printFrame[0].contentWindow; var printDocument = printWindow.document; - var columnCount = jQuery("#columnCount").val(); var rowCount = jQuery("#rowCount").val(); var cardCount = jQuery(".card", printDocument).length; var pageCount = Math.ceil(cardCount / (columnCount * rowCount)) - console.log("cardCount: "+cardCount); - console.log("pageCount: "+pageCount); - // size // size horizontal @@ -301,18 +297,13 @@ var cardMaxWidth = Math.floor(jQuery(".card", printDocument).outerWidth() / columnCount) ; var cardMinWidth = jQuery(".card", printDocument).css("min-width").replace("px", "") ; var scaleWidth = cardMaxWidth / cardMinWidth; - console.log("cardMaxWidth: "+cardMaxWidth); - console.log("cardMinWidth: "+cardMinWidth); - console.log("scaleWidth: "+scaleWidth); // scale vertical // substract one pixel due to rounding problems + // dont know why to multiply outer height with 2 var cardMaxHeight = Math.floor(jQuery(".card", printDocument).outerHeight() * 2 / rowCount) ; var cardMinHeight = jQuery(".card", printDocument).css("min-height").replace("px", "") ; var scaleHeight = cardMaxHeight / cardMinHeight; - console.log("cardMaxHeight: "+cardMaxHeight); - console.log("cardMinHeight: "+cardMinHeight); - console.log("scaleHeight: "+scaleHeight); // scale min var scale = Math.min(scaleWidth, scaleHeight, 1); @@ -363,7 +354,7 @@
Card Print
- +
@@ -577,7 +568,6 @@ #info-line { padding-left: 3rem; padding-right: 3rem; - font-weight: bold; } #card-print-dialog-title{ @@ -772,6 +762,10 @@ background-color: ROYALBLUE !important; background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Flash.png); } + .issue-icon[type="task"] { + background-color: ORANGE !important; + background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Task.png); + } .issue-estimate { position: absolute; left: 2.5rem; diff --git a/resources/ZigZag.png b/resources/ZigZag.png deleted file mode 100644 index 3cba690..0000000 Binary files a/resources/ZigZag.png and /dev/null differ diff --git a/resources/icons/Task.png b/resources/icons/Task.png new file mode 100644 index 0000000..23f4233 Binary files /dev/null and b/resources/icons/Task.png differ