github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only show more button on list pages if scope.moreClick defined 

Remove placeholder thumbnails from pod listing page of web ui
Show pods when there are no labels
pull/6/head
BC Broussard 2015-05-15 13:24:08 -07:00
parent efb42b302d
commit f62aa79cd5
3 changed files with 8767 additions and 8747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17468
pkg/ui/datafile.go
View File

File diff suppressed because it is too large Load Diff

23
www/app/assets/js/app.js
View File

@ -1258,7 +1258,6 @@ app.controller('ListPodsCtrl', [
$scope.serverView = false;
$scope.headers = [
{name: '', field: 'thumb'},
{name: 'Pod', field: 'pod'},
{name: 'IP', field: 'ip'},
{name: 'Status', field: 'status'},
@ -1278,7 +1277,6 @@ app.controller('ListPodsCtrl', [
status: 'grey'
};
$scope.sortable = ['pod', 'ip', 'status'];
$scope.thumbs = 'thumb';
$scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
@ -1323,18 +1321,19 @@ app.controller('ListPodsCtrl', [
});
}
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
if (pod.labels) {
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
}
$scope.content.push({
thumb: '"assets/img/kubernetes.svg"',
pod: pod.id,
ip: pod.currentState.podIP,
containers: _fixComma(_containers),

23
www/master/components/dashboard/js/modules/controllers/listPodsController.js
View File

@ -16,7 +16,6 @@ app.controller('ListPodsCtrl', [
$scope.serverView = false;
$scope.headers = [
{name: '', field: 'thumb'},
{name: 'Pod', field: 'pod'},
{name: 'IP', field: 'ip'},
{name: 'Status', field: 'status'},
@ -36,7 +35,6 @@ app.controller('ListPodsCtrl', [
status: 'grey'
};
$scope.sortable = ['pod', 'ip', 'status'];
$scope.thumbs = 'thumb';
$scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
@ -81,18 +79,19 @@ app.controller('ListPodsCtrl', [
});
}
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
if (pod.labels) {
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
}
$scope.content.push({
thumb: '"assets/img/kubernetes.svg"',
pod: pod.id,
ip: pod.currentState.podIP,
containers: _fixComma(_containers),