Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
14584442
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
14584442
编写于
6月 05, 2017
作者:
F
Floran Brutel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix duplicated containers and wifi style in the webui
上级
949d29a4
变更
17
展开全部
隐藏空白更改
内联
并排
Showing
17 changed file
with
133 addition
and
152 deletion
+133
-152
glances/outputs/static/js/components/glances/view.html
glances/outputs/static/js/components/glances/view.html
+7
-14
glances/outputs/static/js/components/plugin-amps/controller.js
...es/outputs/static/js/components/plugin-amps/controller.js
+5
-5
glances/outputs/static/js/components/plugin-cpu/controller.js
...ces/outputs/static/js/components/plugin-cpu/controller.js
+1
-1
glances/outputs/static/js/components/plugin-diskio/controller.js
.../outputs/static/js/components/plugin-diskio/controller.js
+5
-7
glances/outputs/static/js/components/plugin-diskio/view.html
glances/outputs/static/js/components/plugin-diskio/view.html
+1
-1
glances/outputs/static/js/components/plugin-docker/controller.js
.../outputs/static/js/components/plugin-docker/controller.js
+4
-8
glances/outputs/static/js/components/plugin-docker/view.html
glances/outputs/static/js/components/plugin-docker/view.html
+2
-2
glances/outputs/static/js/components/plugin-load/controller.js
...es/outputs/static/js/components/plugin-load/controller.js
+2
-2
glances/outputs/static/js/components/plugin-mem/controller.js
...ces/outputs/static/js/components/plugin-mem/controller.js
+1
-1
glances/outputs/static/js/components/plugin-memswap/controller.js
...outputs/static/js/components/plugin-memswap/controller.js
+2
-2
glances/outputs/static/js/components/plugin-quicklook/controller.js
...tputs/static/js/components/plugin-quicklook/controller.js
+2
-2
glances/outputs/static/js/components/plugin-raid/controller.js
...es/outputs/static/js/components/plugin-raid/controller.js
+4
-4
glances/outputs/static/js/components/plugin-sensors/controller.js
...outputs/static/js/components/plugin-sensors/controller.js
+1
-1
glances/outputs/static/js/components/plugin-wifi/controller.js
...es/outputs/static/js/components/plugin-wifi/controller.js
+3
-2
glances/outputs/static/js/components/plugin-wifi/view.html
glances/outputs/static/js/components/plugin-wifi/view.html
+10
-12
glances/outputs/static/public/js/main.min.js
glances/outputs/static/public/js/main.min.js
+78
-83
glances/outputs/static/public/js/templates.min.js
glances/outputs/static/public/js/templates.min.js
+5
-5
未找到文件。
glances/outputs/static/js/components/glances/view.html
浏览文件 @
14584442
...
...
@@ -60,22 +60,15 @@
<div
class=
"row"
>
<div
class=
"col-sm-6 sidebar"
ng-if=
"!vm.arguments.disable_left_sidebar"
>
<div
class=
"table"
>
<glances-plugin-network
id=
"plugin-network"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_network"
></glances-plugin-network>
<glances-plugin-wifi
id=
"plugin-wifi"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_wifi"
></glances-plugin-wifi>
<glances-plugin-ports
id=
"plugin-ports"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_ports"
></glances-plugin-ports>
<glances-plugin-diskio
id=
"plugin-diskio"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_diskio"
></glances-plugin-diskio>
<glances-plugin-fs
id=
"plugin-fs"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_fs"
></glances-plugin-fs>
<glances-plugin-network
id=
"plugin-network"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_network"
></glances-plugin-network>
<glances-plugin-wifi
id=
"plugin-wifi"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_wifi"
></glances-plugin-wifi>
<glances-plugin-ports
id=
"plugin-ports"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_ports"
></glances-plugin-ports>
<glances-plugin-diskio
id=
"plugin-diskio"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_diskio"
></glances-plugin-diskio>
<glances-plugin-fs
id=
"plugin-fs"
class=
"plugin table-row-group"
ng-if=
"!vm.arguments.disable_fs"
></glances-plugin-fs>
<glances-plugin-irq
id=
"plugin-irq"
ng-if=
"vm.arguments.enable_irq"
></glances-plugin-irq>
<glances-plugin-folders
id=
"plugin-folders"
ng-if=
"!vm.arguments.disable_folders"
></glances-plugin-folders>
<glances-plugin-folders
id=
"plugin-folders"
ng-if=
"!vm.arguments.disable_folders"
></glances-plugin-folders>
<glances-plugin-raid
id=
"plugin-raid"
ng-if=
"!vm.arguments.raid"
></glances-plugin-raid>
<glances-plugin-sensors
id=
"plugin-sensors"
ng-if=
"!vm.arguments.disable_sensors"
></glances-plugin-sensors>
<glances-plugin-sensors
id=
"plugin-sensors"
ng-if=
"!vm.arguments.disable_sensors"
></glances-plugin-sensors>
</div>
</div>
<div
class=
"col-sm-18"
>
...
...
glances/outputs/static/js/components/plugin-amps/controller.js
浏览文件 @
14584442
...
...
@@ -15,13 +15,13 @@ function GlancesPluginAmpsController($scope, GlancesStats, favicoService) {
var
loadData
=
function
(
data
)
{
var
processes
=
data
.
stats
[
'
amps
'
];
this
.
processes
=
[];
vm
.
processes
=
[];
angular
.
forEach
(
processes
,
function
(
process
)
{
if
(
process
.
result
!==
null
)
{
this
.
processes
.
push
(
process
);
vm
.
processes
.
push
(
process
);
}
},
this
);
}
}
;
vm
.
getDescriptionDecoration
=
function
(
process
)
{
var
count
=
process
.
count
;
...
...
@@ -30,13 +30,13 @@ function GlancesPluginAmpsController($scope, GlancesStats, favicoService) {
var
decoration
=
"
ok
"
;
if
(
count
>
0
)
{
if
((
countMin
==
null
||
count
>=
countMin
)
&&
(
countMax
==
null
||
count
<=
countMax
))
{
if
((
countMin
==
=
null
||
count
>=
countMin
)
&&
(
countMax
=
==
null
||
count
<=
countMax
))
{
decoration
=
'
ok
'
;
}
else
{
decoration
=
'
careful
'
;
}
}
else
{
decoration
=
countMin
==
null
?
'
ok
'
:
'
critical
'
;
decoration
=
countMin
==
=
null
?
'
ok
'
:
'
critical
'
;
}
return
decoration
;
...
...
glances/outputs/static/js/components/plugin-cpu/controller.js
浏览文件 @
14584442
...
...
@@ -55,7 +55,7 @@ function GlancesPluginCpuController($scope, GlancesStats) {
}
}
this
.
getDecoration
=
function
(
value
)
{
vm
.
getDecoration
=
function
(
value
)
{
if
(
_view
[
value
]
===
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-diskio/controller.js
浏览文件 @
14584442
...
...
@@ -14,15 +14,13 @@ function GlancesPluginDiskioController($scope, $filter, GlancesStats, ARGUMENTS)
});
var
loadData
=
function
(
data
)
{
var
stats
=
data
.
stats
[
'
diskio
'
];
var
stats
=
data
.
stats
[
'
diskio
'
]
||
[]
;
stats
=
$filter
(
'
orderBy
'
)(
stats
,
'
disk_name
'
);
vm
.
disks
=
[];
for
(
var
i
=
0
;
i
<
stats
.
length
;
i
++
)
{
var
diskioData
=
stats
[
i
];
vm
.
disks
=
stats
.
map
(
function
(
diskioData
)
{
var
timeSinceUpdate
=
diskioData
[
'
time_since_update
'
];
vm
.
disks
.
push
(
{
return
{
'
name
'
:
diskioData
[
'
disk_name
'
],
'
bitrate
'
:
{
'
txps
'
:
$filter
(
'
bytes
'
)(
diskioData
[
'
read_bytes
'
]
/
timeSinceUpdate
),
...
...
@@ -33,7 +31,7 @@ function GlancesPluginDiskioController($scope, $filter, GlancesStats, ARGUMENTS)
'
rxps
'
:
$filter
(
'
bytes
'
)(
diskioData
[
'
write_count
'
]
/
timeSinceUpdate
)
},
'
alias
'
:
diskioData
[
'
alias
'
]
!==
undefined
?
diskioData
[
'
alias
'
]
:
null
}
)
;
}
};
}
);
}
}
glances/outputs/static/js/components/plugin-diskio/view.html
浏览文件 @
14584442
...
...
@@ -6,7 +6,7 @@
<div
class=
"table-cell"
ng-show=
"vm.arguments.diskio_iops"
>
IOR/s
</div>
<div
class=
"table-cell"
ng-show=
"vm.arguments.diskio_iops"
>
IOW/s
</div>
</div>
<div
class=
"table-row"
ng-repeat=
"disk in vm.disks
track by name
"
>
<div
class=
"table-row"
ng-repeat=
"disk in vm.disks"
>
<div
class=
"table-cell text-left"
>
{{(disk.alias ? disk.alias : disk.name) | min_size}}
</div>
<div
class=
"table-cell"
ng-show=
"!vm.arguments.diskio_iops"
>
{{disk.bitrate.txps }}
</div>
<div
class=
"table-cell"
ng-show=
"!vm.arguments.diskio_iops"
>
{{disk.bitrate.rxps }}
</div>
...
...
glances/outputs/static/js/components/plugin-docker/controller.js
浏览文件 @
14584442
...
...
@@ -15,16 +15,14 @@ function GlancesPluginDockerController($scope, GlancesStats) {
var
loadData
=
function
(
data
)
{
var
stats
=
data
.
stats
[
'
docker
'
];
this
.
containers
=
[];
vm
.
containers
=
[];
if
(
_
.
isEmpty
(
stats
))
{
return
;
}
for
(
var
i
=
0
;
i
<
stats
[
'
containers
'
].
length
;
i
++
)
{
var
containerData
=
stats
[
'
containers
'
][
i
];
var
container
=
{
vm
.
containers
=
stats
[
'
containers
'
].
map
(
function
(
containerData
)
{
return
{
'
id
'
:
containerData
.
Id
,
'
name
'
:
containerData
.
Names
[
0
].
split
(
'
/
'
).
splice
(
-
1
)[
0
],
'
status
'
:
containerData
.
Status
,
...
...
@@ -39,9 +37,7 @@ function GlancesPluginDockerController($scope, GlancesStats) {
'
command
'
:
containerData
.
Command
,
'
image
'
:
containerData
.
Image
};
vm
.
containers
.
push
(
container
);
}
});
vm
.
version
=
stats
[
'
version
'
][
'
Version
'
];
}
...
...
glances/outputs/static/js/components/plugin-docker/view.html
浏览文件 @
14584442
<section
id=
"containers"
class=
"plugin"
ng-if=
"vm.containers.length"
>
<section
id=
"containers
-plugin
"
class=
"plugin"
ng-if=
"vm.containers.length"
>
<span
class=
"title"
>
CONTAINERS
</span>
{{ vm.containers.length }} (served by Docker {{ vm.version }})
<div
class=
"table"
>
...
...
@@ -13,7 +13,7 @@
<div
class=
"table-cell"
>
TX/s
</div>
<div
class=
"table-cell text-left"
>
Command
</div>
</div>
<div
class=
"table-row"
ng-repeat=
"container in vm.containers"
>
<div
class=
"table-row"
ng-repeat=
"container in vm.containers
track by container.id
"
>
<div
class=
"table-cell text-left"
>
{{ container.name }}
</div>
<div
class=
"table-cell"
ng-class=
"container.status == 'Paused' ? 'careful' : 'ok'"
>
{{ container.status }}
</div>
...
...
glances/outputs/static/js/components/plugin-load/controller.js
浏览文件 @
14584442
...
...
@@ -25,9 +25,9 @@ function GlancesPluginLoadController($scope, GlancesStats) {
vm
.
min1
=
stats
[
'
min1
'
];
vm
.
min5
=
stats
[
'
min5
'
];
vm
.
min15
=
stats
[
'
min15
'
];
}
}
;
this
.
getDecoration
=
function
(
value
)
{
vm
.
getDecoration
=
function
(
value
)
{
if
(
_view
[
value
]
===
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-mem/controller.js
浏览文件 @
14584442
...
...
@@ -27,7 +27,7 @@ function GlancesPluginMemController($scope, GlancesStats) {
vm
.
free
=
stats
[
'
free
'
];
}
this
.
getDecoration
=
function
(
value
)
{
vm
.
getDecoration
=
function
(
value
)
{
if
(
_view
[
value
]
===
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-memswap/controller.js
浏览文件 @
14584442
...
...
@@ -25,9 +25,9 @@ function GlancesPluginMemswapController($scope, GlancesStats) {
vm
.
total
=
stats
[
'
total
'
];
vm
.
used
=
stats
[
'
used
'
];
vm
.
free
=
stats
[
'
free
'
];
}
}
;
this
.
getDecoration
=
function
(
value
)
{
vm
.
getDecoration
=
function
(
value
)
{
if
(
_view
[
value
]
===
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-quicklook/controller.js
浏览文件 @
14584442
...
...
@@ -39,9 +39,9 @@ function GlancesPluginQuicklookController($scope, GlancesStats, ARGUMENTS) {
'
total
'
:
cpu
.
total
});
},
this
);
}
}
;
this
.
getDecoration
=
function
(
value
)
{
vm
.
getDecoration
=
function
(
value
)
{
if
(
_view
[
value
]
===
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-raid/controller.js
浏览文件 @
14584442
...
...
@@ -40,11 +40,11 @@ function GlancesPluginRaidController($scope, GlancesStats) {
});
vm
.
disks
=
disks
;
}
}
;
vm
.
hasDisks
=
function
()
{
return
this
.
disks
.
length
>
0
;
}
return
vm
.
disks
.
length
>
0
;
}
;
vm
.
getAlert
=
function
(
disk
)
{
if
(
disk
.
inactive
)
{
...
...
@@ -56,5 +56,5 @@ function GlancesPluginRaidController($scope, GlancesStats) {
}
return
'
ok
'
}
}
;
}
glances/outputs/static/js/components/plugin-sensors/controller.js
浏览文件 @
14584442
...
...
@@ -20,7 +20,7 @@ function GlancesPluginSensorsController($scope, GlancesStats, GlancesPluginHelpe
});
vm
.
sensors
=
data
;
}
}
;
vm
.
getAlert
=
function
(
sensor
)
{
var
current
=
sensor
.
type
==
'
battery
'
?
100
-
sensor
.
value
:
sensor
.
value
;
...
...
glances/outputs/static/js/components/plugin-wifi/controller.js
浏览文件 @
14584442
...
...
@@ -17,6 +17,7 @@ function GlancesPluginWifiController($scope, $filter, GlancesStats) {
var
loadData
=
function
(
data
)
{
var
stats
=
data
.
stats
[
'
wifi
'
];
_view
=
data
.
views
[
'
wifi
'
];
//stats = [{"ssid": "Freebox-40A258", "encrypted": true, "signal": -45, "key": "ssid", "encryption_type": "wpa2", "quality": "65/70"}];
vm
.
hotspots
=
[];
for
(
var
i
=
0
;
i
<
stats
.
length
;
i
++
)
{
...
...
@@ -35,10 +36,10 @@ function GlancesPluginWifiController($scope, $filter, GlancesStats) {
}
vm
.
hotspots
=
$filter
(
'
orderBy
'
)(
vm
.
hotspots
,
'
ssid
'
);
}
}
;
vm
.
getDecoration
=
function
(
hotpost
,
field
)
{
if
(
_view
[
hotpost
.
ssid
][
field
]
==
undefined
)
{
if
(
_view
[
hotpost
.
ssid
][
field
]
==
=
undefined
)
{
return
;
}
...
...
glances/outputs/static/js/components/plugin-wifi/view.html
浏览文件 @
14584442
<section
id=
"wifi"
class=
"plugin table-row-group"
ng-if=
"vm.hotspots.length > 0"
>
<div
class=
"table-row"
>
<div
class=
"table-cell text-left title"
>
WIFI
</div>
<div
class=
"table-cell"
></div>
<div
class=
"table-cell"
>
dBm
</div>
<div
class=
"table-row"
ng-if=
"vm.hotspots.length > 0"
>
<div
class=
"table-cell text-left title"
>
WIFI
</div>
<div
class=
"table-cell"
></div>
<div
class=
"table-cell"
>
dBm
</div>
</div>
<div
class=
"table-row"
ng-repeat=
"hotspot in vm.hotspots"
>
<div
class=
"table-cell text-left"
>
{{ hotspot.ssid|limitTo:20 }}
<span
ng-if=
"hotspot.encrypted"
>
{{ hotspot.encryption_type }}
</span>
</div>
<div
class=
"table-row"
ng-repeat=
"hotspot in vm.hotspots track by ssid"
>
<div
class=
"table-cell text-left"
>
{{ hotspot.ssid|limitTo:20 }}
<span
ng-if=
"hotspot.encrypted"
>
{{ hotspot.encryption_type }}
</span>
</div>
<div
class=
"table-cell"
></div>
<div
class=
"table-cell"
ng-class=
"vm.getDecoration(hotspot, 'signal')"
>
{{ hotspot.signal }}
</div>
</div>
</section>
<div
class=
"table-cell"
></div>
<div
class=
"table-cell"
ng-class=
"vm.getDecoration(hotspot, 'signal')"
>
{{ hotspot.signal }}
</div>
</div>
glances/outputs/static/public/js/main.min.js
浏览文件 @
14584442
此差异由.gitattributes 抑制。
glances/outputs/static/public/js/templates.min.js
浏览文件 @
14584442
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录