From f37b84cd6d3395f54be263063fa56f5a79dad8f5 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 14 Jun 2023 21:15:42 +0500 Subject: [PATCH 1/2] docker image name displayed --- .../riot/competitions/detail/_header.tag | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/static/riot/competitions/detail/_header.tag b/src/static/riot/competitions/detail/_header.tag index 55950fa64..7b1bbd5ef 100644 --- a/src/static/riot/competitions/detail/_header.tag +++ b/src/static/riot/competitions/detail/_header.tag @@ -47,7 +47,14 @@
Secret url: https://{ URLS.SECRET_KEY_URL(competition.id, competition.secret_key) } - + + + +
+
+ Docker image: + { competition.docker_image } +
@@ -207,7 +214,17 @@ window.getSelection().addRange(range); // to select text document.execCommand("copy"); window.getSelection().removeAllRanges();// to deselect - $('.send-pop').popup('toggle') + $('.send-pop-secret').popup('toggle') + } + + self.copy_docker_url = function () { + let range = document.createRange(); + range.selectNode(document.getElementById("docker-image")); + window.getSelection().removeAllRanges(); // clear current selection + window.getSelection().addRange(range); // to select text + document.execCommand("copy"); + window.getSelection().removeAllRanges();// to deselect + $('.send-pop-docker').popup('toggle') } self.get_end_date = function (competition) { @@ -251,6 +268,9 @@ .secret-label color #DB2828 + .docker-label + color #2290E2 + .secret-url color $blue From 09321004c1c083b53b8d2bc9601fac1641f97e89 Mon Sep 17 00:00:00 2001 From: didayolo Date: Thu, 15 Jun 2023 13:36:06 +0200 Subject: [PATCH 2/2] Update color and order of docker image display --- .../riot/competitions/detail/_header.tag | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/static/riot/competitions/detail/_header.tag b/src/static/riot/competitions/detail/_header.tag index 7b1bbd5ef..3b34c066f 100644 --- a/src/static/riot/competitions/detail/_header.tag +++ b/src/static/riot/competitions/detail/_header.tag @@ -32,6 +32,7 @@
+
Organized by: {competition.created_by} @@ -44,13 +45,7 @@ Current server time: {pretty_date(CURRENT_DATE_TIME)}
-
- Secret url: - https://{ URLS.SECRET_KEY_URL(competition.id, competition.secret_key) } - - - -
+
Docker image: { competition.docker_image } @@ -58,6 +53,14 @@
+ +
+ Secret url: + https://{ URLS.SECRET_KEY_URL(competition.id, competition.secret_key) } + + + +
@@ -249,6 +252,7 @@ $blue = #2c3f4c $teal = #00bbbb $lightblue = #f2faff + $red = #DB2828 .detail-label font-size 1.25em @@ -266,10 +270,10 @@ font-size 13px .secret-label - color #DB2828 + color $red .docker-label - color #2290E2 + color $teal .secret-url color $blue