Add Image Path 85/17485/1 6.99.1 6.99.2 6.99.3 guppy/6.99.1 guppy/6.99.2 guppy/6.99.3 guppy_6.99.1 guppy_6.99.2 guppy_6.99.3
authorelisa castro <elisa.castro@iot.bzh>
Fri, 26 Oct 2018 14:41:07 +0000 (16:41 +0200)
committerelisa castro <elisa.castro@iot.bzh>
Mon, 29 Oct 2018 16:58:14 +0000 (17:58 +0100)
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>
webapp/src/app/@core-xds/services/sdk.service.ts
webapp/src/app/pages/sdks/sdk-card/sdk-card.component.html
webapp/src/app/pages/sdks/sdk-management/sdk-management.component.scss
webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts

index f7e8c2f..0ad5d0f 100644 (file)
@@ -51,6 +51,7 @@ export interface ISdk {
   arch: string;
   path: string;
   url: string;
   arch: string;
   path: string;
   url: string;
+  image_url: string;
   status: string;
   date: string;
   size: 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.current = installedSdks.length > 0 ? installedSdks[0] : this._sdksList[0];
           this.curSdkSubject.next(this.current);
         }
-
         this.sdksSubject.next(this._sdksList);
       });
     });
         this.sdksSubject.next(this._sdksList);
       });
     });
index ba878ba..8ec1269 100644 (file)
         </tr>
         <tr>
           <th><span class="fa fa-fw fa-folder-open-o"></span>&nbsp;<span>Sdk path</span></th>
         </tr>
         <tr>
           <th><span class="fa fa-fw fa-folder-open-o"></span>&nbsp;<span>Sdk path</span></th>
-          <td>{{ sdk.path}}</td>
+          <td>{{ sdk.path }}</td>
+        </tr>
+        <tr>
+          <th><span class="fa fa-fw fa-microchip"></span>&nbsp;<span>Image path</span></th>
+          <td>{{ sdk.image_url }}</td>
         </tr>
       </tbody>
     </table>
         </tr>
       </tbody>
     </table>
index 0ba2741..b31748d 100644 (file)
@@ -1,5 +1,6 @@
 @import '../../../@theme/styles/themes';
 @import '~@nebular/theme/components/card/card.component.theme';
 @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);
 // 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;
   }
     display: flex;
     align-items: center;
   }
+
   .action-groups-header {
     flex-basis: 20%;
     color: nb-theme(card-header-fg-heading);
   .action-groups-header {
     flex-basis: 20%;
     color: nb-theme(card-header-fg-heading);
     font-size: nb-theme(card-header-font-size);
     font-weight: nb-theme(card-header-font-weight);
   }
     font-size: nb-theme(card-header-font-size);
     font-weight: nb-theme(card-header-font-weight);
   }
+
   .nb-actions {
     flex-basis: 80%;
   }
   .nb-actions {
     flex-basis: 80%;
   }
+
   .right {
     display: flex;
     align-items: center;
   .right {
     display: flex;
     align-items: center;
     order: 1;
     flex-direction: row-reverse;
   }
     order: 1;
     flex-direction: row-reverse;
   }
+
   nb-actions > nb-action {
     padding: 0;
   }
   nb-actions > nb-action {
     padding: 0;
   }
+
   nb-action {
     i {
       color: nb-theme(color-fg);
       font-size: 1.5rem;
       margin-right: 1rem;
     }
   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;
     }
     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;
     button {
       margin: 0 auto;
       padding: 0;
@@ -60,6 +68,7 @@
       background: none;
       display: flex;
       align-items: center;
       background: none;
       display: flex;
       align-items: center;
+
       &:focus {
         box-shadow: none;
         outline: none;
       &:focus {
         box-shadow: none;
         outline: none;
@@ -81,3 +90,14 @@ nav.ng2-smart-pagination-nav {
 .page-link.page-link-next {
   font-size: 1em !important;
 }
 .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;
+}
index 051b6ef..20932d3 100644 (file)
@@ -57,8 +57,9 @@ export class SdkManagementComponent implements OnInit {
       add: false,
       edit: false,
       delete: false,  // TODO, add delete == uninstall
       add: false,
       edit: false,
       delete: false,  // TODO, add delete == uninstall
+      position: 'right',
       custom: [
       custom: [
-        { name: 'install', title: '<i class="nb-plus"></i>' },
+        { name: 'install', title: '<button type="button">Install</button>' },
       ],
     },
     delete: {
       ],
     },
     delete: {