From 7605cb5567fba6525d65b71044ce909774e159fd Mon Sep 17 00:00:00 2001 From: bryk Date: Mon, 21 Nov 2016 11:42:02 +0100 Subject: [PATCH] Make card titles consistent across the UI Fixes #1451 --- i18n/messages-en.xtb | 923 +++--------------- i18n/messages-ja.xtb | 139 +++ .../components/infocard/infocardsection.html | 2 +- .../resourcecard/resourcecardlist.html | 2 +- .../resourcecardlist_component.js | 18 +- .../daemonsetdetail/daemonsetinfo.html | 3 +- .../deploymentdetail/deploymentinfo.html | 3 +- src/app/frontend/ingressdetail/info.html | 3 +- src/app/frontend/jobdetail/jobinfo.html | 2 +- .../namespacedetail/namespaceinfo.html | 3 +- src/app/frontend/nodedetail/nodeinfo.html | 3 +- .../persistentvolumeclaiminfo.html | 3 +- .../persistentvolumeinfo.html | 81 +- src/app/frontend/poddetail/podinfo.html | 3 +- .../replicasetdetail/replicasetinfo.html | 3 +- .../replicationcontrollerinfo.html | 3 +- src/app/frontend/secretdetail/info.html | 3 +- .../servicedetail/servicedetailinfo.html | 4 +- .../statefulsetdetail/statefulsetinfo.html | 3 +- .../resourcecardlist_component_test.js | 2 + ...sourcecardlistpagination_component_test.js | 2 +- 21 files changed, 387 insertions(+), 821 deletions(-) diff --git a/i18n/messages-en.xtb b/i18n/messages-en.xtb index 3c00f733c7c..69da77dbc81 100644 --- a/i18n/messages-en.xtb +++ b/i18n/messages-en.xtb @@ -2,13 +2,6 @@ Delete Edit - Namespaces - Nodes - Persistent Volumes - Namespaces - Nodes - Persistent Volumes - Resource Quotas All namespaces Admin Config @@ -25,7 +18,6 @@ Nodes Persistent Volumes Persistent Volume Claims - Pet Sets Pods Replication Controllers Replica Sets @@ -53,7 +45,6 @@ Replica Sets Replication Controllers Daemon Sets - Pet Sets Stateful Sets Delete Edit @@ -61,10 +52,9 @@ Upload YAML Create an application or any Kubernetes resource Create - Created by: - show less annotations - show fewer annotations - show all annotations + Created by: + show fewer annotations + show all annotations last applied configuration Conditions Type @@ -79,12 +69,10 @@ - - - - show less labels show fewer labels show all labels Delete View/edit YAML - Rows per page: Actions Name Namespace @@ -92,7 +80,6 @@ Annotations Creation time There is nothing to display here - You can <a href="{{::$ctrl.getStateHref()}}">deploy a containerized app</a>, select other namespace or <a href="http://kubernetes.io/docs/user-guide/ui/" target="_blank">take the Dashboard Tour <i class="material-icons kd-zerostate-icon">open_in_new</i></a> to learn more You can <a href="{{::$ctrl.getStateHref()}}">deploy a containerized app</a>, select other namespace or <a href="http://kubernetes.io/docs/user-guide/ui/" target="_blank">take the Dashboard Tour <i class="material-icons kd-zerostate-icon">open_in_new</i></a> to learn more. Namespace Selector for namespaces @@ -113,49 +100,23 @@ Name Namespace Labels - Name - Namespace - Labels - Age - Config Maps + Config Maps + Name + Namespace + Labels + Age Config Map Config Map - Secrets - Config Maps - Config Maps Close Last applied configuration - Config Map - Data - Details - Labels - Namespace - Name - Config Map Created at - Age - Labels - Name - Namespace - Secrets - Args - Commands - Environment variables - Image - View logs - - - - - - - Containers CPU usage Memory usage - Services - There is nothing to display here - There are currently no Services with the same label selector as this Daemon Set. - Pods - There is nothing to display here - There are currently no Pods scheduled on this Daemon Set. - Details + There is nothing to display here + There are currently no Services with the same label selector as this Daemon Set. + There is nothing to display here + There are currently no Pods scheduled on this Daemon Set. + Details Name Pods status {{::$ctrl.daemonSet.podInfo.pending}} pending @@ -169,54 +130,22 @@ {{::$ctrl.daemonSet.podInfo.current}} created {{::$ctrl.daemonSet.podInfo.desired}} desired {{::$ctrl.daemonSet.podInfo.running}} running - Name - Namespace - Labels - Pods - Age - Images - Kind - Daemon Sets + Daemon Sets + Name + Kind + Namespace + Labels + Pods + Age + Images One or more pods have errors. One or more pods are in pending state. - Daemon Set + Daemon Set Daemon Set - Daemon Set + Daemon Set CPU usage Memory usage - Events - Overview - Pods - There are currently no Pods scheduled on this Daemon Set - There is nothing to display here - Services - There are currently no Services with the same label selector as this Daemon Set - There is nothing to display here - Details - Images - Labels - Namespace - Name - created - desired - failed - Pods - pending - running - Pods status - Status - Age Created at - Daemon Set - Images - Labels - Namespace - Name - Pods - Are you sure you want to delete <i></i> in namespace <i></i>? - Cancel - Delete - Delete a Deployment CPU usage Memory usage @@ -225,9 +154,8 @@ There are currently no new Replication Controllers on this Deployment. Old Replica Sets There is nothing to display here - There are currently no old Replication Controllers on this Deployment. This Deployment does not have any old replica sets - Details + Details Name Max surge: {{ $ctrl.deployment.rollingUpdateStrategy.maxSurge}} Max unavailable: {{ $ctrl.deployment.rollingUpdateStrategy.maxUnavailable}} @@ -237,62 +165,27 @@ {{ $ctrl.deployment.statusInfo.available}} available {{ $ctrl.deployment.statusInfo.unavailable}} unavailable Namespace - Labels - Label selector + Labels + Label selector Strategy Min ready seconds - Revision history limit + Revision history limit Not set Rolling update strategy - Name - Namespace - Labels - Pods - Age - Images - Deployments + Deployments + Name + Namespace + Labels + Pods + Age + Images One or more pods have errors One or more pods are in pending state Deployment Deployment CPU usage Memory usage - Deployment - Details - Events - Labels - Label selector - Max surge: - Max unavailable: - Min ready seconds - Namespace - Name - New Replica Set - There are currently no new Replication Controllers on this Deployment - There is nothing to display here - Old Replica Sets - There are currently no old Replication Controllers on this Deployment - There is nothing to display here - Overview - available - total - unavailable - updated - Revision history limit - Not set - Rolling update strategy - Status - Strategy - Age Created at - Deployment - Images - Labels - Namespace - Name - One or more pods have errors - Pods - One or more pods are in pending state No Would you like to deploy anyway? Yes @@ -303,7 +196,6 @@ The new namespace will be added to the cluster. Namespace name Name must be alphanumeric and may contain dashes. - Name must be up to {{::$ctrl.maxLength}} characters long. Name must be up to {{::$ctrl.namespaceMaxLength}} characters long. Name is required. A namespace with the specified name will be added to the cluster. @@ -325,7 +217,6 @@ Learn more Image pull secret data Data is required. - To learn more, take the Dashboard Tour Upload Cancel App name @@ -347,20 +238,8 @@ Name Variable name must be a valid C identifier. Value - Name - Variable name must be a valid C identifier. - Environment variables - Value - Upload a YAML or JSON file hide advanced options - Label Key name should not exceed 63 characters - Label key name must be alphanumeric separated by '-', '_' or '.', optionally prefixed by a DNS subdomain and '/' is not unique. - Prefix should not exceed 253 characters - Prefix is not a valid DNS subdomain prefix. Example: my-domain.com - Label Value must not exceed 253 characters - Label value must be alphanumeric separated by '.' , '-' or '_' - Deploy a Containerized App Service Port Protocol @@ -374,13 +253,8 @@ Target port must be an integer. Target port must be greater than 0. Target port cannot be empty. - Replication controller or service with this name already exists within namespace - App name Name must be up to characters long. - Application name must start with a lowercase letter and contain only lowercase letters, numbers, and '-' between words. - Application name is required. An 'app' label with this value will be added to the Deployment and Service that get deployed. - An 'app' label with this value will be added to the Replication Controller and Service that get deployed. Container image is invalid: Container image Container image is required @@ -412,7 +286,6 @@ Number of pods must be at least 1 Number of pods is required A Deployment will be created to maintain the desired number of pods across your cluster. - A Replication Controller will be created to maintain the desired number of pods across your cluster. Optionally, an internal or external Service can be defined to map an incoming Port to a target Port seen by the container. Run as privileged Run command arguments @@ -421,26 +294,13 @@ Processes in privileged containers are equivalent to processes running as root on the host. The internal DNS name for this Service will be: show advanced options - Specify app details below YAML or JSON file File is required. Select a YAML or JSON file, specifying the resources to deploy. Learn more - Learn more - File is required - Select a YAML or JSON file, specifying the resources to deploy. - YAML or JSON file - Cancel - Edit a - Update - value from ConfigMap / Close Unknown Server Error. - Unknown Server Error - All - Events - Count - Events + Events Message Source Sub-object @@ -449,14 +309,6 @@ Last seen There is nothing to display here It is possible that all events have expired. - First seen - Last seen - Message - There is nothing to display here - It is possible that all events have expired. - Source - Sub-object - Type Warning CPU (cores) CPU Limit @@ -465,52 +317,24 @@ Memory (bytes) Memory Usage Time - Cancel - Create - The new secret will be added to the cluster - Create a new image pull secret - A secret with the specified name will be added to the cluster in the namespace - Data must be Base64 encoded - Image pull secret data - Data is required - Specify the data for your secret to hold. The value is the Base64 encoded content of a .dockercfg file. - Learn more - Secret name - Name must be up to characters long. - Name must follow the DNS domain name syntax (e.g. new.image-pull.secret) - Name is required. Ingress - Details + Details Name Namespace Labels Annotations - Name - Namespace - Endpoints - Age - Ingresses - Ingress - Annotations - Data - Details - Labels - Namespace - Name - Status - Age - Endpoints - Namespace - Name + Ingresses + Name + Namespace + Endpoints + Age Created at UTC Job CPU usage Memory usage - There are currently no Pods managed by this Job. - Pods - There is nothing to display here - There are currently no Pods selected by this Job. - Resource details + There is nothing to display here + There are currently no Pods managed by this Job. + Details Details active succeeded @@ -523,115 +347,42 @@ Parallelism Status Pods - Name - Namespace - Labels - Pods - Age - Images - Kind - Jobs + Jobs + Name + Kind + Namespace + Labels + Pods + Age + Images Job CPU usage Memory usage - Completions - Details - Job - Pods - Images - Labels - Age - Images - Labels - Namespace - Name - Pods - Name - Namespace - Paralleism - Pods - active - failed - succeeded - Resource details - Status - show all labels - show less labels Logs from in Logs from to - Logs from - in - to The selected container has not logged any messages yet. - There is nothing to display here - Namespace - Details + Details Status - Name - Labels - Status - Age - Namespaces - Cancel - Create - Learn more - The new namespace will be added to the cluster. - Create a new namespace - A namespace with the specified name will be added to the cluster. - Details - Resource Quotas - Status - Age + Namespaces + Name + Labels + Status + Age Created at - namespaces - Labels - Name - Status - Namespace name - Name must be up to characters long - Name must be alphanumeric and may contain dashes - Name is required Selector for namespaces - Admin - Config - Config Maps - Daemon Sets - Deployments - Ingresses - Jobs - Namespaces - Nodes - Persistent Volumes - Pet Sets - Pods - Persistent Volume Claims - Replication Controllers - Replica Sets - Secrets - Services - Services and discovery - Storage - Workloads - CPU requests (cores) - CPU limits (cores) - Memory requests (bytes) - Memory limits (bytes) - Pods - Allocated resources - Type - Status - Last heartbeat time - Last transition time - Reason - Message + Allocated resources + CPU requests (cores) + CPU limits (cores) + Memory requests (bytes) + Memory limits (bytes) + Pods CPU usage Memory usage - Pods - There is nothing to display here - There are currently no Pods scheduled on this Node. - Details + There is nothing to display here + There are currently no Pods scheduled on this Node. + Details Phase Kernel Version OS Image @@ -640,8 +391,6 @@ Kube-Proxy Version Operating system Architecture - Allocated resources - Conditions External ID Pod CIDR Provider ID @@ -650,68 +399,30 @@ Machine ID System UUID Boot ID - Name - Labels - Ready - Age - Nodes + Nodes + Name + Labels + Ready + Age CPU usage Memory usage - CPU limits (cores) - CPU requests (cores) - Allocated resources - Memory limits (bytes) - Memory requests (bytes) - Pods - Architecture - Boot ID - Conditions - Last heartbeat time - Last transition time - Message - Reason - Status - Type - Container Runtime Version - Details - External ID - Kernel Version - Kubelet Version - Kube-Proxy Version - Machine ID - Operating system - OS Image - Phase - Pods - There are currently no Pods scheduled on this Node - There is nothing to display here - Pod CIDR - Provider ID - System info - System UUID - Unschedulable - Age Created at - Labels - Name - Pods - Ready Persistent Volume Claim - Details + Details Status Volume Capacity Access modes - Name - Namespace - Volume - Labels - Age - Persistent Volume Claims + Persistent Volume Claims + Name + Namespace + Volume + Labels + Age This claim is in lost state This claim is in pending state Persistent Volume - Details + Details Status Claim Reclaim policy @@ -763,116 +474,19 @@ Read only AWS block storage Volume ID - Name - Labels - Capacity - Access modes - Status - Claim - Reason - Age - Persistent Volumes + Persistent Volumes + Name + Labels + Capacity + Access modes + Status + Claim + Reason + Age Persistent Volume Persistent Volume - This claim is in lost state - This claim is in pending state - Persistent Volume Claim - Access modes - Capacity - Details - Status - Volume - Age Created at - Labels - Namespace - Name - Volume - Persistent Volume - Access modes - Capacity - Claim - Data - Details - Message - Reclaim policy - Status Created at - Access modes - Age - Capacity - Claim - Labels - Name - Reason - Status - Persistent Volume - Pet Set - CPU usage - Memory usage - Pods - There is nothing to display here - There are currently no Pods selected by this Pet Set. - Details - Labels - {{ $ctrl.petSet.podInfo.failed}} failed - {{ $ctrl.petSet.podInfo.running}} running - Images - Status - Pods - {{ $ctrl.petSet.podInfo.current}} created - {{ $ctrl.petSet.podInfo.desired}} desired - {{ $ctrl.petSet.podInfo.running}} running - Pods status - {{ $ctrl.petSet.podInfo.pending}} pending - Kind - Name - Name - Namespace - Namespace - Labels - Labels - Pods - Pods - Age - Age - Images - Images - Pet Sets - Pet Set - One or more pods have errors - One or more pods have errors - One or more pods are in pending state - One or more pods are in pending state - Pet Set - Pet Set - Pet Set - CPU usage - Memory usage - One or more pods have errors - One or more pods are in pending state - Pet Set - Pods - created - desired - failed - pending - running - There are currently no Pods selected by this Pet Set - There is nothing to display here - Details - Images - Pods - Pods status - Status - Created at - Age - Images - Labels - Name - Pods - Namespace - Pet Set Pod Containers Image @@ -884,7 +498,6 @@ Args - View logs - Creator Created by Created by Created by @@ -893,155 +506,43 @@ Unknown creator CPU usage Memory usage - Pod + Details Status View logs Network Node IP - Name - Namespace - Logs - Pod + Pods + Name + This pod is in a pending state. + Logs Pod - Pods - Status - Restarts - Age - Cluster IP - CPU (cores) - Memory (bytes) - This pod has errors. - This pod is in a pending state. + Pod + Namespace + Status + Restarts + Age + Cluster IP + CPU (cores) + Memory (bytes) + This pod has errors. CPU usage Memory usage - One or more pods have errors. - One or more pods are in pending state. - Pod - Pod - IP - View logs - Network - Node - Overview - Status Terminated: Waiting: Started at UTC - Port cannot be empty - Port must be an integer - Port - Port must be less than 65536 - Port must be greater than 0 - Invalid protocol - Protocol - Protocol is required - Service External Internal None - Target port cannot be empty - Target port must be an integer - Target port - Target port must be less than 65536 - Target port must be greater than 0 - FS type - Partition - Read only - AWS block storage - Volume ID - FS Type - Read only - Cinder - Volume ID - FS type - Lun - Read only - Target WWNs - FC - Dataset name - Flocker - FS type - Partition - PD name - Read only - GCE persistent disk - Endpoints - Path - Read only - GlusterFS - Path - Host path - FS type - IQN - Lun - Read only - Target portal - ISCSI - Path - Read only - Server - NFS - Image - Keyring - Monitors - Read only - SecretRef - RBD - User - Persistent volume source - Scale - Edit number of pods - Details - Images - Label selector - Setting high number of pods may cause performance issues of the cluster and Dashboard UI. - Number of replicas must be equal to or greater than zero - Number of pods - Number of pods is required - created - desired - failed - Pods - pending - running - Pods status - Pods - There are currently no Pods selected by this Replication Controller - There is nothing to display here - Replication Controller - Services - There are currently no Services with the same label selector as this Replication Controller - There is nothing to display here - Status - Cancel - OK - Current status: created, desired - Set desired number of pods - Replication controller will be updated to reflect the desired count. - Age Created at - Scale - Images - Labels - Namespace - Name - One or more pods have errors - Pods - One or more pods are in pending state - Replication Controller - View details Replica Set CPU usage Memory usage - Services - There are currently no Pods managed by this Replica Set - There is nothing to display here - There are currently no Services with the same label selector as this Replica Set. - Pods - There is nothing to display here - There are currently no Pods scheduled on this Replica Set. - Details + There is nothing to display here + There are currently no Pods managed by this Replica Set + There is nothing to display here + There are currently no Services with the same label selector as this Replica Set. + Details Selector {{::$ctrl.replicaSet.podInfo.running}} running Images @@ -1052,21 +553,19 @@ Pods status {{::$ctrl.replicaSet.podInfo.pending}} pending {{::$ctrl.replicaSet.podInfo.failed}} failed - Name - Namespace - Labels - Pods - Age - Images - Kind - Kind - Replica Sets + Replica Sets + Name + Kind + Namespace + Labels + Pods + Age + Images One or more pods have errors One or more pods are in pending state - Replica Set + Replica Set Replica Set - Replica Set - Replica Set + Replica Set CPU usage Memory usage Edit number of pods @@ -1074,14 +573,11 @@ Replication Controller CPU usage Memory usage - Services - There are currently no Pods managed by this Replication Controller. - There is nothing to display here - There are currently no Services with the same label selector as this Replication Controller. - Pods - There is nothing to display here - There are currently no Pods selected by this Replication Controller. - Details + There is nothing to display here + There are currently no Services with the same label selector as this Replication Controller. + There is nothing to display here + There are currently no Pods managed by this Replication Controller. + Details Label selector {{::$ctrl.replicationControllerpods.podInfo.failed}} failed {{::$ctrl.replicationControllerpods.podInfo.running}} running @@ -1102,15 +598,14 @@ Setting high number of pods may cause performance issues of the cluster and Dashboard UI. Cancel OK - Name - Namespace - Labels - Pods - Age - Images - Kind - Kind - Replication Controllers + Replication Controllers + Name + Kind + Namespace + Labels + Pods + Age + Images View details Scale Replication Controller @@ -1118,123 +613,48 @@ One or more pods have errors One or more pods are in pending state Replication Controller - Replication Controller CPU usage Memory usage - Details - Events - Images - Overview - created - desired - failed - Pods - pending - running - Pods status - Pods - There are currently no Pods scheduled on this Replica Set - There is nothing to display here - Replica Set - Selector - Services - There are currently no Services with the same label selector as this Replica Set - There is nothing to display here - Status - Age Created at - Images - Labels - Namespace - Name - One or more pods have errors - Pods - One or more pods are in pending state - Replica Set - Type - Resource - Min - Max - Default Request - Default Limit - Max Limit/Request Ratio Resource Name Hard Used - Resource quotas Resource Quotas Name Scopes Pagination error - Annotations - Labels - Namespace - Name - Creation time Secret Data bytes - Details - Name - Namespace - Age - Secrets - Secret - Data - Details - Age - Namespace - Name + Details + Secrets + Name + Namespace + Age Created at UTC - Resource Details - Details - Label selector - Type - Connection - Cluster IP - Internal endpoints - External endpoints - Pods + Details + Label selector + Type + Connection + Cluster IP + Internal endpoints + External endpoints There is nothing to display here There are currently no Pods selected by this Service. - Name - Namespace - Labels - Cluster IP - Internal endpoints - External endpoints - Services + Services + Name + Namespace + Labels + Cluster IP + Internal endpoints + External endpoints This service is in a pending state - Services - Ingress - Ingress - Services - Cluster IP - Connection - Details - External endpoints - Internal endpoints - Label selector - Pods - Resource Details - Type - This service is in a pending state. - Cluster IP - External endpoints - Internal endpoints - Labels - Namespace - Name Stateful Set - CPU usage history CPU usage Memory usage - Memory usage history - Pods - There are currently no Pods managed by this Stateful Set. - There is nothing to display here - There are currently no Pods selected by this Stateful Set. - Details + There is nothing to display here + There are currently no Pods managed by this Stateful Set. + Details Labels {{ $ctrl.statefulSet.podInfo.failed}} failed {{ $ctrl.statefulSet.podInfo.running}} running @@ -1246,23 +666,21 @@ {{ $ctrl.statefulSet.podInfo.running}} running Pods status {{ $ctrl.statefulSet.podInfo.pending}} pending - Name - Kind - Namespace - Labels - Pods - Age - Images - Stateful Sets + Stateful Sets + Name + Kind + Namespace + Labels + Pods + Age + Images One or more pods have errors One or more pods are in pending state Stateful Set Stateful Set Stateful Set - CPU usage history CPU usage Memory usage - Memory usage history Created at - days @@ -1277,25 +695,6 @@ a second years a year - Upload - Cancel - Daemon sets - Daemon sets - Deployments - Jobs - Pet Sets - Pods - Replication controllers - Replica sets CPU usage Memory usage - Title for graph card displaying CPU metric of one all resources. - Daemon sets - Deployments - Stateful Sets - Pet Sets - Replica sets - Jobs - Replication controllers - Pods diff --git a/i18n/messages-ja.xtb b/i18n/messages-ja.xtb index efba697bac4..c51be8a9023 100644 --- a/i18n/messages-ja.xtb +++ b/i18n/messages-ja.xtb @@ -117,11 +117,16 @@ Name Namespace Labels + Config Maps Name Namespace + Name + Namespace Labels + Labels Age Config Maps + Age Config Map Config Map Secrets @@ -155,10 +160,14 @@ CPU usage history Memory usage Memory usage history + There is nothing to display here Services There is nothing to display here + There are currently no Services with the same label selector as this Daemon Set. + There is nothing to display here There are currently no Services with the same label selector as this Daemon Set. Pods + There are currently no Pods scheduled on this Daemon Set. There is nothing to display here There are currently no Pods scheduled on this Daemon Set. Details @@ -176,12 +185,20 @@ {{::$ctrl.daemonSet.podInfo.desired}} desired {{::$ctrl.daemonSet.podInfo.running}} running Name + Daemon Sets Namespace + Name Labels + Kind + Namespace Pods + Labels Age + Pods Images Kind + Age + Images Daemon Sets One or more pods have errors. One or more pods are in pending state. @@ -258,13 +275,20 @@ Revision history limit Not set Rolling update strategy + Deployments Name Namespace + Name Labels + Namespace Pods + Labels Age + Pods Images + Age Deployments + Images One or more pods have errors One or more pods are in pending state Deployment @@ -506,9 +530,14 @@ Labels Annotations Name + Ingresses Namespace + Name + Namespace Endpoints Age + Endpoints + Age Ingresses イングレス 注釈 @@ -529,10 +558,13 @@ Memory usage Memory usage history There are currently no Pods managed by this Job. + There is nothing to display here Pods + There are currently no Pods managed by this Job. There is nothing to display here There are currently no Pods selected by this Job. Resource details + Details Details active succeeded @@ -546,13 +578,21 @@ Status Pods Name + Jobs + Name Namespace Labels + Kind + Namespace Pods + Labels Age + Pods Images + Age Kind Jobs + Images Job CPU usage CPU usage history @@ -599,10 +639,15 @@ ネームスペース Details Status + Namespaces Name + Name Labels + Labels Status + Status Age + Age Namespaces キャンセル 作成 @@ -645,11 +690,17 @@ ストレージ ワークロード CPU requests (cores) + Allocated resources + CPU requests (cores) CPU limits (cores) + CPU limits (cores) Memory requests (bytes) Memory limits (bytes) + Memory requests (bytes) + Memory limits (bytes) Pods Allocated resources + Pods Type Status Last heartbeat time @@ -661,6 +712,8 @@ Memory usage Memory usage history Pods + There is nothing to display here + There are currently no Pods scheduled on this Node. There is nothing to display here There are currently no Pods scheduled on this Node. Details @@ -682,10 +735,15 @@ Machine ID System UUID Boot ID + Nodes Name Labels + Name + Labels Ready Age + Ready + Age Nodes CPU usage CPU usage history @@ -741,11 +799,17 @@ Capacity Access modes Name + Persistent Volume Claims Namespace + Name Volume + Namespace + Volume Labels + Labels Age Persistent Volume Claims + Age This claim is in lost state This claim is in pending state Persistent Volume @@ -801,14 +865,23 @@ Read only AWS block storage Volume ID + Persistent Volumes Name + Name Labels Capacity + Labels + Capacity Access modes + Access modes Status Claim + Status Reason + Claim Age + Reason + Age Persistent Volumes Persistent Volume Persistent Volume @@ -942,24 +1015,38 @@ Memory usage Memory usage history Pod + Details Status View logs Network Node IP + Pods Name + Name Namespace + This pod is in a pending state. Logs Pod + Logs Pod Pods + Pod + Namespace Status + Status Restarts Age + Restarts + Age Cluster IP CPU (cores) + Cluster IP Memory (bytes) + CPU (cores) This pod has errors. + Memory (bytes) + This pod has errors. This pod is in a pending state. CPU usage history CPU usage @@ -1102,10 +1189,14 @@ CPU usage Memory usage Memory usage history + There is nothing to display here Services There are currently no Pods managed by this Replica Set There is nothing to display here + There are currently no Pods managed by this Replica Set + There is nothing to display here There are currently no Services with the same label selector as this Replica Set. + There are currently no Services with the same label selector as this Replica Set. Pods There is nothing to display here There are currently no Pods scheduled on this Replica Set. @@ -1120,15 +1211,23 @@ Pods status {{::$ctrl.replicaSet.podInfo.pending}} pending {{::$ctrl.replicaSet.podInfo.failed}} failed + Replica Sets Name + Name Namespace Labels + Kind + Namespace Pods Age + Labels + Pods Images + Age Kind Kind Replica Sets + Images One or more pods have errors One or more pods are in pending state Replica Set @@ -1146,10 +1245,14 @@ CPU usage history Memory usage Memory usage history + There is nothing to display here Services There are currently no Pods managed by this Replication Controller. + There are currently no Services with the same label selector as this Replication Controller. There is nothing to display here There are currently no Services with the same label selector as this Replication Controller. + There is nothing to display here + There are currently no Pods managed by this Replication Controller. Pods There is nothing to display here There are currently no Pods selected by this Replication Controller. @@ -1174,14 +1277,22 @@ Setting high number of pods may cause performance issues of the cluster and Dashboard UI. Cancel OK + Replication Controllers Name Namespace + Name + Kind Labels + Namespace Pods + Labels Age + Pods Images + Age Kind Kind + Images Replication Controllers View details Scale @@ -1262,9 +1373,13 @@ bytes Details Name + Secrets Namespace + Name + Namespace Age Secrets + Age シークレット データ 詳細 @@ -1273,23 +1388,37 @@ 名前 UTC に作成 Resource Details + Details + Label selector Details + Type Label selector + Connection Type Connection + Cluster IP Cluster IP + Internal endpoints + External endpoints Internal endpoints External endpoints Pods There is nothing to display here There are currently no Pods selected by this Service. + Services Name + Name Namespace Labels + Namespace Cluster IP + Labels Internal endpoints + Cluster IP External endpoints + Internal endpoints Services + External endpoints This service is in a pending state Services Ingress @@ -1316,8 +1445,10 @@ CPU usage Memory usage Memory usage history + There is nothing to display here Pods There are currently no Pods managed by this Stateful Set. + There are currently no Pods managed by this Stateful Set. There is nothing to display here There are currently no Pods selected by this Stateful Set. Details @@ -1332,13 +1463,21 @@ {{ $ctrl.statefulSet.podInfo.running}} running Pods status {{ $ctrl.statefulSet.podInfo.pending}} pending + Stateful Sets Name + Name Kind Namespace + Kind + Namespace Labels Pods + Labels + Pods Age Images + Age + Images Stateful Sets One or more pods have errors One or more pods are in pending state diff --git a/src/app/frontend/common/components/infocard/infocardsection.html b/src/app/frontend/common/components/infocard/infocardsection.html index 4a9ddd6f802..0fb69b06d11 100644 --- a/src/app/frontend/common/components/infocard/infocardsection.html +++ b/src/app/frontend/common/components/infocard/infocardsection.html @@ -15,6 +15,6 @@ -->
-
{{$ctrl.name}}
+
{{$ctrl.name}}
diff --git a/src/app/frontend/common/components/resourcecard/resourcecardlist.html b/src/app/frontend/common/components/resourcecard/resourcecardlist.html index a8c1d1a42dd..b73a8cfe2ee 100644 --- a/src/app/frontend/common/components/resourcecard/resourcecardlist.html +++ b/src/app/frontend/common/components/resourcecard/resourcecardlist.html @@ -16,7 +16,7 @@
-
+
- + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/deploymentdetail/deploymentinfo.html b/src/app/frontend/deploymentdetail/deploymentinfo.html index 039b84976da..7bac0c4d4a2 100644 --- a/src/app/frontend/deploymentdetail/deploymentinfo.html +++ b/src/app/frontend/deploymentdetail/deploymentinfo.html @@ -1,5 +1,6 @@ - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/ingressdetail/info.html b/src/app/frontend/ingressdetail/info.html index 44b1ca0d4be..24951842f55 100644 --- a/src/app/frontend/ingressdetail/info.html +++ b/src/app/frontend/ingressdetail/info.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/jobdetail/jobinfo.html b/src/app/frontend/jobdetail/jobinfo.html index 2d287efa4b8..a31b19d9dda 100644 --- a/src/app/frontend/jobdetail/jobinfo.html +++ b/src/app/frontend/jobdetail/jobinfo.html @@ -15,7 +15,7 @@ --> - [[Resource details|Resource details header. Appears on top of the page.]] + [[Details|Header in a detail view]] - + [[Details|Header in a detail view]] + - + [[Details|Header in a detail view]] + - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/persistentvolumedetail/persistentvolumeinfo.html b/src/app/frontend/persistentvolumedetail/persistentvolumeinfo.html index 6432f0f8e31..2ebbc9ef6b9 100644 --- a/src/app/frontend/persistentvolumedetail/persistentvolumeinfo.html +++ b/src/app/frontend/persistentvolumedetail/persistentvolumeinfo.html @@ -15,44 +15,45 @@ --> - - - - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - + [[Details|Header in a detail view]] + + + + + + +
-
+ + + + +
-
+ + + + +
-
+ + + + +
-
+ + + + +
-
+ + + + +
-
+ + diff --git a/src/app/frontend/poddetail/podinfo.html b/src/app/frontend/poddetail/podinfo.html index 2c411dd1642..28d3e721604 100644 --- a/src/app/frontend/poddetail/podinfo.html +++ b/src/app/frontend/poddetail/podinfo.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/replicasetdetail/replicasetinfo.html b/src/app/frontend/replicasetdetail/replicasetinfo.html index 64b11e34e14..6966503e213 100644 --- a/src/app/frontend/replicasetdetail/replicasetinfo.html +++ b/src/app/frontend/replicasetdetail/replicasetinfo.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/replicationcontrollerdetail/replicationcontrollerinfo.html b/src/app/frontend/replicationcontrollerdetail/replicationcontrollerinfo.html index 27db26d3203..27fa4fe2e0d 100644 --- a/src/app/frontend/replicationcontrollerdetail/replicationcontrollerinfo.html +++ b/src/app/frontend/replicationcontrollerdetail/replicationcontrollerinfo.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/secretdetail/info.html b/src/app/frontend/secretdetail/info.html index 0ed0efda0fd..f281cc5771c 100644 --- a/src/app/frontend/secretdetail/info.html +++ b/src/app/frontend/secretdetail/info.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/servicedetail/servicedetailinfo.html b/src/app/frontend/servicedetail/servicedetailinfo.html index 821af3ec489..1f8b457b8e2 100644 --- a/src/app/frontend/servicedetail/servicedetailinfo.html +++ b/src/app/frontend/servicedetail/servicedetailinfo.html @@ -15,8 +15,8 @@ --> - [[Resource Details|Title 'Resource details' at the top service details view.]] - + [[Details|Header in a detail view]] + diff --git a/src/app/frontend/statefulsetdetail/statefulsetinfo.html b/src/app/frontend/statefulsetdetail/statefulsetinfo.html index 51ccc8ebe48..39d07f96889 100644 --- a/src/app/frontend/statefulsetdetail/statefulsetinfo.html +++ b/src/app/frontend/statefulsetdetail/statefulsetinfo.html @@ -15,7 +15,8 @@ --> - + [[Details|Header in a detail view]] + diff --git a/src/test/frontend/common/components/resourcecard/resourcecardlist_component_test.js b/src/test/frontend/common/components/resourcecard/resourcecardlist_component_test.js index f88806ace21..8330b654dd9 100644 --- a/src/test/frontend/common/components/resourcecard/resourcecardlist_component_test.js +++ b/src/test/frontend/common/components/resourcecard/resourcecardlist_component_test.js @@ -32,6 +32,7 @@ describe('Resource card list', () => { it('should fill the card layout', () => { let compileFn = compile(` + Foo NAME_COLUMN @@ -91,6 +92,7 @@ describe('Resource card list', () => { expect(elem.html()).not.toContain('STATUS'); expect(elem.html()).toContain('FOOTER'); expect(elem.html()).not.toContain('md-checkbox'); + expect(elem.html()).toContain('kd-resource-card-list-header'); scope.withStatuses = true; scope.$digest(); diff --git a/src/test/frontend/common/components/resourcecard/resourcecardlistpagination_component_test.js b/src/test/frontend/common/components/resourcecard/resourcecardlistpagination_component_test.js index 9f5600dfd5a..7bf41a68144 100644 --- a/src/test/frontend/common/components/resourcecard/resourcecardlistpagination_component_test.js +++ b/src/test/frontend/common/components/resourcecard/resourcecardlistpagination_component_test.js @@ -51,7 +51,7 @@ describe('Resource card list pagination', () => { errDialog = errorDialog; httpBackend = $httpBackend; - resourceCardListCtrl = $componentController('kdResourceCardList'); + resourceCardListCtrl = $componentController('kdResourceCardList', {$transclude: {}}); scope = $rootScope; ctrl = $componentController( 'kdResourceCardListPagination', {