Added in panel support - details panels
Change-Id: I2803edd6fe12cb0d97a2d3c45a692ea701786dd2
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.css b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.css
new file mode 100644
index 0000000..5813f30
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.css
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Applications View (layout) -- CSS file
+ */
+
+#ov-app h2 {
+ display: inline-block;
+}
+
+#ov-app div.ctrl-btns {
+ width: 290px;
+}
+
+/* -- Drag-n-Drop oar file upload -- */
+#ov-app form#inputFileForm,
+#ov-app input#uploadFile {
+ display: none;
+}
+
+.dropping {
+
+}
+
+/* -- Confirmation Dialog -- */
+#app-dialog {
+ top: 140px;
+ padding: 12px;
+}
+
+#app-dialog p {
+ font-size: 12pt;
+}
+
+#app-dialog p.strong {
+ font-weight: bold;
+ padding: 8px;
+ text-align: center;
+}
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html
new file mode 100644
index 0000000..1c4a22f
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html
@@ -0,0 +1,137 @@
+<!--
+~ Copyright 2014-present Open Networking Foundation
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<div id="ov-app" filedrop on-file-drop="appDropped()">
+ <div class="tabular-header">
+ <h2>
+ {{lionFn('title_apps')}}
+ ({{ tableData.length }}
+ {{ lionFn('total') }})
+ </h2>
+ <div class="ctrl-btns">
+ <div class="refresh" (click)="toggleRefresh()">
+ <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}"
+ iconId="refresh" iconSize="42" toolTip="{{ autoRefreshTip }}"></onos-icon>
+ </div>
+ <div class="separator"></div>
+
+ <!--<form id="inputFileForm">-->
+ <!--<input id="uploadFile"-->
+ <!--type="file" size="50" accept=".oar,.jar"-->
+ <!--file-model="appFile">-->
+ <!--</form>-->
+
+ <div class="active" trigger-form>
+ <onos-icon classes="{{ 'active upload' }}"
+ iconId="upload" iconSize="42" toolTip="{{ uploadTip }}"></onos-icon>
+ </div>
+ <div (click)="appAction('activate')">
+ <onos-icon classes="{{ ctrlBtnState.installed?'active play':'play' }}"
+ iconId="play" iconSize="42" toolTip="{{ activateTip }}"></onos-icon>
+ </div>
+ <div (click)="appAction('deactivate')">
+ <onos-icon classes="{{ ctrlBtnState.active?'active stop':'stop' }}"
+ iconId="stop" iconSize="42" toolTip="{{ deactivateTip }}"></onos-icon>
+ </div>
+ <div (click)="appAction('uninstall')">
+ <!--[ngClass]="{active: ctrlBtnState.selection}">-->
+ <!--tooltip tt-msg="uninstallTip"-->
+ <onos-icon classes="{{ ctrlBtnState.selection?'active garbage':'garbage' }}"
+ iconId="garbage" iconSize="42" toolTip="{{ uninstallTip }}"></onos-icon>
+ </div>
+ <div (click)="downloadApp()">
+ <onos-icon classes="{{ ctrlBtnState.selection?'active download':'download' }}"
+ iconId="download" iconSize="42" toolTip="{{ downloadTip }}"></onos-icon>
+ </div>
+ </div>
+ <div class="search">
+ <input id="searchinput" [(ngModel)]="tableDataFilter.queryStr" type="search" #search placeholder="Search"/>
+ <!--(keyup)="onSearch(search.value)" (search)="onSearch(search.value)"/>-->
+ <select [(ngModel)]="tableDataFilter.queryBy">
+ <!--(change)="onSearchBy($event)" (change)="search.value = ''">-->
+ <option value="" disabled>Search By</option>
+ <option value="$">All Fields</option>
+ <option value="title">{{lionFn('title')}}</option>
+ <option value="id">{{lionFn('app_id')}}</option>
+ <option value="version">{{lionFn('version')}}</option>
+ <option value="category">{{lionFn('category')}}</option>
+ <option value="origin">{{lionFn('origin')}}</option>
+ </select>
+ </div>
+
+ </div>
+
+ <div class="summary-list" onos-table-resize>
+ <table onos-flash-changes id-prop="id" width="100%">
+ <tr class="table-header">
+ <th colId="state" [ngStyle]="{width: '32px'}" class="table-icon" (click)="onSort('state')">
+ <onos-icon classes="active" [iconId]="sortIcon('state')"></onos-icon>
+ </th>
+ <th colId="icon" [ngStyle]="{width: '32px'}" class="table-icon"></th>
+ <th colId="title" (click)="onSort('title')">{{lionFn('title')}}
+ <onos-icon classes="active" [iconId]="sortIcon('title')"></onos-icon>
+ </th>
+ <th colId="id" (click)="onSort('id')">{{lionFn('app_id')}}
+ <onos-icon classes="active" [iconId]="sortIcon('id')"></onos-icon>
+ </th>
+ <th colId="version" (click)="onSort('version')"> {{lionFn('version')}}
+ <onos-icon classes="active" [iconId]="sortIcon('version')"></onos-icon>
+ </th>
+ <th colId="category" (click)="onSort('category')"> {{lionFn('category')}}
+ <onos-icon classes="active" [iconId]="sortIcon('category')"></onos-icon>
+ </th>
+ <th colId="origin" (click)="onSort('origin')"> {{lionFn('origin')}}
+ <onos-icon classes="active" [iconId]="sortIcon('origin')"></onos-icon>
+ </th>
+ </tr>
+
+ <tr *ngIf="tableData.length === 0" class="no-data">
+ <td colspan="5">
+ {{annots.no_rows_msg}}
+ </td>
+ </tr>
+ <!-- See https://angular.io/guide/pipes#appendix-no-filterpipe-or-orderbypipe
+ Angular has dropped the filter and order by pipe that were present in
+ AngularJS - filter and sort the data at source instead -->
+ <tr class="table-body" *ngFor="let app of tableData | filter: tableDataFilter"
+ (click)="selectCallback($event, app)"
+ [ngClass]="{selected: app.id === selId, 'data-change': isChanged(app.id)}">
+ <td class="table-icon">
+ <onos-icon iconId="{{app._iconid_state}}"></onos-icon>
+ </td>
+ <td class="table-icon">
+ <!-- The path below gets the app icon from the old GUI path -->
+ <img src="../../ui/rs/applications/{{app.icon}}/icon"
+ height="24px" width="24px" />
+ </td>
+ <td>{{ app.title }}</td>
+ <td>{{ app.id }}</td>
+ <td>{{ app.version }}</td>
+ <td>{{ app.category }}</td>
+ <td>{{ app.origin }}</td>
+ </tr>
+ </table>
+
+ </div>
+ <!-- There are 2 ways this component can be included
+ 1) Insert it in to the ngFor above and have it created as the row is rendered
+ for the row that has a selId != '' OR
+ 2) Include it here and let selId dictate its state
+ The advantage in 2) is that panel can be animated in and out, as it is not
+ killed every time the selection changes.
+ -->
+ <onos-appsdetails class="floatpanels" id="{{ selId }}"></onos-appsdetails>
+
+</div>
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.spec.ts b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.spec.ts
new file mode 100644
index 0000000..1889a44
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.spec.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, Params } from '@angular/router';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { FormsModule } from '@angular/forms';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+import { LogService } from '../../../log.service';
+import { AppsComponent } from './apps.component';
+import { AppsDetailsComponent } from '../appsdetails/appsdetails.component';
+import { DialogService } from '../../../fw/layer/dialog.service';
+import { FnService } from '../../../fw/util/fn.service';
+import { IconComponent } from '../../../fw/svg/icon/icon.component';
+import { IconService } from '../../../fw/svg/icon.service';
+import { KeyService } from '../../../fw/util/key.service';
+import { LionService } from '../../../fw/util/lion.service';
+import { LoadingService } from '../../../fw/layer/loading.service';
+import { ThemeService } from '../../../fw/util/theme.service';
+import { TableFilterPipe } from '../../../fw/widget/tablefilter.pipe';
+import { UrlFnService } from '../../../fw/remote/urlfn.service';
+import { WebSocketService } from '../../../fw/remote/websocket.service';
+import { of } from 'rxjs';
+
+class MockActivatedRoute extends ActivatedRoute {
+ constructor(params: Params) {
+ super();
+ this.queryParams = of(params);
+ }
+}
+
+class MockDialogService {}
+
+class MockFnService {}
+
+class MockIconService {
+ loadIconDef() {}
+}
+
+class MockKeyService {}
+
+class MockLoadingService {
+ startAnim() {}
+ stop() {}
+ waiting() {}
+}
+
+class MockThemeService {}
+
+class MockUrlFnService {}
+
+class MockWebSocketService {
+ createWebSocket() {}
+ isConnected() { return false; }
+ unbindHandlers() {}
+ bindHandlers() {}
+}
+
+/**
+ * ONOS GUI -- Apps View -- Unit Tests
+ */
+describe('AppsComponent', () => {
+ let fs: FnService;
+ let ar: MockActivatedRoute;
+ let windowMock: Window;
+ let logServiceSpy: jasmine.SpyObj<LogService>;
+ let component: AppsComponent;
+ let fixture: ComponentFixture<AppsComponent>;
+ const bundleObj = {
+ 'core.view.App': {
+ test: 'test1'
+ }
+ };
+ const mockLion = (key) => {
+ return bundleObj[key] || '%' + key + '%';
+ };
+
+ beforeEach(async(() => {
+ const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
+ ar = new MockActivatedRoute({'debug': 'txrx'});
+
+ windowMock = <any>{
+ location: <any> {
+ hostname: 'foo',
+ host: 'foo',
+ port: '80',
+ protocol: 'http',
+ search: { debug: 'true'},
+ href: 'ws://foo:123/onos/ui/websock/path',
+ absUrl: 'ws://foo:123/onos/ui/websock/path'
+ }
+ };
+ fs = new FnService(ar, logSpy, windowMock);
+
+ TestBed.configureTestingModule({
+ imports: [ BrowserAnimationsModule, FormsModule ],
+ declarations: [ AppsComponent, IconComponent, AppsDetailsComponent, TableFilterPipe ],
+ providers: [
+ { provide: DialogService, useClass: MockDialogService },
+ { provide: FnService, useValue: fs },
+ { provide: IconService, useClass: MockIconService },
+ { provide: KeyService, useClass: MockKeyService },
+ { provide: LionService, useFactory: (() => {
+ return {
+ bundle: ((bundleId) => mockLion),
+ ubercache: new Array(),
+ loadCbs: new Map<string, () => void>([])
+ };
+ })
+ },
+ { provide: LoadingService, useClass: MockLoadingService },
+ { provide: LogService, useValue: logSpy },
+ { provide: ThemeService, useClass: MockThemeService },
+ { provide: UrlFnService, useClass: MockUrlFnService },
+ { provide: WebSocketService, useClass: MockWebSocketService },
+ { provide: 'Window', useValue: windowMock },
+ ]
+ })
+ .compileComponents();
+ logServiceSpy = TestBed.get(LogService);
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AppsComponent);
+ component = fixture.debugElement.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should have a div.tabular-header inside a div#ov-app', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#ov-app div.tabular-header'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a h2 inside the div.tabular-header', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#ov-app div.tabular-header h2'));
+ const div: HTMLElement = divDe.nativeElement;
+ expect(div.textContent).toEqual(' %title_apps% (0 %total%) ');
+ });
+
+ it('should have a refresh button inside the div.tabular-header', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#ov-app div.tabular-header div.ctrl-btns div.refresh'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have an active button inside the div.tabular-header', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#ov-app div.tabular-header div.ctrl-btns div.active'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a div.summary-list inside a div#ov-app', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#ov-app div.summary-list'));
+ expect(divDe).toBeTruthy();
+ });
+});
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts
new file mode 100644
index 0000000..79fa310
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2015-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Component, OnInit, OnDestroy, Inject } from '@angular/core';
+import { DialogService } from '../../../fw/layer/dialog.service';
+import { FnService } from '../../../fw/util/fn.service';
+import { IconService } from '../../../fw/svg/icon.service';
+import { KeyService } from '../../../fw/util/key.service';
+import { LionService } from '../../../fw/util/lion.service';
+import { LoadingService } from '../../../fw/layer/loading.service';
+import { LogService } from '../../../log.service';
+import { TableBaseImpl, TableResponse, TableFilter, SortParams, SortDir } from '../../../fw/widget/table.base';
+import { UrlFnService } from '../../../fw/remote/urlfn.service';
+import { WebSocketService } from '../../../fw/remote/websocket.service';
+import { TableFilterPipe } from '../../../fw/widget/tablefilter.pipe';
+
+const INSTALLED = 'INSTALLED';
+const ACTIVE = 'ACTIVE';
+const appMgmtReq = 'appManagementRequest';
+const topPdg = 60;
+const panelWidth = 540;
+const pName = 'application-details-panel';
+const detailsReq = 'appDetailsRequest';
+const detailsResp = 'appDetailsResponse';
+const fileUploadUrl = 'applications/upload';
+const activateOption = '?activate=true';
+
+/** Prefix to access the REST service for applications */
+export const APPURLPREFIX = '../../ui/rs/applications/'; // TODO: This is a hack to work off GUIv1 URL
+/** Suffix to access the icon of the application - gives back an image */
+export const ICONURLSUFFIX = '/icon';
+
+const downloadSuffix = '/download';
+const dialogId = 'app-dialog';
+const dialogOpts = {
+ edge: 'right',
+ width: 400,
+};
+const strongWarning = {
+ 'org.onosproject.drivers': true,
+};
+const propOrder = ['id', 'state', 'category', 'version', 'origin', 'role'];
+
+/**
+ * Model of the data returned through the Web Socket about apps.
+ */
+interface AppTableResponse extends TableResponse {
+ apps: App[];
+}
+
+/**
+ * Model of the data returned through Web Socket for a single App
+ */
+export interface App {
+ category: string;
+ desc: string;
+ features: string[];
+ icon: string;
+ id: string;
+ origin: string;
+ permissions: string[];
+ readme: string;
+ required_apps: string[];
+ role: string;
+ state: string;
+ title: string;
+ url: string;
+ version: string;
+ _iconid_state: string;
+}
+
+/**
+ * Model of the Control Button
+ */
+interface CtrlBtnState {
+ installed: boolean;
+ selection: string;
+ active: boolean;
+}
+
+/**
+ * ONOS GUI -- Apps View Component
+ */
+@Component({
+ selector: 'onos-apps',
+ templateUrl: './apps.component.html',
+ styleUrls: [
+ './apps.component.css', './apps.theme.css',
+ '../../../fw/widget/table.css', '../../../fw/widget/table.theme.css'
+ ]
+})
+export class AppsComponent extends TableBaseImpl implements OnInit, OnDestroy {
+
+ // deferred localization strings
+ lionFn; // Function
+ warnDeactivate: string;
+ warnOwnRisk: string;
+ ctrlBtnState: CtrlBtnState;
+ detailsPanel: any;
+ appFile: any;
+ activateImmediately = '';
+
+ uploadTip: string;
+ activateTip: string;
+ deactivateTip: string;
+ uninstallTip: string;
+ downloadTip: string;
+
+ constructor(
+ protected fs: FnService,
+ private ds: DialogService,
+ private is: IconService,
+ private ks: KeyService,
+ private lion: LionService,
+ protected ls: LoadingService,
+ protected log: LogService,
+ private ufs: UrlFnService,
+ protected wss: WebSocketService,
+ @Inject('Window') private window: Window,
+ ) {
+ super(fs, null, log, wss, 'app');
+ this.responseCallback = this.appResponseCb;
+ // pre-populate sort so active apps are at the top of the list
+ this.sortParams = {
+ firstCol: 'state',
+ firstDir: SortDir.desc,
+ secondCol: 'title',
+ secondDir: SortDir.asc,
+ };
+ // We want doLion() to be called only after the Lion
+ // service is populated (from the WebSocket)
+ // If lion is not ready we make do with a dummy function
+ // As soon a lion gets loaded this function will be replaced with
+ // the real thing
+ if (this.lion.ubercache.length === 0) {
+ this.lionFn = this.dummyLion;
+ this.lion.loadCbs.set('apps', () => this.doLion());
+ } else {
+ this.doLion();
+ }
+
+ this.ctrlBtnState = <CtrlBtnState>{
+ installed: false,
+ active: false
+ };
+ }
+
+ /**
+ * Initialize querying the WebSocket for App table details
+ */
+ ngOnInit() {
+ this.init();
+ }
+
+ /**
+ * Stop sending queries to WebSocket
+ */
+ ngOnDestroy() {
+ this.lion.loadCbs.delete('apps');
+ this.destroy();
+ this.log.debug('AppComponent destroyed');
+ }
+
+ /**
+ * The callback called when App data returns from WSS
+ */
+ appResponseCb(data: AppTableResponse) {
+ this.log.debug('App response received for ', data.apps.length, 'apps');
+ }
+
+ refreshCtrls() {
+ let row;
+ let rowIdx;
+ if (this.ctrlBtnState.selection) {
+ rowIdx = this.fs.find(this.selId, this.tableData);
+ row = rowIdx >= 0 ? this.tableData[rowIdx] : null;
+
+ this.ctrlBtnState.installed = row && row.state === INSTALLED;
+ this.ctrlBtnState.active = row && row.state === ACTIVE;
+ } else {
+ this.ctrlBtnState.installed = false;
+ this.ctrlBtnState.active = false;
+ }
+ }
+
+ createConfirmationText(action, itemId) {
+// let content = this.ds.createDiv();
+// content.append('p').text(this.lionFn(action) + ' ' + itemId);
+// if (strongWarning[itemId]) {
+// content.append('p').html(
+// this.fs.sanitize(this.warnDeactivate) +
+// '<br>' +
+// this.fs.sanitize(this.warnOwnRisk)
+// ).classed('strong', true);
+// }
+// return content;
+ }
+
+ confirmAction(action): void {
+ const itemId = this.selId;
+ const spar = this.sortParams;
+
+ function dOk() {
+ this.log.debug('Initiating', action, 'of', itemId);
+ this.wss.sendEvent(appMgmtReq, {
+ action: action,
+ name: itemId,
+ sortCol: spar.firstCol,
+ sortDir: spar.firstDir,
+ });
+ if (action === 'uninstall') {
+ this.detailsPanel.hide();
+ } else {
+ this.wss.sendEvent(detailsReq, { id: itemId });
+ }
+ }
+
+ function dCancel() {
+ this.log.debug('Canceling', action, 'of', itemId);
+ }
+
+// this.ds.openDialog(dialogId, dialogOpts)
+// .setTitle(this.lionFn('dlg_confirm_action'))
+// .addContent(this.createConfirmationText(action, itemId))
+// .addOk(dOk)
+// .addCancel(dCancel)
+// .bindKeys();
+ }
+
+ appAction(action) {
+ if (this.ctrlBtnState.selection) {
+ this.confirmAction(action);
+ }
+ }
+
+ downloadApp() {
+ if (this.ctrlBtnState.selection) {
+ (<any>this.window).location = APPURLPREFIX + this.selId + ICONURLSUFFIX;
+ }
+ }
+
+ /**
+ * Read the LION bundle for App and set up the lionFn
+ */
+ doLion() {
+ this.lionFn = this.lion.bundle('core.view.App');
+
+ this.warnDeactivate = this.lionFn('dlg_warn_deactivate');
+ this.warnOwnRisk = this.lionFn('dlg_warn_own_risk');
+
+ this.uploadTip = this.lionFn('tt_ctl_upload');
+ this.activateTip = this.lionFn('tt_ctl_activate');
+ this.deactivateTip = this.lionFn('tt_ctl_deactivate');
+ this.uninstallTip = this.lionFn('tt_ctl_uninstall');
+ this.downloadTip = this.lionFn('tt_ctl_download');
+ }
+
+ appDropped() {
+ this.activateImmediately = activateOption;
+// $scope.$emit('FileChanged'); // TODO: Implement this
+ this.appFile = null;
+ }
+}
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.theme.css b/web/gui2/src/main/webapp/app/view/apps/apps/apps.theme.css
new file mode 100644
index 0000000..3de7ad8
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.theme.css
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Applications View (theme) -- CSS file
+ */
+
+/* -- Drag-n-Drop OAR files -- */
+div.dropping {
+ border: solid 3px #0095d6;
+}
+
+
+/* -- confirmation dialog -- */
+.light #app-dialog p.strong {
+ color: white;
+ background-color: #ce5b58;
+}
+
+.light #app-dialog.floatpanel.dialog {
+ background-color: #ffffff;
+}
+
+/* ========== DARK Theme ========== */
+
+
+.dark .app-title {
+ color: #dddddd;
+}
+
+/* -- confirmation dialog -- */
+.dark #app-dialog p.strong {
+ color: red;
+ background-color: #ecd98e;
+}
+.dark #app-dialog.floatpanel.dialog {
+ background-color: #282528;
+ color:#ddddee;
+}