diff --git a/app/authenticated/project/api/hooks/index/template.hbs b/app/authenticated/project/api/hooks/index/template.hbs index 65217eb87..bdb205432 100644 --- a/app/authenticated/project/api/hooks/index/template.hbs +++ b/app/authenticated/project/api/hooks/index/template.hbs @@ -17,23 +17,27 @@

{{t 'hookPage.receiver.content' appName=settings.appName}}

- {{#sortable-table - classNames="grid fixed r-mb0 mt-10 sortable-table" - bulkActions=false - paging=false - search=false - sortBy=sortBy - headers=headers - body=model.receivers - fullRows=true - as |sortable kind row| - }} - {{#if (eq kind "row")}} - {{hook-row model=row}} - {{else if (eq kind "norows")}} - - {{t 'hookPage.receiver.noData'}} - - {{/if}} - {{/sortable-table}} -
+ {{#if model.receivers.length}} + {{#sortable-table + classNames="grid fixed r-mb0 mt-10 sortable-table" + bulkActions=false + paging=false + search=false + sortBy=sortBy + headers=headers + body=model.receivers + fullRows=true + as |sortable kind row| + }} + {{#if (eq kind "row")}} + {{hook-row model=row}} + {{else if (eq kind "norows")}} + + {{t 'hookPage.receiver.noData'}} + + {{/if}} + {{/sortable-table}} + {{else}} + {{empty-table resource="container" newRoute="authenticated.project.api.hooks.new-receiver" newTranslationKey="hookPage.receiver.buttonText"}} + {{/if}} + \ No newline at end of file diff --git a/app/authenticated/project/host-template/keys/template.hbs b/app/authenticated/project/host-template/keys/template.hbs index 929e01f59..b53a8a26a 100644 --- a/app/authenticated/project/host-template/keys/template.hbs +++ b/app/authenticated/project/host-template/keys/template.hbs @@ -22,6 +22,7 @@

{{t 'hostTemplatesPage.keys.header'}}

+ {{#if instances.length}} {{#sortable-table classNames="grid fixed mt-10 sortable-table" bulkActions=false @@ -67,5 +68,7 @@ {{/if}} {{/sortable-table}} -
-
\ No newline at end of file + {{else}} + {{empty-table resource="container" showNew=false}} + {{/if}} + \ No newline at end of file diff --git a/app/components/empty-table/component.js b/app/components/empty-table/component.js index 1ef4a00a8..4873ac768 100644 --- a/app/components/empty-table/component.js +++ b/app/components/empty-table/component.js @@ -2,4 +2,5 @@ import Ember from 'ember'; export default Ember.Component.extend({ classNames: ['row'], + showNew: true, }); diff --git a/app/components/empty-table/template.hbs b/app/components/empty-table/template.hbs index 26abadc81..735a5ec04 100644 --- a/app/components/empty-table/template.hbs +++ b/app/components/empty-table/template.hbs @@ -1,7 +1,9 @@
- - - {{t newTranslationKey}} - + {{#if showNew}} + + + {{t newTranslationKey}} + + {{/if}}
diff --git a/app/registries/index/template.hbs b/app/registries/index/template.hbs index 281cb81ca..2839aa51c 100644 --- a/app/registries/index/template.hbs +++ b/app/registries/index/template.hbs @@ -7,23 +7,27 @@
- {{#sortable-table - classNames="grid fixed mb-0 sortable-table" - bulkActions=false - paging=false - search=false - sortBy=sortBy - headers=headers - body=model - fullRows=true - as |sortable kind registry| - }} - {{#if (eq kind "row")}} - {{registry-row model=registry}} - {{else if (eq kind "norows")}} - - {{t 'registriesPage.index.table.body.noData'}} - - {{/if}} - {{/sortable-table}} + {{#if model.length}} + {{#sortable-table + classNames="grid fixed mb-0 sortable-table" + bulkActions=false + paging=false + search=false + sortBy=sortBy + headers=headers + body=model + fullRows=true + as |sortable kind registry| + }} + {{#if (eq kind "row")}} + {{registry-row model=registry}} + {{else if (eq kind "norows")}} + + {{t 'registriesPage.index.table.body.noData'}} + + {{/if}} + {{/sortable-table}} + {{else}} + {{empty-table resource="container" newRoute="registries.new" newTranslationKey="registriesPage.index.linkTo"}} + {{/if}}
diff --git a/app/scaling-groups/index/template.hbs b/app/scaling-groups/index/template.hbs index 6d23c40aa..8e1bf4c00 100644 --- a/app/scaling-groups/index/template.hbs +++ b/app/scaling-groups/index/template.hbs @@ -56,8 +56,6 @@ {{else if (eq kind "nomatch")}} {{t 'containersPage.table.noMatch'}} - {{else if (eq kind "norows")}} - {{t 'containersPage.table.noData'}} {{/if}} {{/sortable-table}} {{else}} diff --git a/app/secrets/index/template.hbs b/app/secrets/index/template.hbs index fedc0a137..a8ad89b79 100644 --- a/app/secrets/index/template.hbs +++ b/app/secrets/index/template.hbs @@ -16,24 +16,28 @@
- {{#sortable-table - classNames="grid sortable-table" - body=model - sortBy=sortBy - bulkActions=true - headers=headers as |sortable kind row dt|}} - {{#if (eq kind "row")}} - {{badge-state model=row}} - {{row.name}} - {{row.description}} - {{date-from-now row.created}} - - {{action-menu model=row}} - - {{else if (eq kind "nomatch")}} - {{t 'secretsPage.index.noMatch'}} - {{else if (eq kind "norows")}} - {{t 'secretsPage.index.noData'}} - {{/if}} - {{/sortable-table}} + {{#if model.length}} + {{#sortable-table + classNames="grid sortable-table" + body=model + sortBy=sortBy + bulkActions=true + headers=headers as |sortable kind row dt|}} + {{#if (eq kind "row")}} + {{badge-state model=row}} + {{row.name}} + {{row.description}} + {{date-from-now row.created}} + + {{action-menu model=row}} + + {{else if (eq kind "nomatch")}} + {{t 'secretsPage.index.noMatch'}} + {{else if (eq kind "norows")}} + {{t 'secretsPage.index.noData'}} + {{/if}} + {{/sortable-table}} + {{else}} + {{empty-table resource="container" newRoute="secrets.new" newTranslationKey="secretsPage.index.linkTo"}} + {{/if}}
diff --git a/app/styles/components/_code.scss b/app/styles/components/_code.scss index 9d06a1130..00fc8191a 100644 --- a/app/styles/components/_code.scss +++ b/app/styles/components/_code.scss @@ -1,3 +1,11 @@ +// Code +$code-color : mix($warning, $error, 20%) !default; +$code-bg : #fcf2e9 !default; + +$pre-bg : #f5f5f5 !default; +$pre-color : $dark-grey !default; +$pre-border-color : $light-grey !default; + code { padding: 2px 4px; font-size: 90%; diff --git a/app/styles/components/_modals.scss b/app/styles/components/_modals.scss index 2ef23eaaf..98fb9f9bc 100644 --- a/app/styles/components/_modals.scss +++ b/app/styles/components/_modals.scss @@ -1,3 +1,12 @@ +$modal-content-bg : white !default; +$modal-content-border-color : transparent !default; +$modal-content-fallback-border-color : #999 !default; + +$modal-overlay : rgba($light-grey, 0.75) !default; + +$modal-header-border-color : #e5e5e5 !default; +$modal-footer-border-color : $modal-header-border-color !default; + .modal-overlay { background-color: $modal-overlay; min-height: 100%; diff --git a/app/styles/components/_pagination.scss b/app/styles/components/_pagination.scss index 47bf4436c..b0e3685eb 100644 --- a/app/styles/components/_pagination.scss +++ b/app/styles/components/_pagination.scss @@ -1,3 +1,20 @@ +// Pagination +$pagination-color : $primary !default; +$pagination-bg : #f5f5f5 !default; +$pagination-border : #ddd !default; + +$pagination-hover-color : $link-hover-color !default; +$pagination-hover-bg : $light-grey !default; +$pagination-hover-border : #ddd !default; + +$pagination-active-color : $light-grey !default; +$pagination-active-bg : white !default; +$pagination-active-border : #ddd !default; + +$pagination-disabled-color : $light-grey !default; +$pagination-disabled-bg : white !default; +$pagination-disabled-border : #ddd !default; + .pagination { margin: 0px; diff --git a/app/styles/components/_tabs.scss b/app/styles/components/_tabs.scss index 98b8d07b6..7540a3388 100644 --- a/app/styles/components/_tabs.scss +++ b/app/styles/components/_tabs.scss @@ -1,3 +1,13 @@ +// Tabs +$tab-bg : white !default; +$tab-active-bg : white !default; +$tab-hover : $dark-grey !default; +$tab-color : $mid-grey !default; +$tab-accent : $light-grey !default; + +$close-color : white !default; +$close-text-shadow : 0 1px 0 white !default; + .tabs { position: relative; diff --git a/app/styles/components/_tooltip.scss b/app/styles/components/_tooltip.scss index a9f22037a..09a4ecbe7 100644 --- a/app/styles/components/_tooltip.scss +++ b/app/styles/components/_tooltip.scss @@ -1,3 +1,11 @@ +// Tooltip text color +$tooltip-color : white !default; +// Tooltip background color +$tooltip-bg : rgba(0,0,0,.9) !default; +$tooltip-opacity : .9 !default; +// Tooltip arrow color +$tooltip-arrow-color : $tooltip-bg !default; + @mixin tooltip-triangle { content : ''; background : transparent; diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index dbc9f74e7..d4e599de5 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -172,9 +172,6 @@ $pagination-disabled-color : $mid-grey; $pagination-disabled-bg : white; $pagination-disabled-border : #ddd; -/*jumbotron*/ -$jumbotron-bg : $mid-grey; - /*Form states and alerts Define colors for form feedback states and, by default, alerts.*/ $state-success-text : white; diff --git a/app/styles/themes/_light.scss b/app/styles/themes/_light.scss index 52889bfa9..08936dd40 100644 --- a/app/styles/themes/_light.scss +++ b/app/styles/themes/_light.scss @@ -43,12 +43,6 @@ $accent-three : $dark-grey; $accent-bg : lighten($accent-one, 1.5%); $accent-border : rgba(255, 255, 255, .5); -// // Header -// $header : $secondary; -// $header-link : $light-grey; -// $header-link-active : $primary; -// $user-btn : darken($header, 10%); - // $header-text : $secondary; $footer : $light-grey; @@ -64,25 +58,6 @@ $component-active-color : white; // Global background color for active items (e.g., navs or dropdowns). $component-active-bg : $primary; -// Pagination -$pagination-color : $primary; -$pagination-bg : #f5f5f5; -$pagination-border : #ddd; - -$pagination-hover-color : $link-hover-color; -$pagination-hover-bg : $light-grey; -$pagination-hover-border : #ddd; - -$pagination-active-color : $light-grey; -$pagination-active-bg : white; -$pagination-active-border : #ddd; - -$pagination-disabled-color : $light-grey; -$pagination-disabled-bg : white; -$pagination-disabled-border : #ddd; - -// Jumbotron -$jumbotron-bg : $light-grey; // Form states and alerts Define colors for form feedback states and, by default, alerts. @@ -103,48 +78,13 @@ $state-danger-bg : $error; $state-danger-border : darken(adjust-hue($state-danger-bg, -10), 3%); -// Tooltip text color -$tooltip-color : white; -// Tooltip background color -$tooltip-bg : rgba(0,0,0,.9); -$tooltip-opacity : .9; -// Tooltip arrow color -$tooltip-arrow-color : $tooltip-bg; - - -// Background color of modal content area -$modal-content-bg : white; -// Modal content border color -$modal-content-border-color : transparent; -// Modal content border color **for IE8** -$modal-content-fallback-border-color : #999; - -// Modal backdrop background color -$modal-overlay : rgba($light-grey, 0.75); - -// Modal header border color -$modal-header-border-color : #e5e5e5; -// Modal footer border color -$modal-footer-border-color : $modal-header-border-color; - - $header-link-text : #afb9c8; $nav-link-hover-bg : $light-grey; -// Tabs -$tab-bg : white; -$tab-active-bg : white; -$tab-hover : $dark-grey; -$tab-color : $mid-grey; -$tab-accent : $light-grey; - -$close-color : white; -$close-text-shadow : 0 1px 0 white; - // Code -$code-color : mix($warning, $error, 20%); -$code-bg : #fcf2e9; +$code-color : mix($warning, $error, 20%) !default; +$code-bg : #fcf2e9 !default; -$pre-bg : #f5f5f5; -$pre-color : $dark-grey; -$pre-border-color : $light-grey; +$pre-bg : #f5f5f5 !default; +$pre-color : $dark-grey !default; +$pre-border-color : $light-grey !default; \ No newline at end of file