From d1c91085700a11b87f4df5e4803b236cf099da91 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 6 Aug 2014 15:42:26 -0400 Subject: [PATCH 1/2] Fix setup trigger dialog to handle the case where the FROM image has a public base --- static/directives/setup-trigger-dialog.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html index 9efb9300e..3d17e2a0b 100644 --- a/static/directives/setup-trigger-dialog.html +++ b/static/directives/setup-trigger-dialog.html @@ -76,12 +76,18 @@ current-entity="pullEntity" allowed-entities="['robot']"> -
- Note: We've automatically selected robot account , since it has access to the Quay.io repository. +
+ Note: We've automatically selected robot account + , since it has access to the Quay.io + repository.
-
+
Note: No robot account currently has access to the Quay.io repository. Please create one and/or assign access in the - repository's admin panel. + repository's + admin panel.
From 09286d6234bf9bb07b291bb780a587da3326fda0 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 6 Aug 2014 16:01:19 -0400 Subject: [PATCH 2/2] Make the setup trigger dialog more clear on what the pull credentials actually mean --- static/css/quay.css | 4 - static/directives/setup-trigger-dialog.html | 97 +++++++++++---------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index 431927b47..68687ff68 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -4101,10 +4101,6 @@ pre.command:before { margin-top: 10px; } -.trigger-option-section .entity-search-element .twitter-typeahead { - width: 370px; -} - .trigger-option-section .entity-search-element input { width: 100%; } diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html index 3d17e2a0b..07158c5db 100644 --- a/static/directives/setup-trigger-dialog.html +++ b/static/directives/setup-trigger-dialog.html @@ -45,53 +45,58 @@
- - - - - - - - - -
-
- Pull Credentials: -
-
-
- In order to set pull credentials for a build trigger, you must be an Administrator of the namespace {{ repository.namespace }} -
-
- - -
-
- - +
+ + + + + +
+ + docker pull Credentials: + + +
+ In order to set pull credentials for a build trigger, you must be an Administrator of the namespace {{ repository.namespace }} +
+
+ + +
+
+ + + + + +
+ + +
+ Note: We've automatically selected robot account + , since it has access to the Quay.io + repository. +
+
+ Note: No robot account currently has access to the Quay.io repository. Please create one and/or assign access in the + repository's + admin panel. +
+
+
-
- Note: We've automatically selected robot account - , since it has access to the Quay.io - repository. -
-
- Note: No robot account currently has access to the Quay.io repository. Please create one and/or assign access in the - repository's - admin panel. -
-