From 60379e63cf810f0dd2bc49fdd54c9bb1eabe8fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Danyi?= Date: Tue, 30 Aug 2016 11:26:22 +0200 Subject: [PATCH] * moved to own static hosting --- bookmarklet.js | 41 +++++++++++++++++++++-------------------- deploy.php | 9 ++++----- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index fa4b880..95e471f 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -14,7 +14,7 @@ var global = {}; global.version = "4.7.4"; - global.issueTrackingUrl = "vasgyuro.tsp/~edvidan/jira-card-printer"; + global.issueTrackingUrl = "static.ragnarok.yvan.hu/jira-card-printer"; global.isDev = document.currentScript == null; @@ -37,7 +37,7 @@ function main() { var promises = []; - ga('send', 'pageview'); + // ga('send', 'pageview'); //preconditions if ($("#card-printer-iframe").length > 0) { @@ -113,12 +113,12 @@ var promises = []; console.log("Init...") - initGoogleAnalytics(); + // initGoogleAnalytics(); addStringFunctions(); loadSettings(); - global.hostOrigin = "http://vasgyuro.tsp/~edvidan/jira-card-printer/"; + global.hostOrigin = "https://static.ragnarok.yvan.hu/jira-card-printer/"; // if (global.isDev) { // console.log("DEVELOPMENT"); // global.hostOrigin = "https://rawgit.com/qoomon/Jira-Issue-Card-Printer/develop/"; @@ -128,9 +128,9 @@ var resources = getResources(); global.cardHtml = resources.cardHtml; - global.cardCss = resources.cardCss.replace(/http:\/\/vasgyuro.tsp\/~edvidan\/jira-card-printer\/resources/g, global.resourceOrigin); + global.cardCss = resources.cardCss.replace(/https:\/\/static.ragnarok.yvan.hu\/jira-card-printer\/resources/g, global.resourceOrigin); global.printPreviewHtml = resources.printPreviewHtml; - global.printPreviewCss = resources.printPreviewCss.replace(/http:\/\/vasgyuro.tsp\/~edvidan\/jira-card-printer\/resources/g, global.resourceOrigin); + global.printPreviewCss = resources.printPreviewCss.replace(/https:\/\/static.ragnarok.yvan.hu\/jira-card-printer\/resources/g, global.resourceOrigin); return Promise.all(promises); } @@ -427,7 +427,7 @@ // info result.find("#report-issue").click(function(event) { - window.open('http://vasgyuro.tsp/~edvidan/jira-card-printer/issues'); + window.open('https://static.ragnarok.yvan.hu/jira-card-printer/issues'); return false; }); @@ -1193,6 +1193,7 @@
+
@@ -1268,7 +1269,7 @@ width: 100%; border-style: solid; border-bottom-width: 0.5rem; - border-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/Tearing.png); + border-image: url(https://static.ragnarok.yvan.hu/jira-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; @@ -1399,48 +1400,48 @@ width: 3.0rem; border-radius: 50%; background-color: LIGHTSEAGREEN; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Objects.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Objects.png); background-repeat: no-repeat; background-position: center; background-size: 63%; } .issue-icon[type="loading"]{ background-color: DEEPSKYBLUE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/CloudLoading.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/CloudLoading.png); } .issue-icon[type="story"], .issue-icon[type="user story"] { background-color: GOLD; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Bulb.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Bulb.png); } .issue-icon[type="bug"], .issue-icon[type="problem"], .issue-icon[type="correction"] { background-color: CRIMSON; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Bug.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Bug.png); } .issue-icon[type="epic"] { background-color: ROYALBLUE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Flash.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Flash.png); } .issue-icon[type="task"], .issue-icon[type="sub-task"], .issue-icon[type="technical task"], .issue-icon[type="aufgabe"], .issue-icon[type="unteraufgabe"], .issue-icon[type="technische aufgabe"] { background-color: WHEAT; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Task.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Task.png); } .issue-icon[type="new feature"] { background-color: LIMEGREEN; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Plus.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Plus.png); } .issue-icon[type="improvement"], .issue-icon[type="verbesserung"] { background-color: CORNFLOWERBLUE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Arrow.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Arrow.png); } .issue-icon[type="research"] { background-color: MEDIUMTURQUOISE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/ErlenmeyerFlask.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/ErlenmeyerFlask.png); } .issue-icon[type="test"] { background-color: ORANGE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/CrashDummy.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/CrashDummy.png); } .issue-estimate { position: absolute; @@ -1474,7 +1475,7 @@ height: 2.0rem; border-radius: 50%; background-color: LIGHTSKYBLUE; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/Attachment.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/Attachment.png); background-repeat: no-repeat; background-position: center; background-size: 70%; @@ -1552,7 +1553,7 @@ height: 2.5rem; border-radius: 50%; background-color: ORCHID; - background-image: url(http://vasgyuro.tsp/~edvidan/jira-card-printer/resources/icons/AlarmClock.png); + background-image: url(https://static.ragnarok.yvan.hu/jira-card-printer/resources/icons/AlarmClock.png); background-repeat: no-repeat; background-position: center; background-size: 65%; diff --git a/deploy.php b/deploy.php index 25877da..956860d 100644 --- a/deploy.php +++ b/deploy.php @@ -2,20 +2,19 @@ require 'recipe/common.php'; -server('prod', 'vasgyuro.tsp', 22) - ->user('edvidan') +server('prod', 'alfheim.yvan.hu', 2206) + ->user('yvan') ->forwardAgent() // You can use identity key, ssh config, or username/password to auth on the server. ->stage('production') - ->env('deploy_path', '/home/edvidan/applications/jira-card-printer'); // Define the base path to deploy your project to. + ->env('deploy_path', '/var/www/cdn'); // Define the base path to deploy your project to. -set('repository', '/home/edvidan/git/jira-card-printer.git'); +set('repository', 'ssh://gogs@gogs.ragnarok.yvan.hu:2206/yvan/jira-card-printer.git'); env('branch', 'taurus-xft'); task('deploy', [ 'deploy:prepare', 'deploy:release', 'deploy:update_code', -// 'deploy:vendors', 'deploy:symlink', 'cleanup', ]);