diff options
author | elisa castro <elisa.castro@iot.bzh> | 2018-10-26 16:41:07 +0200 |
---|---|---|
committer | elisa castro <elisa.castro@iot.bzh> | 2018-10-29 17:58:14 +0100 |
commit | 6d14032f41c785bb397509f17764eb29b087ff0f (patch) | |
tree | 14a98a62502ea85107071ca3ae6a5d0ebbeba2f0 /webapp | |
parent | e9c65d5fcf8d2ec3772ceced4fe1379392b15a4f (diff) |
Add Image Pathguppy_6.99.3guppy_6.99.2guppy_6.99.1guppy/6.99.3guppy/6.99.2guppy/6.99.16.99.36.99.26.99.1
In SDK's add of Image Path
Modification of the table presentation in SDK's management
Change-Id: Ic45cf778b67505b29f3d9c05966fc49d3f6480be
Signed-off-by: elisa castro <elisa.castro@iot.bzh>
Diffstat (limited to 'webapp')
4 files changed, 28 insertions, 3 deletions
diff --git a/webapp/src/app/@core-xds/services/sdk.service.ts b/webapp/src/app/@core-xds/services/sdk.service.ts index f7e8c2f..0ad5d0f 100644 --- a/webapp/src/app/@core-xds/services/sdk.service.ts +++ b/webapp/src/app/@core-xds/services/sdk.service.ts @@ -51,6 +51,7 @@ export interface ISdk { arch: string; path: string; url: string; + image_url: string; status: string; date: string; size: string; @@ -107,7 +108,6 @@ export class SdkService { this.current = installedSdks.length > 0 ? installedSdks[0] : this._sdksList[0]; this.curSdkSubject.next(this.current); } - this.sdksSubject.next(this._sdksList); }); }); diff --git a/webapp/src/app/pages/sdks/sdk-card/sdk-card.component.html b/webapp/src/app/pages/sdks/sdk-card/sdk-card.component.html index ba878ba..8ec1269 100644 --- a/webapp/src/app/pages/sdks/sdk-card/sdk-card.component.html +++ b/webapp/src/app/pages/sdks/sdk-card/sdk-card.component.html @@ -41,7 +41,11 @@ </tr> <tr> <th><span class="fa fa-fw fa-folder-open-o"></span> <span>Sdk path</span></th> - <td>{{ sdk.path}}</td> + <td>{{ sdk.path }}</td> + </tr> + <tr> + <th><span class="fa fa-fw fa-microchip"></span> <span>Image path</span></th> + <td>{{ sdk.image_url }}</td> </tr> </tbody> </table> diff --git a/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.scss b/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.scss index 0ba2741..b31748d 100644 --- a/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.scss +++ b/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.scss @@ -1,5 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~@nebular/theme/components/card/card.component.theme'; + // FIXME SEB: remove this ugly hack and use nb-theme #hack-i { color: #a4abb3; // nb-theme(color-fg); @@ -19,6 +20,7 @@ display: flex; align-items: center; } + .action-groups-header { flex-basis: 20%; color: nb-theme(card-header-fg-heading); @@ -26,9 +28,11 @@ font-size: nb-theme(card-header-font-size); font-weight: nb-theme(card-header-font-weight); } + .nb-actions { flex-basis: 80%; } + .right { display: flex; align-items: center; @@ -37,21 +41,25 @@ order: 1; flex-direction: row-reverse; } + nb-actions > nb-action { padding: 0; } + nb-action { i { color: nb-theme(color-fg); font-size: 1.5rem; margin-right: 1rem; } + span { font-family: nb-theme(font-secondary); font-weight: nb-theme(font-weight-bold); color: nb-theme(color-fg-heading); text-transform: uppercase; } + button { margin: 0 auto; padding: 0; @@ -60,6 +68,7 @@ background: none; display: flex; align-items: center; + &:focus { box-shadow: none; outline: none; @@ -81,3 +90,14 @@ nav.ng2-smart-pagination-nav { .page-link.page-link-next { font-size: 1em !important; } + +.nb-theme-default ng2-smart-table .ng2-smart-actions a.ng2-smart-action { + background-color: '#4CAF50'; + font-size: 0.8em !important; + text-transform: uppercase; + font-weight: bold; + color: white; + width: 75%; + margin: auto; + cursor: pointer; +} diff --git a/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts b/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts index 051b6ef..20932d3 100644 --- a/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts +++ b/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts @@ -57,8 +57,9 @@ export class SdkManagementComponent implements OnInit { add: false, edit: false, delete: false, // TODO, add delete == uninstall + position: 'right', custom: [ - { name: 'install', title: '<i class="nb-plus"></i>' }, + { name: 'install', title: '<button type="button">Install</button>' }, ], }, delete: { |