Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
2676517e
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
2676517e
编写于
1月 08, 2016
作者:
S
Sebastian Florek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed zerostate to be child of replicasetlist state
上级
5e77c71c
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
19 addition
and
66 deletion
+19
-66
src/app/frontend/chrome/chrome.html
src/app/frontend/chrome/chrome.html
+1
-1
src/app/frontend/index_module.js
src/app/frontend/index_module.js
+0
-2
src/app/frontend/replicasetlist/replicasetlist_stateconfig.js
...app/frontend/replicasetlist/replicasetlist_stateconfig.js
+12
-1
src/app/frontend/replicasetlist/zerostate/zerostate.html
src/app/frontend/replicasetlist/zerostate/zerostate.html
+0
-0
src/app/frontend/replicasetlist/zerostate/zerostate.scss
src/app/frontend/replicasetlist/zerostate/zerostate.scss
+1
-1
src/app/frontend/replicasetlist/zerostate/zerostate_controller.js
...frontend/replicasetlist/zerostate/zerostate_controller.js
+0
-0
src/app/frontend/replicasetlist/zerostate/zerostate_state.js
src/app/frontend/replicasetlist/zerostate/zerostate_state.js
+3
-1
src/app/frontend/zerostate/zerostate_module.js
src/app/frontend/zerostate/zerostate_module.js
+0
-27
src/app/frontend/zerostate/zerostate_stateconfig.js
src/app/frontend/zerostate/zerostate_stateconfig.js
+0
-31
src/test/frontend/replicasetlist/zerostate/zerostate_controller_test.js
...end/replicasetlist/zerostate/zerostate_controller_test.js
+2
-2
未找到文件。
src/app/frontend/chrome/chrome.html
浏览文件 @
2676517e
...
...
@@ -17,7 +17,7 @@ limitations under the License.
<md-content
class=
"kd-content"
>
<md-toolbar
class=
"kd-toolbar"
>
<div
class=
"md-toolbar-tools kd-toolbar-tools"
>
<a
ui-sref=
"replicasets"
>
<a
ui-sref=
"replicasets"
ui-sref-opts=
"{ reload: true }"
>
<md-icon
md-svg-icon=
"assets/images/kubernetes-logo.svg"
class=
"kd-toolbar-logo"
></md-icon>
</a>
<h2>
...
...
src/app/frontend/index_module.js
浏览文件 @
2676517e
...
...
@@ -23,7 +23,6 @@ import logsModule from './logs/logs_module';
import
routeConfig
from
'
./index_route
'
;
import
replicaSetDetailModule
from
'
./replicasetdetail/replicasetdetail_module
'
;
import
replicaSetListModule
from
'
./replicasetlist/replicasetlist_module
'
;
import
zerostateModule
from
'
./zerostate/zerostate_module
'
;
export
default
angular
.
module
(
'
kubernetesDashboard
'
,
...
...
@@ -40,7 +39,6 @@ export default angular.module(
logsModule
.
name
,
replicaSetDetailModule
.
name
,
replicaSetListModule
.
name
,
zerostateModule
.
name
,
])
.
config
(
indexConfig
)
.
config
(
routeConfig
);
src/app/frontend/replicasetlist/replicasetlist_stateconfig.js
浏览文件 @
2676517e
...
...
@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import
{
stateName
as
zerostate
}
from
'
zerostate/zerostate_state
'
;
import
{
stateName
as
zerostate
}
from
'
./
zerostate/zerostate_state
'
;
import
{
stateName
as
replicasets
}
from
'
./replicasetlist_state
'
;
import
{
stateUrl
as
replicasetsUrl
}
from
'
./replicasetlist_state
'
;
import
ReplicaSetListController
from
'
./replicasetlist_controller
'
;
import
ZeroStateController
from
'
./zerostate/zerostate_controller
'
;
/**
* Configures states for the service view.
...
...
@@ -34,6 +35,16 @@ export default function stateConfig($stateProvider) {
templateUrl
:
'
replicasetlist/replicasetlist.html
'
,
onEnter
:
redirectIfNeeded
,
});
$stateProvider
.
state
(
zerostate
,
{
views
:
{
'
@
'
:
{
controller
:
ZeroStateController
,
controllerAs
:
'
ctrl
'
,
templateUrl
:
'
replicasetlist/zerostate/zerostate.html
'
,
},
},
url
:
'
/zerostate
'
,
});
}
/**
...
...
src/app/frontend/zerostate/zerostate.html
→
src/app/frontend/
replicasetlist/
zerostate/zerostate.html
浏览文件 @
2676517e
文件已移动
src/app/frontend/zerostate/zerostate.scss
→
src/app/frontend/
replicasetlist/
zerostate/zerostate.scss
浏览文件 @
2676517e
...
...
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
@import
'../variables'
;
@import
'../
../
variables'
;
.kd-content
{
background-color
:
$body
;
...
...
src/app/frontend/zerostate/zerostate_controller.js
→
src/app/frontend/
replicasetlist/
zerostate/zerostate_controller.js
浏览文件 @
2676517e
文件已移动
src/app/frontend/zerostate/zerostate_state.js
→
src/app/frontend/
replicasetlist/
zerostate/zerostate_state.js
浏览文件 @
2676517e
...
...
@@ -12,5 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import
{
stateName
as
replicasets
}
from
'
./../replicasetlist_state
'
;
/** Name of the state. Can be used in, e.g., $state.go method. */
export
const
stateName
=
'
zero
'
;
export
const
stateName
=
`
${
replicasets
}
.zero`
;
src/app/frontend/zerostate/zerostate_module.js
已删除
100644 → 0
浏览文件 @
5e77c71c
// Copyright 2015 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import
stateConfig
from
'
./zerostate_stateconfig
'
;
/**
* Angular module for the zero state view.
*
* The view is active on the first launch of the application and is used for onboarding new users.
*/
export
default
angular
.
module
(
'
kubernetesDashboard.zerostate
'
,
[
'
ui.router
'
,
])
.
config
(
stateConfig
);
src/app/frontend/zerostate/zerostate_stateconfig.js
已删除
100644 → 0
浏览文件 @
5e77c71c
// Copyright 2015 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import
ZeroStateController
from
'
./zerostate_controller
'
;
import
{
stateName
}
from
'
./zerostate_state
'
;
/**
* Configures states for the zero state view.
*
* @param {!ui.router.$stateProvider} $stateProvider
* @ngInject
*/
export
default
function
stateConfig
(
$stateProvider
)
{
$stateProvider
.
state
(
stateName
,
{
controller
:
ZeroStateController
,
controllerAs
:
'
ctrl
'
,
url
:
'
/zerostate
'
,
templateUrl
:
'
zerostate/zerostate.html
'
,
});
}
src/test/frontend/zerostate/zerostate_controller_test.js
→
src/test/frontend/
replicasetlist/
zerostate/zerostate_controller_test.js
浏览文件 @
2676517e
...
...
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import
ZerostateController
from
'
zerostate/zerostate_controller
'
;
import
ZerostateController
from
'
replicasetlist/
zerostate/zerostate_controller
'
;
describe
(
'
Main
controller
'
,
()
=>
{
describe
(
'
Zerostate
controller
'
,
()
=>
{
let
ctrl
;
beforeEach
(
angular
.
mock
.
inject
(()
=>
{
ctrl
=
new
ZerostateController
();
}));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录