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:
Bengt Brodersen 2015-06-07 12:57:43 +02:00
commit d29739acef
3 changed files with 7 additions and 13 deletions

View File

@ -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 @@
<div id="card-print-dialog-header">
<div id="card-print-dialog-title">Card Print</div>
<div id="info">
<label id="info-line">Jira - PivotalTracker - Trello - YouTrack</label>
<label id="info-line">Card Printer supports...&nbsp;&nbsp;&nbsp;<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="about" type="button" class="aui-button" value="About" />
</div>
@ -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;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
resources/icons/Task.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB