From 17d97edbddbc64f9d7a2775177c4b9bebf03a67a Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 10:35:20 +0100 Subject: [PATCH 01/12] fix min height --- card.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/card.css b/card.css index 3c01430..5f127b1 100644 --- a/card.css +++ b/card.css @@ -71,7 +71,7 @@ body { width: 100%; padding: 0.5cm; min-width: 14.5rem; - min-height: 10.0rem; + min-height: 12.5rem; border-color: LightGray; border-style: dotted; border-width: 0.03cm; From 8707dab5ccf23f5f523caa819a26f4d1c63a30b8 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 11:35:07 +0100 Subject: [PATCH 02/12] fix YouTrack PivotTracker and Trello --- bookmarklet.js | 23 ++++++++++++++++------- printPreview.css | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 78be820..46bfcc7 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -1,4 +1,10 @@ (function() { + // Public Instances + // Jira: https://connect.atlassian.net/browse/NERDS-33286 + // PivotTracker: https://www.pivotaltracker.com/n/projects/510733 + // Trello: https://trello.com/b/8zlPSh70/spike + // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard + var global = {}; global.version = "4.2.7"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; @@ -46,7 +52,7 @@ } else if (/.*trello.com\/.*/g.test(document.URL)) { console.log("App: " + "Trello"); global.appFunctions = trelloFunctions; - } else if (/.*\/youtrack\/.*/g.test(document.URL)) { + } else if (/.*myjetbrains.com\/youtrack\/.*/g.test(document.URL)) { console.log("App: " + "YouTrack"); global.appFunctions = youTrackFunctions; } else { @@ -105,6 +111,7 @@ if (global.isProd) { ga('send', 'pageview'); } + return Promise.all(promises); } @@ -992,7 +999,7 @@ var promises = []; var issueData = {}; - promises.push(module.getIssueData(issueKey, function(data) { + promises.push(module.getIssueData(issueKey).then(function(data) { issueData.key = data.id; issueData.type = data.field.type[0]; issueData.summary = data.field.summary; @@ -1007,6 +1014,8 @@ } issueData.url = window.location.origin + "/youtrack/issue/" + issueData.key; + + })); return Promise.all(promises).then(function(results){return issueData;}); @@ -1016,7 +1025,7 @@ var url = '/youtrack/rest/issue/' + issueKey + '?'; console.log("IssueUrl: " + url); //console.log("Issue: " + issueKey + " Loading..."); - return httpGet(url).then(function(responseData) { + return httpGetJSON(url).then(function(responseData) { //console.log("Issue: " + issueKey + " Loaded!"); jQuery.each(responseData.field, function(key, value) { // add fields with field names @@ -1053,7 +1062,7 @@ var promises = []; var issueData = {}; - promises.push(module.getIssueData(issueKey, function(data) { + promises.push(module.getIssueData(issueKey).then(function(data) { issueData.key = data.id; issueData.type = data.kind.toLowerCase(); issueData.summary = data.name; @@ -1077,7 +1086,7 @@ return Promise.all(promises).then(function(results){return issueData;}); }; - module.getIssueData = function(issueKey, callback, async) { + module.getIssueData = function(issueKey) { //http://www.pivotaltracker.com/help/api var url = 'https://www.pivotaltracker.com/services/v5/stories/' + issueKey + "?fields=name,kind,description,story_type,owned_by(name),comments(file_attachments(kind)),estimate,deadline"; console.log("IssueUrl: " + url); @@ -1103,7 +1112,7 @@ var promises = []; var issueData = {}; - promises.push(module.getIssueData(issueKey, function(data) { + promises.push(module.getIssueData(issueKey).then(function(data) { issueData.key = data.idShort; // TODO get kind from label name @@ -1128,7 +1137,7 @@ return Promise.all(promises).then(function(results){return issueData;}); }; - module.getIssueData = function(issueKey, callback, async) { + module.getIssueData = function(issueKey) { var url = "https://trello.com/1/cards/" + issueKey + "?members=true"; console.log("IssueUrl: " + url); //console.log("Issue: " + issueKey + " Loading..."); diff --git a/printPreview.css b/printPreview.css index cdd60b5..26e31d4 100644 --- a/printPreview.css +++ b/printPreview.css @@ -83,6 +83,7 @@ height 30px; } #info-line { + display: inline; padding-left: 3rem; padding-right: 3rem; } From fea6db245f0e66c58fa3bacca3241dd1098ad58a Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 11:52:00 +0100 Subject: [PATCH 03/12] fix trello --- printPreview.css | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/printPreview.css b/printPreview.css index 26e31d4..c031c5e 100644 --- a/printPreview.css +++ b/printPreview.css @@ -1,65 +1,56 @@ +lable, button, input { + display: inline; + font-weight: normal; + margin: 0px; + padding: 0px; +} #card-print-overlay { position: fixed; height: 100%; width: 100%; top: 0; left: 0; - background:rgba(0, 0, 0, 0.5); - + background: rgba(0, 0, 0, 0.5); box-sizing: border-box; - word-wrap:break-word; + word-wrap: break-word; z-index: 99999; - } - #card-print-dialog { position: relative; - top: 60px; - right:0px; - left:0px; - + right: 0px; + left: 0px; height: calc(100% - 120px); width: 1000px; margin: auto; - border-style: solid; border-color: #cccccc; border-width: 1px; -webkit-border-radius: 4px; border-radius: 4px; - overflow: hidden; } - #card-print-dialog-header { position: relative; background: #f0f0f0; height: 25px; - border-bottom: 1px solid #cccccc; - padding: 15px 20px 15px 20px; } - #card-print-dialog-content { position: relative; background: white; height: calc(100% - 106px); width: 100%; - overflow: hidden; } - #card-print-dialog-content-iframe { position: relative; height: 100%; width: 100%; - overflow: hidden; - border:none; + border: none; } - #card-print-dialog-footer { position: relative; background: #f0f0f0; @@ -68,14 +59,12 @@ padding: 10px; text-align: right; } - #buttons { position: relative; float: right; display: inline-block; height 30px; } - #info { position: relative; float: right; @@ -87,8 +76,7 @@ padding-left: 3rem; padding-right: 3rem; } - -#card-print-dialog-title{ +#card-print-dialog-title { position: relative; float: left; color: rgb(51, 51, 51); @@ -99,7 +87,7 @@ height: 30px; line-height: 30px; } -.cancel{ +.cancel { cursor: pointer; font-size: 14px; display: inline-block; From e849a6a395714f996f4f37cbc1313c0f21570a53 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 12:44:01 +0100 Subject: [PATCH 04/12] no message --- printPreview.css | 6 ------ printPreview.html | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/printPreview.css b/printPreview.css index c031c5e..7e81004 100644 --- a/printPreview.css +++ b/printPreview.css @@ -1,9 +1,3 @@ -lable, button, input { - display: inline; - font-weight: normal; - margin: 0px; - padding: 0px; -} #card-print-overlay { position: fixed; height: 100%; diff --git a/printPreview.html b/printPreview.html index 844862b..f708a42 100644 --- a/printPreview.html +++ b/printPreview.html @@ -13,15 +13,18 @@ From 7c2f867630f3ea01589739a9265e529c0e6d3be1 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 12:47:18 +0100 Subject: [PATCH 05/12] no message --- printPreview.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printPreview.html b/printPreview.html index f708a42..bab5c87 100644 --- a/printPreview.html +++ b/printPreview.html @@ -15,9 +15,9 @@
x
-
Page Grid
+
Page Grid
-
Scale
+
Scale
Single Card Per Page
Hide Description
Hide Assignee
From 9d02bbfa4593a270010914713a02f9d2fef6fa41 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 12:55:49 +0100 Subject: [PATCH 06/12] no message --- printPreview.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/printPreview.html b/printPreview.html index bab5c87..72f6727 100644 --- a/printPreview.html +++ b/printPreview.html @@ -14,10 +14,10 @@