yvan/jira-card-printer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into gh-pages

Browse Source
This commit is contained in:
Bengt Brodersen 2015-11-30 16:31:01 +01:00
commit 542504f4ca
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bookmarklet.js
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.2"; global.version = "4.3.3";
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;
@ -91,7 +91,8 @@
var settings = global.settings; var settings = global.settings;
// restore UI state // restore UI state
jQuery("#font-scale-range").val(settings.scale); jQuery("#scaleRange").val(settings.scale);
jQuery("#scaleRange").parent().find("output").val(settings.scale);
jQuery("#rowCount").val(settings.rowCount); jQuery("#rowCount").val(settings.rowCount);
jQuery("#columnCount").val(settings.colCount); jQuery("#columnCount").val(settings.colCount);
@ -152,18 +153,19 @@
function saveSettings(){ function saveSettings(){
var settings = global.settings; var settings = global.settings;
writeCookie("card_printer_scale", settings.scale);
writeCookie("card_printer_row_count", settings.rowCount);
writeCookie("card_printer_column_count", settings.colCount);
writeCookie("card_printer_single_card_page", settings.singleCardPage); writeCookie("card_printer_single_card_page", settings.singleCardPage);
writeCookie("card_printer_hide_description", settings.hideDescription); writeCookie("card_printer_hide_description", settings.hideDescription);
writeCookie("card_printer_hide_assignee", settings.hideAssignee); writeCookie("card_printer_hide_assignee", settings.hideAssignee);
writeCookie("card_printer_hide_due_date", settings.hideDueDate); writeCookie("card_printer_hide_due_date", settings.hideDueDate);
writeCookie("card_printer_font_scale", settings.scale);
writeCookie("card_printer_row_count", settings.rowCount);
writeCookie("card_printer_column_count", settings.colCount);
} }
function loadSettings(){ function loadSettings(){
var settings = global.settings = global.settings || {}; var settings = global.settings = global.settings || {};
settings.scale = parseFloat(readCookie("card_printer_font_scale")) || 1.0; settings.scale = parseFloat(readCookie("card_printer_scale")) || 1.0;
settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2; settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2;
settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1; settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1;
@ -354,11 +356,12 @@
var settings = global.settings; var settings = global.settings;
var scaleValue = settings.scale * 2.0;
var scaleRoot; var scaleRoot;
if(settings.scale < 0) { if(scaleValue < 0) {
scaleRoot = 1.0 / (1.0 - (settings.scale * 2.0)); scaleRoot = 1.0 / (1.0 - scaleValue);
} else { } else {
scaleRoot = 1.0 * (1.0 + (settings.scale * 2.0)); scaleRoot = 1.0 * (1.0 + scaleValue);
} }
var rowCount = settings.rowCount; var rowCount = settings.rowCount;
@ -385,9 +388,6 @@
var scaleHeight = cardMaxHeight / cardMinHeight ; var scaleHeight = cardMaxHeight / cardMinHeight ;
var scale = Math.min(scaleWidth, scaleHeight, 1); var scale = Math.min(scaleWidth, scaleHeight, 1);
console.log("scaleRoot: " + scaleRoot + " scale: " + scale);
console.log("scaleWidth: " + scaleWidth + " scaleHeight: " + scaleHeight);
// scale // scale
jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm");
@ -493,7 +493,7 @@
// scale font // scale font
result.find("#font-scale-range").on("input", function() { result.find("#scaleRange").on("input", function() {
global.settings.scale = jQuery(this).val(); global.settings.scale = jQuery(this).val();
saveSettings(); saveSettings();
redrawCards(); redrawCards();

6
printPreview.html
View File

@ -18,7 +18,11 @@
<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="-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; padding-right: 3px; display: inline; -webkit-appearance: default">
<form oninput="amount.value=parseFloat(scaleRange.value).toFixed(1)">
<input type="range" id="scaleRange" min="-1.0" max="1.0" step="0.1" value="0.0" style="width: 80px; position: relative; top: 2px; margin-right:5px;" />
<output name="amount" for="scaleRange"></output> Scale</form>
</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>