mirror of https://github.com/rancher/ui.git
Bugs
This commit is contained in:
Vincent Fiduccia
parent
d27c9c8c15
commit
d35ba678a7
|
|
@ -89,7 +89,7 @@ var Machine = Resource.extend(StateCounts, ResourceUsage, {
|
|||
|
||||
displayIp: alias('ipAddress'),
|
||||
|
||||
displayName: computed('name','nodeName','id', function() {
|
||||
displayName: computed('name','nodeName','requestedHostname','id', function() {
|
||||
let name = get(this,'name');
|
||||
if ( name ) {
|
||||
return name;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
import Resource from 'ember-api-store/models/resource';
|
||||
import { get, computed } from '@ember/object';
|
||||
|
||||
export default Resource.extend({
|
||||
type: 'machineconfig',
|
||||
|
||||
displayName: computed('requestedHostname','id', function() {
|
||||
let name = get(this,'requestedHostname');
|
||||
if ( name ) {
|
||||
return name;
|
||||
}
|
||||
|
||||
return '('+get(this,'id')+')';
|
||||
}),
|
||||
});
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
import Resource from 'ember-api-store/models/resource';
|
||||
|
||||
var MachineTemplate = Resource.extend({
|
||||
export default Resource.extend({
|
||||
type: 'machinetemplate',
|
||||
actions: {
|
||||
},
|
||||
|
||||
availableActions: function() {
|
||||
let l = this.get('links');
|
||||
|
|
@ -15,5 +13,3 @@ var MachineTemplate = Resource.extend({
|
|||
];
|
||||
}.property('links.{remove}'),
|
||||
});
|
||||
|
||||
export default MachineTemplate;
|
||||
|
|
|
|||
|
|
@ -9,9 +9,13 @@
|
|||
}
|
||||
|
||||
.box-sm {
|
||||
padding: 75px 30px 30px 30px;
|
||||
padding: 75px 30px 80px 30px;
|
||||
min-height: 370px;
|
||||
position: relative;
|
||||
|
||||
P {
|
||||
margin: 10px 0 0 0;
|
||||
}
|
||||
}
|
||||
|
||||
.box {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{{#link-to "clusters.new.rke" class="btn bg-primary"}}{{t 'clusterWelcome.select'}}{{/link-to}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="bubble bg-body round p-10"><img src="{{app.baseAssets}}assets/images/cluster-create.svg" class="mt-5" /></div>
|
||||
<div class="bubble bg-body round p-10"><img src="{{app.baseAssets}}assets/images/logos/rke.svg" class="mt-5" /></div>
|
||||
</div>
|
||||
|
||||
<div class="col span-4 text-center option">
|
||||
|
|
|
|||
|
|
@ -389,6 +389,10 @@ export default Component.extend(NewOrEdit, {
|
|||
}
|
||||
|
||||
next(() => {
|
||||
if ( this.isDestroyed || this.isDestroying ) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.set('header', this.get('intl').t(k, args));
|
||||
});
|
||||
}.observes('isUpgrade','isService','isSidekick','isGlobal','service.displayName','intl.locale').on('init'),
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@
|
|||
<div class="row">
|
||||
<div class="col span-12">
|
||||
{{form-name-description
|
||||
model=primaryResource
|
||||
name=primaryResource.requestedHostname
|
||||
description=primaryResource.description
|
||||
nameRequired=true
|
||||
namePlaceholder="hostsPage.new.name.placeholder"
|
||||
descriptionShown=true
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 232.3 212.3" style="enable-background:new 0 0 232.3 212.3;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#326CE5;}
|
||||
</style>
|
||||
<path class="st0" d="M94.6,160.4h-3.7c-5.6,0-8.8-2.2-12.1-9.6c-1.4-3.3-3.3-9.2-5.9-9.2h-2.7v18.6H58.6v-47.1H78
|
||||
c9.2,0,15.4,4.5,15.4,13.1c0,7-4.8,11.3-9.5,12.8c1.4,1.2,2.4,2.8,3.3,4.5c2,4,3.3,8.4,7.4,8.4V160.4z M70.3,121.6v11.6h4.2
|
||||
c3.3,0,7.3-1,7.3-6.1c0-4.1-2.7-5.5-5.9-5.5H70.3z"/>
|
||||
<path class="st0" d="M98.5,113.1h11.6v13.2c0,1.5-0.2,3.6-0.3,5.2h0.3c0.8-1.2,1.7-3,2.9-4.4l11.5-14h12.6l-15.3,18.5l16.2,28.6
|
||||
h-13.4l-10.9-19.7l-3.5,4.3v15.5H98.5V113.1z"/>
|
||||
<path class="st0" d="M141.8,113.1H173v8.7h-19.5v10.1h16.4v8.7h-16.4v11h20.2v8.7h-31.9V113.1z"/>
|
||||
<path class="st0" d="M232.3,101.9c-0.7-14.6-7.7-57.4-16.5-55.6c-5,1-5,10-5,29c0,15.7-14.2,19.1-19.1,19.8h-7.1
|
||||
c-0.1-13.4-4.1-26.6-11.6-37.8l1.9-1.7c-0.1-1.1,0.3-2.2,1-3c2.4-2.1,5.1-3.9,7.9-5.5c1.5-0.8,3-1.6,4.4-2.6
|
||||
c0.3-0.3,0.8-0.6,1.2-0.9c2.5-1.6,3.3-4.8,1.7-7.3s-4.8-3.3-7.3-1.7c-0.4,0.2-0.7,0.5-1,0.8c-0.4,0.3-0.8,0.7-1.2,0.9
|
||||
c-1.2,1.2-2.4,2.4-3.5,3.7c-2.1,2.4-4.4,4.6-6.9,6.5c-1,0.4-2.1,0.5-3.2,0.3l-2,1.4C154.3,36,138.7,28.5,122,27c0-0.7-0.1-2-0.1-2.4
|
||||
c-0.9-0.6-1.5-1.6-1.7-2.6c-0.1-3.2,0.1-6.4,0.6-9.6c0.3-1.7,0.6-3.3,0.7-5c0-0.4,0-1,0-1.5c0.2-3-2.2-5.7-5.2-5.9l-0.1,0
|
||||
c-3,0.2-5.4,2.8-5.2,5.9c0,0,0,0.1,0,0.1c0,0.4,0,1,0,1.4c0.1,1.7,0.4,3.4,0.7,5c0.5,3.2,0.7,6.4,0.5,9.6c-0.3,1.1-0.9,2-1.7,2.7
|
||||
l-0.1,2.2c-3.2,0.3-6.4,0.8-9.5,1.5c-13.2,3-25.2,9.8-34.5,19.7l-1.9-1.4c-1,0.3-2.2,0.2-3.1-0.3c-2.6-1.9-5-4.1-7.1-6.4
|
||||
c-1.1-1.3-2.2-2.5-3.5-3.7c-0.3-0.3-0.8-0.7-1.2-0.9c-1-0.8-2.3-1.3-3.7-1.4c-1.6-0.1-3.2,0.6-4.2,1.9c-1.8,2.5-1.2,6,1.3,7.8
|
||||
c0.3,0.3,0.8,0.6,1.1,0.9c1.4,0.9,2.9,1.8,4.4,2.6c2.8,1.6,5.5,3.4,7.9,5.5c0.6,0.9,1,2,1.1,3l1.7,1.5
|
||||
c-7.5,11.3-11.5,24.5-11.5,37.9h-7c-4.9-0.7-19.1-4.1-19.1-19.8c0-19,0-28-5-29C7.7,44.5,0.7,87.3,0,101.9
|
||||
c-0.5,9.4,5.5,17.4,17.5,17.4h23v41c0,7.1,3.8,13.8,10,17.3l55.6,32.1c3,1.8,6.5,2.7,10,2.7s7-0.9,10-2.7l55.6-32.1
|
||||
c6.2-3.6,10-10.2,10-17.3v-41h23C226.8,119.3,232.8,111.3,232.3,101.9z M170.9,95.1h-20.5l-6.5-1.9l0,0c-2.5-0.7-3.9-3.3-3.3-5.8
|
||||
c0.2-0.9,0.7-1.7,1.4-2.3l20.6-18.5l0-0.1C168,75.2,170.8,85,170.9,95.1z M154.4,56.2l-22.5,16c-2,1.6-4.9,1.3-6.5-0.7
|
||||
c-0.6-0.8-1-1.8-1-2.9L122.8,41C134.7,42.5,145.8,47.8,154.4,56.2z M111.9,86.6h8.5l5.2,6.6l-0.4,1.9H107l-0.4-1.9L111.9,86.6z
|
||||
M103.9,41.9c1.9-0.4,3.7-0.7,5.6-0.9L108,68.7l0,0c-0.1,2.6-2.4,4.6-5,4.5c-0.9,0-1.8-0.3-2.5-0.9L77.7,56.1
|
||||
C85,49,94,44.1,103.9,41.9z M69.5,66.6l20.8,18.5l0,0c1.9,1.7,2.1,4.8,0.4,6.7c-0.6,0.7-1.4,1.3-2.3,1.5l0,0l-6.1,1.7H61.4
|
||||
C61.4,85.1,64.2,75.2,69.5,66.6z M176.8,168.9L121.2,201c-1.5,0.9-3.3,1.3-5,1.3c-1.7,0-3.5-0.4-5-1.3l-55.6-32.1
|
||||
c-3.1-1.8-5-5.1-5-8.7v-55.2h131.2v55.2C181.8,163.8,179.9,167.1,176.8,168.9z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.9 KiB |
|
|
@ -671,11 +671,11 @@ clustersPage:
|
|||
label: Disk
|
||||
indexPage:
|
||||
cloud:
|
||||
header: Create a Cloud Cluster
|
||||
desc: Create and use a new cluster and nodes managed by a cloud Kubernetes provider.
|
||||
header: Launch a Cloud Cluster
|
||||
desc: Launch a new cluster on a hosted cloud Kubernetes provider (e.g Google GKE). The cloud provider manages the care and feeding of the nodes and cluster.
|
||||
rke:
|
||||
header: Create a RKE Cluster
|
||||
desc: Rancher deploys and automatically manages a Kubernetes cluster for you. Supports on-premise nodes or cloud infrastructure providers.
|
||||
header: Create a Cluster
|
||||
desc: Deploy and automatically manage a Kubernetes cluster with Rancher Kubernetes Engine (RKE). Import existing nodes or launch new ones to use with the cluster. Supports bare-metal and virtual machines in cloud infrastructure providers on on-premise.
|
||||
import:
|
||||
header: Import an Existing Cluster
|
||||
desc: Use an existing Kubernetes installation and the nodes it provides.
|
||||
|
|
|
|||
Loading…
Reference in New Issue