From 2757b471a0a7430dbc85db2ac042dc3f02a52f9c Mon Sep 17 00:00:00 2001 From: kzantow Date: Mon, 28 Mar 2016 18:51:41 -0400 Subject: [PATCH] JENKINS-33813 - fix error page styling issue, add option to retry, fix check for setup wizard js include --- .../install/SetupWizard/authenticate-security-token.jelly | 1 - .../resources/jenkins/install/pluginSetupWizard.properties | 1 + core/src/main/resources/lib/layout/html.jelly | 5 ++--- war/src/main/js/pluginSetupWizardGui.js | 7 ++++++- war/src/main/js/templates/errorPanel.hbs | 7 ++++++- war/src/main/less/pluginSetupWizard.less | 3 ++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly index 79893ea018..0f1a738d50 100644 --- a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly +++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly @@ -29,7 +29,6 @@ - diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties index 266e97b06a..ffe2b5ffa9 100644 --- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties +++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties @@ -49,3 +49,4 @@ installWizard_configureProxy_save=Save and Continue installWizard_skipPluginInstallations=Skip Plugin Installations installWizard_installIncomplete_dependenciesLabel=Dependencies installWizard_installingConsole_dependencyIndicatorNote=** - required dependency +installWizard_retry=Retry diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly index 098f4d0d98..661e7b3c6d 100644 --- a/core/src/main/resources/lib/layout/html.jelly +++ b/core/src/main/resources/lib/layout/html.jelly @@ -155,9 +155,8 @@ ${h.initPageVariables(context)} - - - + +