Merge branch 'gh-pages' into develop

This commit is contained in:
Bengt Brodersen 2015-11-30 13:25:54 +01:00
commit 2f3db25d4d
3 changed files with 31 additions and 13 deletions

View File

@ -6,7 +6,7 @@
// YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard
var global = {}; var global = {};
global.version = "4.3.0"; global.version = "4.3.2";
global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer";
global.isDev = document.currentScript == null; global.isDev = document.currentScript == null;
global.isProd = !global.isDev; global.isProd = !global.isDev;
@ -353,7 +353,14 @@
var printDocument = printWindow.document; var printDocument = printWindow.document;
var settings = global.settings; var settings = global.settings;
var scaleRoot = settings.scale;
var scaleRoot;
if(settings.scale < 0) {
scaleRoot = 1.0 / (1.0 - (settings.scale * 2.0));
} else {
scaleRoot = 1.0 * (1.0 + (settings.scale * 2.0));
}
var rowCount = settings.rowCount; var rowCount = settings.rowCount;
var columnCount = settings.colCount; var columnCount = settings.colCount;
@ -378,10 +385,11 @@
var scaleHeight = cardMaxHeight / cardMinHeight ; var scaleHeight = cardMaxHeight / cardMinHeight ;
var scale = Math.min(scaleWidth, scaleHeight, 1); var scale = Math.min(scaleWidth, scaleHeight, 1);
// scale down only console.log("scaleRoot: " + scaleRoot + " scale: " + scale);
if (scale < 1) { console.log("scaleWidth: " + scaleWidth + " scaleHeight: " + scaleHeight);
// scale
jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm");
}
// size // size
@ -389,14 +397,14 @@
var style = document.createElement('style'); var style = document.createElement('style');
style.id = 'styleColumnCount'; style.id = 'styleColumnCount';
style.type = 'text/css'; style.type = 'text/css';
style.innerHTML = ".card { width: calc( 100% / " + columnCount + " - 0.001px ); }" style.innerHTML = ".card { width: calc( 100% / " + columnCount + " ); }"
jQuery("head", printDocument).append(style); jQuery("head", printDocument).append(style);
// size horizontal // size horizontal
var style = document.createElement('style'); var style = document.createElement('style');
style.id = 'styleRowCount'; style.id = 'styleRowCount';
style.type = 'text/css'; style.type = 'text/css';
style.innerHTML = ".card { height: calc( 100% / " + rowCount + " - 0.001px ); }" style.innerHTML = ".card { height: calc( 100% / " + rowCount + " ); }"
jQuery("head", printDocument).append(style); jQuery("head", printDocument).append(style);
} }

View File

@ -73,10 +73,20 @@ body {
width: 100%; width: 100%;
padding: 0.5rem; padding: 0.5rem;
min-width: 14.5rem; min-width: 14.5rem;
min-height: 12.5rem; min-height: 8.65rem;
overflow: visible;
}
.card::after {
overflow: visible;
position: absolute;
top: 0rem;
left: 0rem;
content: "";
width: calc(100% - 0.06cm);
height: calc(100% - 0.06cm);
border-color: LightGray; border-color: LightGray;
border-style: dotted; border-style: dashed;
border-width: 0.03cm; border-width: 0.06cm;
} }
.card-content { .card-content {
position: relative; position: relative;

View File

@ -18,7 +18,7 @@
<div style="float: left; margin-left: 5px; margin-right: 5px;">x</div> <div style="float: left; margin-left: 5px; margin-right: 5px;">x</div>
<div style="float: left; display: inline;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="2"/>Page Grid</div> <div style="float: left; display: inline;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="2"/>Page Grid</div>
</div> </div>
<div style="float: left; margin-right:10px; padding-right: 3px; display: inline; -webkit-appearance: default"><input id="font-scale-range" type="range" min="0.5" max="2.0" step="0.01" value="1.0" style="width: 80px; position: relative; top: 2px; margin-right:5px;" />Scale</div> <div style="float: left; margin-right:10px; padding-right: 3px; display: inline; -webkit-appearance: default"><input id="font-scale-range" type="range" min="-1.0" max="1.0" step="0.01" value="0.0" style="width: 80px; position: relative; top: 2px; margin-right:5px;" />Scale</div>
<div style="float: left; margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</div> <div style="float: left; margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</div>
<div style="float: left; margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</div> <div style="float: left; margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</div>
<div style="float: left; margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</div> <div style="float: left; margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</div>