Merge branch 'gh-pages' into develop
* gh-pages: Update bookmarklet.js Update bookmarklet.js add task icon cleanup logging no message
This commit is contained in:
commit
d29739acef
@ -143,7 +143,7 @@
|
|||||||
global.appFunctions.getCardData(issueKey, function(cardData) {
|
global.appFunctions.getCardData(issueKey, function(cardData) {
|
||||||
//console.log("cardData: " + cardData);
|
//console.log("cardData: " + cardData);
|
||||||
if (global.isProd) {
|
if (global.isProd) {
|
||||||
ga('send', 'event', 'task', 'generate', 'card', cardData.type);
|
ga('send', 'event', 'card', 'generate', cardData.type);
|
||||||
}
|
}
|
||||||
fillCard(page, cardData);
|
fillCard(page, cardData);
|
||||||
page.show();
|
page.show();
|
||||||
@ -264,16 +264,12 @@
|
|||||||
var printWindow = printFrame[0].contentWindow;
|
var printWindow = printFrame[0].contentWindow;
|
||||||
var printDocument = printWindow.document;
|
var printDocument = printWindow.document;
|
||||||
|
|
||||||
|
|
||||||
var columnCount = jQuery("#columnCount").val();
|
var columnCount = jQuery("#columnCount").val();
|
||||||
var rowCount = jQuery("#rowCount").val();
|
var rowCount = jQuery("#rowCount").val();
|
||||||
|
|
||||||
var cardCount = jQuery(".card", printDocument).length;
|
var cardCount = jQuery(".card", printDocument).length;
|
||||||
var pageCount = Math.ceil(cardCount / (columnCount * rowCount))
|
var pageCount = Math.ceil(cardCount / (columnCount * rowCount))
|
||||||
|
|
||||||
console.log("cardCount: "+cardCount);
|
|
||||||
console.log("pageCount: "+pageCount);
|
|
||||||
|
|
||||||
// size
|
// size
|
||||||
|
|
||||||
// size horizontal
|
// size horizontal
|
||||||
@ -301,18 +297,13 @@
|
|||||||
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;
|
||||||
console.log("cardMaxWidth: "+cardMaxWidth);
|
|
||||||
console.log("cardMinWidth: "+cardMinWidth);
|
|
||||||
console.log("scaleWidth: "+scaleWidth);
|
|
||||||
|
|
||||||
// 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
|
||||||
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;
|
||||||
console.log("cardMaxHeight: "+cardMaxHeight);
|
|
||||||
console.log("cardMinHeight: "+cardMinHeight);
|
|
||||||
console.log("scaleHeight: "+scaleHeight);
|
|
||||||
|
|
||||||
// scale min
|
// scale min
|
||||||
var scale = Math.min(scaleWidth, scaleHeight, 1);
|
var scale = Math.min(scaleWidth, scaleHeight, 1);
|
||||||
@ -363,7 +354,7 @@
|
|||||||
<div id="card-print-dialog-header">
|
<div id="card-print-dialog-header">
|
||||||
<div id="card-print-dialog-title">Card Print</div>
|
<div id="card-print-dialog-title">Card Print</div>
|
||||||
<div id="info">
|
<div id="info">
|
||||||
<label id="info-line">Jira - PivotalTracker - Trello - YouTrack</label>
|
<label id="info-line">Card Printer supports... <b>Jira</b> - <b>PivotalTracker</b> - <b>Trello</b> - <b>YouTrack</b></label>
|
||||||
<input id="report-issue" type="button" class="aui-button" value="Report Issues" />
|
<input id="report-issue" type="button" class="aui-button" value="Report Issues" />
|
||||||
<input id="about" type="button" class="aui-button" value="About" />
|
<input id="about" type="button" class="aui-button" value="About" />
|
||||||
</div>
|
</div>
|
||||||
@ -577,7 +568,6 @@
|
|||||||
#info-line {
|
#info-line {
|
||||||
padding-left: 3rem;
|
padding-left: 3rem;
|
||||||
padding-right: 3rem;
|
padding-right: 3rem;
|
||||||
font-weight: bold;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#card-print-dialog-title{
|
#card-print-dialog-title{
|
||||||
@ -772,6 +762,10 @@
|
|||||||
background-color: ROYALBLUE !important;
|
background-color: ROYALBLUE !important;
|
||||||
background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Flash.png);
|
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 {
|
.issue-estimate {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 2.5rem;
|
left: 2.5rem;
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
BIN
resources/icons/Task.png
Normal file
BIN
resources/icons/Task.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
Loading…
x
Reference in New Issue
Block a user