Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
2757b471
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2757b471
编写于
3月 28, 2016
作者:
K
kzantow
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JENKINS-33813 - fix error page styling issue, add option to retry, fix
check for setup wizard js include
上级
6219c8f9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
7 deletion
+17
-7
core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
...ins/install/SetupWizard/authenticate-security-token.jelly
+0
-1
core/src/main/resources/jenkins/install/pluginSetupWizard.properties
...in/resources/jenkins/install/pluginSetupWizard.properties
+1
-0
core/src/main/resources/lib/layout/html.jelly
core/src/main/resources/lib/layout/html.jelly
+2
-3
war/src/main/js/pluginSetupWizardGui.js
war/src/main/js/pluginSetupWizardGui.js
+6
-1
war/src/main/js/templates/errorPanel.hbs
war/src/main/js/templates/errorPanel.hbs
+6
-1
war/src/main/less/pluginSetupWizard.less
war/src/main/less/pluginSetupWizard.less
+2
-1
未找到文件。
core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
浏览文件 @
2757b471
...
...
@@ -29,7 +29,6 @@
<label class="control-label" for="security-token">${%Administrator password}</label>
<input name="j_username" value="${j.setupWizard.initialSetupAdminUserName}" type="hidden"/>
<input id="security-token" class="form-control" type="password" name="j_password"/>
<link rel="stylesheet" href="${j.installWizardPath}.css" type="text/css" />
</div>
</div>
...
...
core/src/main/resources/jenkins/install/pluginSetupWizard.properties
浏览文件 @
2757b471
...
...
@@ -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
core/src/main/resources/lib/layout/html.jelly
浏览文件 @
2757b471
...
...
@@ -155,9 +155,8 @@ ${h.initPageVariables(context)}
</j:forEach>
</j:if>
<j:invokeStatic
var=
"j"
className=
"jenkins.model.Jenkins"
method=
"getActiveInstance"
/>
<j:set
var=
"installState"
value=
"${j.installState.name()}"
/>
<j:if
test=
"${installState == 'NEW' || installState == 'INITIAL_PLUGINS_INSTALLING'}"
>
<j:invokeStatic
var=
"j"
className=
"jenkins.model.Jenkins"
method=
"getInstance"
/>
<j:if
test=
"${!j.installState.setupComplete}"
>
<script
src=
"${resURL}/${j.installWizardPath}.js"
type=
"text/javascript"
/>
<
link
rel
=
"
stylesheet
"
href
=
"
${resURL}/${j.installWizardPath}.css
"
type
=
"
text/css
"
/>
<
/j:if
>
...
...
war/src/main/js/pluginSetupWizardGui.js
浏览文件 @
2757b471
...
...
@@ -777,6 +777,10 @@ var createPluginSetupWizard = function(appendTarget) {
jenkins
.
goTo
(
'
/
'
);
}));
};
var
startOver
=
function
()
{
jenkins
.
goTo
(
'
/
'
);
};
// scoped click handler, prevents default actions automatically
var
bindClickHandler
=
function
(
cls
,
action
)
{
...
...
@@ -807,7 +811,8 @@ var createPluginSetupWizard = function(appendTarget) {
'
.skip-first-user
'
:
skipFirstUser
,
'
.show-proxy-config
'
:
setupProxy
,
'
.save-proxy-config
'
:
saveProxyConfig
,
'
.skip-plugin-installs
'
:
function
()
{
installPlugins
([]);
}
'
.skip-plugin-installs
'
:
function
()
{
installPlugins
([]);
},
'
.start-over
'
:
startOver
};
for
(
var
cls
in
actions
)
{
bindClickHandler
(
cls
,
actions
[
cls
]);
...
...
war/src/main/js/templates/errorPanel.hbs
浏览文件 @
2757b471
...
...
@@ -2,10 +2,15 @@
<h4
class=
"modal-title"
>
Error
</h4>
</div>
<div
class=
"modal-body"
>
<div
class=
"container error-container"
>
<div
class=
"container error-container"
id=
"error-message"
>
<h1>
{{
translations
.
installWizard_error_header
}}
</h1>
<div
class=
"alert alert-danger fade in"
>
{{
errorMessage
}}
</div>
</div>
</div>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-primary start-over"
>
{{
translations
.
installWizard_retry
}}
</button>
</div>
war/src/main/less/pluginSetupWizard.less
浏览文件 @
2757b471
...
...
@@ -78,7 +78,8 @@
.container.error-container {
padding: 4em 3em;
max-width: 100%;
h1 {
color: #a94442;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录