From b36a6a74b0640e6bc4ac99f339315f31223cefef Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Thu, 10 Dec 2015 14:15:05 +0100 Subject: [PATCH 1/4] cleanup --- bookmarklet.js | 55 ++++++++++++++++++++--------------------------- card.css | 6 +++--- printPreview.html | 1 + 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 55fcdf5..c5deccc 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -100,6 +100,7 @@ jQuery("#hide-description-checkbox").attr('checked', settings.hideDescription ); jQuery("#hide-assignee-checkbox").attr('checked', settings.hideAssignee ); jQuery("#hide-due-date-checkbox").attr('checked', settings.hideDueDate ); + jQuery("#hide-qr-code-checkbox").attr('checked', settings.hideQrCode ); jQuery("#card-print-dialog-title").text("Card Printer " + global.version + " - Loading issues..."); promises.push(renderCards(issueKeyList).then(function() { @@ -161,6 +162,7 @@ writeCookie("card_printer_hide_description", settings.hideDescription); writeCookie("card_printer_hide_assignee", settings.hideAssignee); writeCookie("card_printer_hide_due_date", settings.hideDueDate); + writeCookie("card_printer_hide_qr_code", settings.hideQrCode); } function loadSettings(){ @@ -173,6 +175,7 @@ settings.hideDescription = parseBool(readCookie("card_printer_hide_description"), false); settings.hideAssignee = parseBool(readCookie("card_printer_hide_assignee"), false); settings.hideDueDate = parseBool(readCookie("card_printer_hide_due_date"), false); + settings.hideQrCode = parseBool(readCookie("card_printer_hide_qr_code"), false); } function print() { @@ -266,26 +269,26 @@ card.find(".issue-assignee").text(data.assignee[0].toUpperCase()); } } else { - card.find(".issue-assignee").addClass("hidden"); + card.find(".issue-assignee").remove(); } //Due-Date if (data.dueDate) { card.find(".issue-due-date").text(data.dueDate); } else { - card.find(".issue-due-box").addClass("hidden"); + card.find(".issue-due-box").remove(); } //Attachment if (data.hasAttachment) {} else { - card.find('.issue-attachment').addClass('hidden'); + card.find('.issue-attachment').remove(); } //Story Points if (data.storyPoints) { card.find(".issue-estimate").text(data.storyPoints); } else { - card.find(".issue-estimate").addClass("hidden"); + card.find(".issue-estimate").remove(); } //Epic @@ -293,7 +296,7 @@ card.find(".issue-epic-id").text(data.superIssue.key); card.find(".issue-epic-name").text(data.superIssue.summary); } else { - card.find(".issue-epic-box").addClass("hidden"); + card.find(".issue-epic-box").remove(); } //QR-Code @@ -309,34 +312,13 @@ var printDocument = printWindow.document; // hide/show description - jQuery("#styleHideDescription", printDocument).remove(); - if (settings.hideDescription) { - var style = document.createElement('style'); - style.id = 'styleHideDescription'; - style.type = 'text/css'; - style.innerHTML = ".issue-description { display: none; }" - jQuery("head", printDocument).append(style); - } - + jQuery(".issue-description", printDocument).toggle(!settings.hideDescription); // hide/show assignee - jQuery("#styleHideAssignee", printDocument).remove(); - if (settings.hideAssignee) { - var style = document.createElement('style'); - style.id = 'styleHideAssignee'; - style.type = 'text/css'; - style.innerHTML = ".issue-assignee { display: none; }" - jQuery("head", printDocument).append(style); - } - + jQuery(".issue-assignee", printDocument).toggle(!settings.hideAssignee); // hide/show assignee - jQuery("#styleHideDueDate", printDocument).remove(); - if (settings.hideDueDate) { - var style = document.createElement('style'); - style.id = 'styleHideDueDate'; - style.type = 'text/css'; - style.innerHTML = ".issue-due-box { display: none; }" - jQuery("head", printDocument).append(style); - } + jQuery(".issue-due-box", printDocument).toggle(!settings.hideDueDate); + // hide/show cr code + jQuery(".issue-qr-code", printDocument).toggle(!settings.hideQrCode); // enable/disable single card page jQuery("#styleSingleCardPage", printDocument).remove(); @@ -344,7 +326,7 @@ var style = document.createElement('style'); style.id = 'styleSingleCardPage'; style.type = 'text/css'; - style.innerHTML = ".card { page-break-after: always; float: none; margin-bottom: 0.5cm}" + style.innerHTML = ".card { page-break-after: always; float: none;}" jQuery("head", printDocument).append(style); } } @@ -491,6 +473,15 @@ return true; }); + // show QR Code + + result.find("#hide-qr-code-checkbox").click(function() { + global.settings.hideQrCode = this.checked; + saveSettings(); + redrawCards(); + return true; + }); + // scale font result.find("#scaleRange").on("input", function() { diff --git a/card.css b/card.css index bf7295a..5139381 100644 --- a/card.css +++ b/card.css @@ -75,7 +75,7 @@ body { padding: 0.5rem; min-width: 14.5rem; min-height: 8.65rem; - overflow: visible; + overflow: hidden; } .card::after { overflow: visible; @@ -83,8 +83,8 @@ body { top: -0.015rem; left: -0.015rem; content: ""; - width: calc(100% - 0.015cm); - height: calc(100% - 0.015cm); + width: calc(100% - 0.03cm); + height: calc(100% - 0.03cm); border-color: LightGray; border-style: dashed; border-width: 0.03cm; diff --git a/printPreview.html b/printPreview.html index d5c2aeb..1b13073 100644 --- a/printPreview.html +++ b/printPreview.html @@ -27,6 +27,7 @@
Hide Description
Hide Assignee
Hide Due Date
+
Hide QR Code
Cancel From 8e8c1597fc1c80829abd7f769632bdaefce3837d Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 11 Dec 2015 11:16:50 +0100 Subject: [PATCH 2/4] cleanup --- bookmarklet.js | 32 ++++++++++++++------------------ card.css | 46 ++++++++++++++++++++++++---------------------- printPreview.html | 8 ++++---- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index c5deccc..ce69a3a 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -6,7 +6,7 @@ // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard var global = {}; - global.version = "4.3.5"; + global.version = "4.3.6"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.isDev = document.currentScript == null; global.isProd = !global.isDev; @@ -97,10 +97,10 @@ jQuery("#columnCount").val(settings.colCount); jQuery("#single-card-page-checkbox").attr('checked', settings.singleCardPage ); - jQuery("#hide-description-checkbox").attr('checked', settings.hideDescription ); - jQuery("#hide-assignee-checkbox").attr('checked', settings.hideAssignee ); - jQuery("#hide-due-date-checkbox").attr('checked', settings.hideDueDate ); - jQuery("#hide-qr-code-checkbox").attr('checked', settings.hideQrCode ); + jQuery("#description-checkbox").attr('checked', !settings.hideDescription ); + jQuery("#assignee-checkbox").attr('checked', !settings.hideAssignee ); + jQuery("#due-date-checkbox").attr('checked', !settings.hideDueDate ); + jQuery("#qr-code-checkbox").attr('checked', !settings.hideQrCode ); jQuery("#card-print-dialog-title").text("Card Printer " + global.version + " - Loading issues..."); promises.push(renderCards(issueKeyList).then(function() { @@ -321,13 +321,9 @@ jQuery(".issue-qr-code", printDocument).toggle(!settings.hideQrCode); // enable/disable single card page - jQuery("#styleSingleCardPage", printDocument).remove(); + jQuery(".card", printDocument).css({ 'page-break-after' : '', 'float' : '', 'margin-bottom': '' }); if (settings.singleCardPage) { - var style = document.createElement('style'); - style.id = 'styleSingleCardPage'; - style.type = 'text/css'; - style.innerHTML = ".card { page-break-after: always; float: none;}" - jQuery("head", printDocument).append(style); + jQuery(".card", printDocument).css({ 'page-break-after': 'always', 'float': 'none', 'margin-bottom': '10px' }); } } @@ -448,8 +444,8 @@ // hide description - result.find("#hide-description-checkbox").click(function() { - global.settings.hideDescription = this.checked; + result.find("#description-checkbox").click(function() { + global.settings.hideDescription = !this.checked; saveSettings(); redrawCards(); return true; @@ -457,8 +453,8 @@ // show assignee - result.find("#hide-assignee-checkbox").click(function() { - global.settings.hideAssignee = this.checked; + result.find("#assignee-checkbox").click(function() { + global.settings.hideAssignee = !this.checked; saveSettings(); redrawCards(); return true; @@ -466,8 +462,8 @@ // show due date - result.find("#hide-due-date-checkbox").click(function() { - global.settings.hideDueDate = this.checked; + result.find("#due-date-checkbox").click(function() { + global.settings.hideDueDate = !this.checked; saveSettings(); redrawCards(); return true; @@ -475,7 +471,7 @@ // show QR Code - result.find("#hide-qr-code-checkbox").click(function() { + result.find("#qr-code-checkbox").click(function() { global.settings.hideQrCode = this.checked; saveSettings(); redrawCards(); diff --git a/card.css b/card.css index 5139381..28c4324 100644 --- a/card.css +++ b/card.css @@ -18,7 +18,7 @@ body { } .badge, .shadow { border-style: solid; - border-color: #333; + border-color: #454545; border-top-width: 0.12rem; border-left-width: 0.12rem; border-bottom-width: 0.21rem; @@ -35,17 +35,18 @@ body { border-bottom-width: 0rem; } .zigzag::after { - position: absolute; - bottom: 0.03rem; - left: -0.16rem; - content: ""; - width: 100%; - border-style: solid; - border-bottom-width: 1rem; - border-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/Tearing.png); - border-image-width: 0 0 0.7rem 0; - border-image-slice: 56 0 56 1; - border-image-repeat: round round; + box-sizing: border-box; + position: absolute; + bottom: 0.00rem; + left: 0.0rem; + content: ""; + width: 100%; + border-style: solid; + border-bottom-width: 0.5rem; + border-image: url(https://rawgit.com/qoomon/Jira-Issue-Card-Printer/develop/resources//Tearing.png); + border-image-width: 0 0 0.7rem 0; + border-image-slice: 56 0 56 1; + border-image-repeat: round round; } #preload { position: fixed; @@ -78,16 +79,17 @@ body { overflow: hidden; } .card::after { - overflow: visible; - position: absolute; - top: -0.015rem; - left: -0.015rem; - content: ""; - width: calc(100% - 0.03cm); - height: calc(100% - 0.03cm); - border-color: LightGray; - border-style: dashed; - border-width: 0.03cm; + + overflow: visible; + position: absolute; + top: 0.0rem; + left: 0.0rem; + content: ""; + width: 100%; + height: 100%; + border-color: LightGray; + border-style: dashed; + border-width: 0.03cm; } .card-content { position: relative; diff --git a/printPreview.html b/printPreview.html index 1b13073..21a6a18 100644 --- a/printPreview.html +++ b/printPreview.html @@ -24,10 +24,10 @@ Scale
Single Card Per Page
-
Hide Description
-
Hide Assignee
-
Hide Due Date
-
Hide QR Code
+
Description
+
Assignee
+
Due Date
+
QR Code
Cancel From 3e12c7956a9a16c575c67f6b2a5fa10be7d16b37 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 11 Dec 2015 11:30:09 +0100 Subject: [PATCH 3/4] minor fixes --- bookmarklet.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index ce69a3a..daecbf6 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -70,7 +70,7 @@ if (issueKeyList.length <= 0) { alert("Please select at least one issue."); return; - } else if (issueKeyList.length > 100) { + } else if (issueKeyList.length > 30) { confirm("Are you sure you want select " + issueKeyList.length + " issues?"); return; } @@ -233,6 +233,7 @@ }); console.log("wait for resources loaded..."); printDocument.close(); + redrawCards(); }); } @@ -472,7 +473,7 @@ // show QR Code result.find("#qr-code-checkbox").click(function() { - global.settings.hideQrCode = this.checked; + global.settings.hideQrCode = !this.checked; saveSettings(); redrawCards(); return true; From b2969ceae90228f177b5584a44408901725b049d Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 11 Dec 2015 11:33:14 +0100 Subject: [PATCH 4/4] no message --- card.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/card.css b/card.css index 28c4324..6080208 100644 --- a/card.css +++ b/card.css @@ -79,7 +79,7 @@ body { overflow: hidden; } .card::after { - + box-sizing: border-box; overflow: visible; position: absolute; top: 0.0rem;