This commit is contained in:
lvuch 2016-06-06 12:50:07 -07:00
parent c6c561a53c
commit 51a6fa415f
6 changed files with 37 additions and 29 deletions

View File

@ -4,11 +4,11 @@
<td data-title="{{t 'generic.name'}}:" class="force-wrap"> <td data-title="{{t 'generic.name'}}:" class="force-wrap">
{{#link-to detailRoute model.id}}{{model.displayName}}{{/link-to}} {{#link-to detailRoute model.id}}{{model.displayName}}{{/link-to}}
</td> </td>
<td data-title="{{t 'containersPage.table.ipAddress'}}"> <td data-title="{{t 'containersPage.table.ipAddress'}}:">
{{format-ip ip=model.displayIp}} {{format-ip ip=model.displayIp}}
</td> </td>
{{#if showHost}} {{#if showHost}}
<td data-title="{{t 'containersPage.table.primaryHost'}}"> <td data-title="{{t 'containersPage.table.primaryHost'}}:">
{{#if model.primaryHost}} {{#if model.primaryHost}}
{{#link-to "host" model.primaryHost.id}}{{model.primaryHost.displayName}}{{/link-to}} {{#link-to "host" model.primaryHost.id}}{{model.primaryHost.displayName}}{{/link-to}}
{{else}} {{else}}
@ -55,7 +55,7 @@
</td> </td>
{{else}} {{else}}
{{#if (eq showCommand "column")}} {{#if (eq showCommand "column")}}
<td data-title="{{t 'containersPage.table.command'}}" class="clip"> <td data-title="{{t 'containersPage.table.command'}}:" class="clip">
{{#if model.command}} {{#if model.command}}
{{model.command}} {{model.command}}
{{else}} {{else}}

View File

@ -11,9 +11,9 @@
<tbody> <tbody>
{{#each arranged as |label|}} {{#each arranged as |label|}}
<tr> <tr>
{{#if showKind}}<td data-title="Kind:">{{uc-first label.type}}</td>{{/if}} {{#if showKind}}<td data-title="{{t 'labelsSection.kind'}}:">{{uc-first label.type}}</td>{{/if}}
<td data-title="Key:" class="force-wrap">{{label.key}}</td> <td data-title="{{t 'labelsSection.key'}}:" class="force-wrap">{{label.key}}</td>
<td data-title="Value:" class="force-wrap">{{pretty-json value=label.value}}</td> <td data-title="{{t 'labelsSection.value'}}:" class="force-wrap">{{pretty-json value=label.value}}</td>
</tr> </tr>
{{else}} {{else}}
<tr><td colspan="3" class="text-center text-muted">{{t 'labelsSection.noData'}}</td></tr> <tr><td colspan="3" class="text-center text-muted">{{t 'labelsSection.noData'}}</td></tr>

View File

@ -1,18 +1,18 @@
<td data-title="State:" class="state"> <td data-title="{{t 'generic.state'}}:" class="state">
{{badge-state model=model}} {{badge-state model=model}}
</td> </td>
<td data-title="Name:"> <td data-title="{{t 'generic.name'}}:">
{{#link-to "settings.projects.detail" model.id (query-params editing=false)}}{{model.displayName}}{{/link-to}} {{#link-to "settings.projects.detail" model.id (query-params editing=false)}}{{model.displayName}}{{/link-to}}
</td> </td>
<td data-title="Description:"> <td data-title="{{t 'generic.description'}}:">
{{#if model.description}}{{model.description}}{{else}}<span class="text-muted">{{t 'projectRow.none'}}</span>{{/if}} {{#if model.description}}{{model.description}}{{else}}<span class="text-muted">{{t 'projectRow.none'}}</span>{{/if}}
</td> </td>
<td data-title="Orchestration:"> <td data-title="{{t 'projectRow.orchestration'}}:">
{{model.displayOrchestration}} {{model.displayOrchestration}}
</td> </td>
<td data-title="Default:"> <td data-title="{{t 'generic.default'}}:">
{{#if model.isDefault}}<i class="icon icon-check"></i>{{else}}<span class="text-muted">&ndash;</span>{{/if}} {{#if model.isDefault}}<i class="icon icon-check"></i>{{else}}<span class="text-muted">&ndash;</span>{{/if}}
</td> </td>
<td data-title="Actions:" class="actions"> <td data-title="{{t 'generic.actions'}}:"class="actions">
{{action-menu model=model}} {{action-menu model=model}}
</td> </td>

View File

@ -1,18 +1,18 @@
<td class="state"> <td data-title="{{t 'generic.state'}}:" class="state">
{{badge-state model=model}} {{badge-state model=model}}
</td> </td>
<td data-title="Address:"> <td data-title="{{t 'registryRow.address'}}:">
{{model.displayAddress}} {{model.displayAddress}}
</td> </td>
<td data-title="Email:"> <td data-title="{{t 'registryRow.email'}}:">
{{#if model.credential.email}}{{model.credential.email}}{{else}}<i class="text-muted">{{t 'generic.none'}}</i>{{/if}} {{#if model.credential.email}}{{model.credential.email}}{{else}}<i class="text-muted">{{t 'generic.none'}}</i>{{/if}}
</td> </td>
<td data-title="Username:"> <td data-title="{{t 'registryRow.username'}}:">
{{#if model.credential.publicValue}}{{model.credential.publicValue}}{{else}}<i class="text-muted">{{t 'generic.none'}}</i>{{/if}} {{#if model.credential.publicValue}}{{model.credential.publicValue}}{{else}}<i class="text-muted">{{t 'generic.none'}}</i>{{/if}}
</td> </td>
<td data-title="Created:"> <td data-title="{{t 'registryRow.created'}}:">
{{date-calendar model.created}} {{date-calendar model.created}}
</td> </td>
<td data-title="Actions:" align="actions"> <td data-title="{{t 'generic.actions'}}:" align="actions">
{{action-menu model=model}} {{action-menu model=model}}
</td> </td>

View File

@ -83,10 +83,10 @@
<tbody> <tbody>
{{#each filtered as |service|}} {{#each filtered as |service|}}
<tr> <tr>
<td data-title={{t 'stackSection.table.dataTitle.state'}} class="state"> <td data-title="{{t 'stackSection.table.dataTitle.state'}}:" class="state">
{{badge-state model=service}} {{badge-state model=service}}
</td> </td>
<td data-title={{t 'stackSection.table.dataTitle.serviceName'}} class="force-wrap"> <td data-title="{{t 'stackSection.table.dataTitle.serviceName'}}:" class="force-wrap">
{{#link-to "service" service.environmentId service.id}}{{service.displayName}}{{/link-to}} {{#link-to "service" service.environmentId service.id}}{{service.displayName}}{{/link-to}}
{{#if service.hasSidekicks}} {{#if service.hasSidekicks}}
+ {{service.secondaryLaunchConfigs.length}} {{t 'stackSection.sidekick' numSidekicks=instanceCount}} + {{service.secondaryLaunchConfigs.length}} {{t 'stackSection.sidekick' numSidekicks=instanceCount}}
@ -95,18 +95,18 @@
<i class="icon icon-info addtl-info-trigger"/> <i class="icon icon-info addtl-info-trigger"/>
</button> </button>
</td> </td>
<td data-title={{t 'stackSection.table.dataTitle.details'}} class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td> <td data-title="{{t 'stackSection.table.dataTitle.details'}}:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
<td data-title="Kind:"> <td data-title="{{t 'stackSection.table.dataTitle.kind'}}:">
{{#if service.displayType}} {{#if service.displayType}}
{{service.displayType}} {{service.displayType}}
{{/if}} {{/if}}
</td> </td>
<td data-title={{t 'stackSection.table.dataTitle.containers'}}> <td data-title="{{t 'stackSection.table.dataTitle.containers'}}:">
{{#if service.hasContainers}} {{#if service.hasContainers}}
{{default-str service.instanceCount.length default="0"}} {{t 'stackSection.container' numContainers=service.instanceCount}} {{default-str service.instanceCount.length default="0"}} {{t 'stackSection.container' numContainers=service.instanceCount}}
{{/if}} {{/if}}
</td> </td>
<td data-title={{t 'stackSection.table.dataTitle.actions'}} class="actions wide"> <td data-title="{{t 'stackSection.table.dataTitle.actions'}}:" class="actions wide">
{{action-menu model=service}} {{action-menu model=service}}
</td> </td>
</tr> </tr>

View File

@ -2252,6 +2252,13 @@ pageHeaderEnvironment:
projectRow: projectRow:
none: No description none: No description
orchestration: Orchestration
registryRow:
address: Address
email: Email
username: Username
created: Created
schema: schema:
inputBoolean: inputBoolean:
@ -2313,11 +2320,12 @@ stackSection:
virtualMachine: Add Virtual Machine virtualMachine: Add Virtual Machine
table: table:
dataTitle: dataTitle:
state: 'State:' state: State
serviceName: 'Service Name:' serviceName: Service Name
details: 'Details:' kind: Kind
containers: 'Containers:' details: Details
actions: 'Actions:' containers: Containers
actions: Actions
storagePoolSection: storagePoolSection: