mirror of https://github.com/rancher/ui.git
Merge pull request #2178 from loganhz/created
Update created column style
This commit is contained in:
commit
08ab6b157e
|
|
@ -33,18 +33,19 @@ export default Controller.extend({
|
||||||
sort: ['description', 'name', 'id'],
|
sort: ['description', 'name', 'id'],
|
||||||
translationKey: 'apiPage.table.description',
|
translationKey: 'apiPage.table.description',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'created',
|
|
||||||
sort: ['created', 'name', 'id'],
|
|
||||||
translationKey: 'apiPage.table.created',
|
|
||||||
width: 150,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: 'expires',
|
name: 'expires',
|
||||||
sort: ['expiresAt', 'name', 'id'],
|
sort: ['expiresAt', 'name', 'id'],
|
||||||
translationKey: 'apiPage.table.expires.label',
|
translationKey: 'apiPage.table.expires.label',
|
||||||
width: 175,
|
width: 175,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
|
name: 'created',
|
||||||
|
sort: ['created', 'name', 'id'],
|
||||||
|
translationKey: 'apiPage.table.created',
|
||||||
|
width: 175,
|
||||||
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
project: alias('scope.currentProject'),
|
project: alias('scope.currentProject'),
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ export const headers = [
|
||||||
sort: ['firstKey', 'name', 'id'],
|
sort: ['firstKey', 'name', 'id'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
translationKey: 'generic.created',
|
translationKey: 'generic.created',
|
||||||
sort: ['created:desc', 'name', 'id'],
|
sort: ['created:desc', 'name', 'id'],
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ export const headers = [
|
||||||
translationKey: 'namespacesPage.table.name.label',
|
translationKey: 'namespacesPage.table.name.label',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
sort: ['created', 'id'],
|
sort: ['created', 'id'],
|
||||||
searchField: 'created',
|
searchField: 'created',
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
<p class="text-small text-muted m-0">{{linkify obj.description}}</p>
|
<p class="text-small text-muted m-0">{{linkify obj.description}}</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
{{date-calendar obj.created}}
|
{{date-calendar obj.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ export default Controller.extend({
|
||||||
sort: ['firstKey', 'name', 'id'],
|
sort: ['firstKey', 'name', 'id'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
translationKey: 'generic.created',
|
translationKey: 'generic.created',
|
||||||
sort: ['created:desc', 'name', 'id'],
|
sort: ['created:desc', 'name', 'id'],
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,6 @@
|
||||||
<span class="text-muted">{{t 'generic.none'}}</span>
|
<span class="text-muted">{{t 'generic.none'}}</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.created}}">
|
|
||||||
{{date-from-now model.created}}
|
|
||||||
</td>
|
|
||||||
<td data-title="{{dt.expires}}">
|
<td data-title="{{dt.expires}}">
|
||||||
{{#if model.expiresAt}}
|
{{#if model.expiresAt}}
|
||||||
{{date-calendar model.expiresAt}}
|
{{date-calendar model.expiresAt}}
|
||||||
|
|
@ -24,6 +21,9 @@
|
||||||
<span class="text-muted">{{t 'generic.never'}}</span>
|
<span class="text-muted">{{t 'generic.never'}}</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
|
{{date-from-now model.created}}
|
||||||
|
</td>
|
||||||
<td data-title="{{dt.actions}}" class="actions">
|
<td data-title="{{dt.actions}}" class="actions">
|
||||||
{{action-menu model=model}}
|
{{action-menu model=model}}
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<td data-title="{{dt.keys}}">
|
<td data-title="{{dt.keys}}">
|
||||||
{{join-array model.keys}}
|
{{join-array model.keys}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.created}}">
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
{{date-from-now model.created}}
|
{{date-from-now model.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.actions}} "class="actions">
|
<td data-title="{{dt.actions}} "class="actions">
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ export const headers = [
|
||||||
translationKey: 'namespacesPage.table.project.label',
|
translationKey: 'namespacesPage.table.project.label',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
sort: ['created', 'id'],
|
sort: ['created', 'id'],
|
||||||
searchField: 'created',
|
searchField: 'created',
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
<b>None</b>
|
<b>None</b>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="text-right pr-20">
|
||||||
{{date-calendar obj.created}}
|
{{date-calendar obj.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ const headers = [
|
||||||
translationKey: 'projectsPage.ns.label',
|
translationKey: 'projectsPage.ns.label',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
sort: ['createdTs'],
|
sort: ['createdTs'],
|
||||||
translationKey: 'projectsPage.created.label',
|
translationKey: 'projectsPage.created.label',
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
<p class="text-small text-muted m-0">{{linkify ns.description}}</p>
|
<p class="text-small text-muted m-0">{{linkify ns.description}}</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="text-right pr-20">
|
||||||
{{date-calendar ns.created}}
|
{{date-calendar ns.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
<td data-title="{{t 'generic.actions'}}:" class="actions">
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td data-title="{{dt.created}}" class="clip">
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
{{model.displayCreated}}
|
{{model.displayCreated}}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ const headers = [
|
||||||
searchField: ['notifierType', 'notifierLabel', 'notifierValue'],
|
searchField: ['notifierType', 'notifierLabel', 'notifierValue'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
translationKey: 'notifierPage.index.table.created',
|
translationKey: 'notifierPage.index.table.created',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
searchField: 'displayCreated',
|
searchField: 'displayCreated',
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<td data-title="{{dt.keys}}">
|
<td data-title="{{dt.keys}}">
|
||||||
{{join-array model.keys}}
|
{{join-array model.keys}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.created}}">
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
{{date-from-now model.created}}
|
{{date-from-now model.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.actions}} "class="actions">
|
<td data-title="{{dt.actions}} "class="actions">
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ export default Controller.extend({
|
||||||
translationKey: 'ingressPage.table.targets.label',
|
translationKey: 'ingressPage.table.targets.label',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
classNames: 'text-right pr-20',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
sort: ['created', 'id'],
|
sort: ['created', 'id'],
|
||||||
searchField: 'created',
|
searchField: 'created',
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.created}}">
|
<td data-title="{{dt.created}}" class="text-right pr-20">
|
||||||
{{date-calendar inst.created}}
|
{{date-calendar inst.created}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.actions}}" class="actions">
|
<td data-title="{{dt.actions}}" class="actions">
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
{{#if (eq model.state "inactive")}}
|
{{#if (eq model.state "inactive")}}
|
||||||
<td colspan="4" class="text-center">
|
<td colspan="3" class="text-center">
|
||||||
{{t 'clusterRow.noHosts'}}
|
{{t 'clusterRow.noHosts'}}
|
||||||
</td>
|
</td>
|
||||||
{{else}}
|
{{else}}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue