Skip to content

Commit

Permalink
Merge pull request #305 from TIBCOSoftware/app-model/extra
Browse files Browse the repository at this point in the history
Style details and small features updated.
fcastill authored Jan 31, 2017
2 parents 98c95e2 + 2838964 commit 1b4905e
Showing 26 changed files with 268 additions and 129 deletions.
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@
text-transform: uppercase;
min-width: 124px;
height: 40px;
display: none;
&:nth-child(2) {
margin: 0 15px;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component, Input, Output, SimpleChanges, OnChanges, OnInit, ViewChild, EventEmitter } from '@angular/core';

import { TranslateService } from 'ng2-translate/ng2-translate';
import { IFlogoApplicationModel, IFlogoApplicationFlowModel } from '../../../common/application.model';
import { AppDetailService, ApplicationDetail, ApplicationDetailState } from '../../flogo.apps/services/apps.service';
@@ -22,6 +23,7 @@ export class FlogoApplicationComponent implements OnChanges, OnInit {

@Output() flowSelected: EventEmitter<IFlogoApplicationFlowModel> = new EventEmitter<IFlogoApplicationFlowModel>();
@Output() flowAdded: EventEmitter<IFlogoApplicationFlowModel> = new EventEmitter<IFlogoApplicationFlowModel>();
@Output() flowDeleted: EventEmitter<IFlogoApplicationModel> = new EventEmitter<IFlogoApplicationModel>();
@Output() onDeletedApp: EventEmitter<IFlogoApplicationModel> = new EventEmitter<IFlogoApplicationModel>();

application: IFlogoApplicationModel;
@@ -128,6 +130,10 @@ export class FlogoApplicationComponent implements OnChanges, OnInit {
this.flowSelected.emit(flow);
}

onFlowDelete(flow){
this.flowDeleted.emit(flow);
}

onFlowImportSuccess(result: any) {
let message = this.translate.instant('FLOWS:SUCCESS-MESSAGE-IMPORT');
notification(message, 'success', 3000);
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@
</button>
<button class="flogo-button flogo-button--default">{{ 'DETAILS:BUILD' | translate }}</button>
<div class="flogo-flow-detail-menu">
<i class="flogo-icon-kebabmenu"></i>
<div class="flogo-flow-detail-menu-list-wrapper">
<ul class="flogo-flow-detail-menu-list">
<li class="flogo-flow-detail-menu-item">
@@ -90,7 +91,7 @@


<div class="flogo-app-content__flows">
<flogo-apps-flows [flows]="flows" (flowSelected)="onFlowSelected($event)"></flogo-apps-flows>
<flogo-apps-flows [flows]="flows" (flowSelected)="onFlowSelected($event)" (deleteFlow)="onFlowDelete($event)"></flogo-apps-flows>
</div>

</div>
Original file line number Diff line number Diff line change
@@ -71,6 +71,12 @@ export class FlogoApplicationContainerComponent implements OnInit, OnDestroy {
this.appService.reload();
}

public onFlowDeleted(flow){
this.flowsService.deleteFlow(flow.id).then(()=>{
this.appService.reload();
});
}

private initSubscribe() {
this.subscriptions = [
this.postService.subscribe(_.assign({}, SUB_EVENTS.addFlow, { callback: this.onAddFlow.bind(this) }))
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<flogo-apps-details-application [appDetail]="appDetail"
(flowSelected)="onFlowSelected($event)"
(flowDeleted)="onFlowDeleted($event)"
(flowAdded)="onFlowAdded($event)"></flogo-apps-details-application>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "_variables";
.flogo-flow {
position: relative;
opacity: 0;
@@ -75,7 +76,6 @@
position: absolute;
top: -7px;
right: 15px;
height: 94px;
width: 129px;
z-index: 1;
transform: scale(0, 0);
@@ -91,8 +91,12 @@
list-style: none;
font-size: .875em;
margin: 0;
padding: 0;
.flogo-flow-menu__options__list__element {
padding: 3px 0;
padding: 3px 0 5px 20px;
&:hover{
color: @color-secondary;
}
}
}
}
51 changes: 47 additions & 4 deletions src/client/app/flogo.apps.flows/components/flows.component.spec.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import {TranslateModule, TranslateLoader, TranslateStaticLoader} from 'ng2-trans
import {ModalComponent} from 'ng2-bs3-modal/ng2-bs3-modal';
import {Http} from '@angular/http';
import {FlogoApplicationFlowsComponent} from './flows.component';
import { FlogoModal } from '../../../common/services/modal.service';

@Component({
selector: 'container',
@@ -17,6 +18,33 @@ import {FlogoApplicationFlowsComponent} from './flows.component';
class Container {
@Output() changes = new EventEmitter();
flows: Array<any> = [
{
id: '879',
name: 'Log temperature',
description: 'A complex flow for apietusam faccum esequi berum. Hentias porerum ent omniend itatempoer porem uga. Luptati optaquisist quibus rem quam unt',
createdAt: new Date()
},
{
id: '869',
name: 'Log temperature 2',
description: 'A complex flow for apietusam faccum esequi berum. Hentias porerum ent omniend itatempoer porem uga. Luptati optaquisist quibus rem quam unt',
createdAt: new Date()
},
{
id: '897',
name: 'Manually adjust temperature',
description: 'A flow for apietusam faccum esequi berum. Hentias porerum ent omniend itatempoer porem uga. Luptati optaquisist quibus rem quam unt Hentias porerum ent omniend itatempoer porem uga. Luptati optaquisist quibus rem quam unt Luptas oilsksd as asdfwo',
createdAt: new Date()
},
{
id: '987',
name: 'Raise temperature & notifiy operator',
description: 'A basic flow for apietusam',
createdAt: new Date()
}
];

flowsDisorder: Array<any> = [
{
id: '897',
name: 'Manually adjust temperature',
@@ -37,7 +65,7 @@ class Container {
},
{
id: '869',
name: 'Log temperature 2',
name: 'Try to find pet',
description: 'A complex flow for apietusam faccum esequi berum. Hentias porerum ent omniend itatempoer porem uga. Luptati optaquisist quibus rem quam unt',
createdAt: new Date()
}
@@ -63,10 +91,25 @@ describe('Application flows', () => {
useFactory: (http: Http) => new TranslateStaticLoader(http, '/base/dist/public/assets/i18n', '.json'),
deps: [Http]
})],
declarations: [ FlogoApplicationFlowsComponent, ModalComponent, Container ] // declare the test component
declarations: [ FlogoApplicationFlowsComponent, ModalComponent, Container ], // declare the test component
providers: [FlogoModal]
});
});

it('Should order the flows in alphabetical order', done => {
compileComponent()
.then(() => {
fixture = TestBed.createComponent(Container);
let comp = fixture.componentInstance;
comp.flows = comp.flowsDisorder;
fixture.detectChanges();
let res = fixture.debugElement.queryAll(By.css('.flogo-flow-name'));
let nameList = res.map(element => element.nativeElement.innerHTML);
expect(nameList).toEqual(['Log temperature', 'Manually adjust temperature', 'Raise temperature &amp; notifiy operator', 'Try to find pet']);
done();
});
});

it('Should render 4 flows', done => {
compileComponent()
.then(() => {
@@ -85,7 +128,7 @@ describe('Application flows', () => {
fixture.detectChanges();
de = fixture.debugElement.query(By.css('.flogo-flow-name:nth-of-type(1)'));
el = de.nativeElement;
expect(el.innerText).toEqual('Manually Adjust Temperature');
expect(el.innerText).toEqual('Log Temperature');
done();
});
});
@@ -96,7 +139,7 @@ describe('Application flows', () => {
fixture = TestBed.createComponent(Container);
fixture.detectChanges();
let res: Array<DebugElement> = fixture.debugElement.queryAll(By.css('.flogo-flow-description'));
el = res[1].nativeElement;
el = res[3].nativeElement;
expect(el.innerText).toEqual('A basic flow for apietusam');
done();
});
33 changes: 26 additions & 7 deletions src/client/app/flogo.apps.flows/components/flows.component.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,44 @@
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { TranslateService } from 'ng2-translate/ng2-translate';

import { IFlogoApplicationFlowModel as FlowModel } from './../../../common/application.model';
import {Component, Input, Output, EventEmitter, OnChanges, SimpleChanges} from '@angular/core';
import {TranslateService} from 'ng2-translate/ng2-translate';
import { FlogoModal } from '../../../common/services/modal.service';
import {IFlogoApplicationFlowModel as FlowModel} from './../../../common/application.model';

@Component({
selector: 'flogo-apps-flows',
moduleId: module.id,
templateUrl: 'flows.tpl.html',
styleUrls: ['flows.component.css']
})
export class FlogoApplicationFlowsComponent {
export class FlogoApplicationFlowsComponent implements OnChanges{
@Input()
public flows: Array<FlowModel> = [];
@Output()
public flowSelected: EventEmitter<FlowModel> = new EventEmitter<FlowModel>();
@Output()
public deleteFlow: EventEmitter<FlowModel> = new EventEmitter<FlowModel>();

constructor(public translate: TranslateService, public flogoModal: FlogoModal) {
}

constructor(public translate: TranslateService) {
ngOnChanges(changes:SimpleChanges){
this.flows = _.sortBy(this.flows, flow => flow.name.toLowerCase());
}

select(flow: FlowModel) {
trackByFlowId(index: number, flow: FlowModel) {
return flow ? flow.id : null;
}

onSelect(flow: FlowModel) {
this.flowSelected.emit(flow);
}

onDeleteFlow(event: Event, flow: FlowModel) {
event.stopPropagation();
let message = this.translate.instant('FLOWS:CONFIRM_DELETE', {flowName: flow.name});
this.flogoModal.confirmDelete(message).then((res) => {
if (res) {
this.deleteFlow.emit(flow);
}
});
}
}
18 changes: 12 additions & 6 deletions src/client/app/flogo.apps.flows/components/flows.tpl.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div *ngFor="let flow of flows; let i = index" class="flogo-flow" (click)="select(flow)" [ngStyle]="{'animation-delay': (200 * i) + 'ms' }">
<div *ngFor="let flow of flows; let i = index; trackBy: trackByFlowId" class="flogo-flow" (click)="onSelect(flow)"
[ngStyle]="{'animation-delay': (200 * i) + 'ms' }">
<div class="flogo-flow-trigger">
<i class="flogo-icon-trigger"></i>
</div>
@@ -10,18 +11,23 @@
<div class="flogo-flow-menu">
<div class="flogo-flow-menu__options">
<ul class="flogo-flow-menu__options__list">
<!--
<li class="flogo-flow-menu__options__list__element">
<a href=""><i class="flogo-icon flogo-icon-edit"></i>Rename</a>
<i class="flogo-icon flogo-icon-edit"></i>
{{ 'FLOWS:OPTION-RENAME' | translate}}
</li>
<li class="flogo-flow-menu__options__list__element">
<a href=""><i class="flogo-icon flogo-icon-export"></i>Export</a>
<i class="flogo-icon flogo-icon-export"></i>
{{ 'FLOWS:OPTION-EXPORT' | translate}}
</li>
<li class="flogo-flow-menu__options__list__element">
<a href=""><i class="flogo-icon flogo-icon-delete"></i>Delete</a>
-->
<li class="flogo-flow-menu__options__list__element" (click)="onDeleteFlow($event, flow)">
<i class="flogo-icon flogo-icon-delete"></i>
{{ 'FLOWS:OPTION-DELETE' | translate}}
</li>
</ul>
</div>
<span class="glyphicon glyphicon-option-vertical menu__btn"> </span>
<i class="flogo-icon-kebabmenu menu__btn"> </i>
</div>
</div>

4 changes: 3 additions & 1 deletion src/client/app/flogo.apps.list/components/app.list.tpl.html
Original file line number Diff line number Diff line change
@@ -3,9 +3,11 @@
<div class="flogo-app-list__header">
<div class="title">{{ 'APP-LIST:MY-APPS' | translate }}</div>
<div>
<!--
<button class="flogo-button--import-app">
<i class="flogo-icon flogo-icon-download"></i><span>Import</span>
<i class="flogo-icon flogo-icon-import"></i><span>Import</span>
</button>
-->
<button class="flogo-button--add-app" (click)="onAdd($event)"><i class="flogo-icon-add"></i></button>
</div>
</div>
52 changes: 38 additions & 14 deletions src/client/app/flogo.apps.main/components/main.component.ts
Original file line number Diff line number Diff line change
@@ -2,9 +2,11 @@ import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { RESTAPIApplicationsService } from '../../../common/services/restapi/applications-api.service';
import { IFlogoApplicationModel, IFlogoApplicationFlowModel } from '../../../common/application.model';
import { RESTAPIFlowsService } from '../../../common/services/restapi/flows-api.service';
import { TranslateService } from 'ng2-translate/ng2-translate';

import { FlogoModal } from '../../../common/services/modal.service';
import {flogoIDEncode} from "../../../common/utils";
import { flogoIDEncode, notification } from "../../../common/utils";


@Component( {
@@ -22,24 +24,14 @@ export class FlogoMainComponent implements OnInit {
constructor(
private _flogoModal: FlogoModal,
private router: Router,
public translate: TranslateService,
private flowsService: RESTAPIFlowsService,
public applicationServiceAPI: RESTAPIApplicationsService
) {
}

ngOnInit() {
this.applicationServiceAPI.recentFlows()
.then((flows: Array<any>)=> {
flows = flows.length <= 3 ? flows : flows.slice(0,3);
flows.forEach(flow=>{flow.encodedId = flogoIDEncode(flow.id)});
this.recent = flows;
});

this.applicationServiceAPI.allFlows()
.then((flows: Array<IFlogoApplicationFlowModel>)=> {
this.originalFlows = flows;
this.flows = this.getOriginalFlows();
});

this.loadFlows();
}

onChangedSearch(search) {
@@ -66,8 +58,40 @@ export class FlogoMainComponent implements OnInit {
});
}

loadFlows() {
this.applicationServiceAPI.recentFlows()
.then((flows: Array<any>) => {
flows = flows.length <= 3 ? flows : flows.slice(0, 3);
flows.forEach(flow => {
flow.encodedId = flogoIDEncode(flow.id)
});
this.recent = flows;
});

this.applicationServiceAPI.allFlows()
.then((flows: Array<IFlogoApplicationFlowModel>) => {
this.originalFlows = flows;
this.flows = this.getOriginalFlows();
});
}

onFlowSelected(flow) {
this.router.navigate(['/flows', flogoIDEncode(flow._id)]);
}

onFlowDeleted(flow) {
this.flowsService.deleteFlow(flow._id)
.then(() => {
let message = this.translate.instant('FLOWS:SUCCESS-MESSAGE-FLOW-DELETED');
notification(message, 'success', 3000)
})
.then(() => {
this.loadFlows();
})
.catch(err => {
let message = this.translate.instant('FLOWS:ERROR-MESSAGE-REMOVE-FLOW', err);
notification(message, 'error', 3000);
console.error(err);
})
}
}
2 changes: 1 addition & 1 deletion src/client/app/flogo.apps.main/components/main.tpl.html
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ <h3 class="flogo-main__subtitle">{{ 'FLOWS:ALL' | translate }}</h3>
</div>
</div>

<flogo-apps-flows [flows]="flows" (flowSelected)="onFlowSelected($event)"></flogo-apps-flows>
<flogo-apps-flows [flows]="flows" (flowSelected)="onFlowSelected($event)" (deleteFlow)="onFlowDeleted($event)"></flogo-apps-flows>
</div>


36 changes: 19 additions & 17 deletions src/client/app/flogo.flows.detail/components/canvas.component.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@import "_variables";

@flogo-flow-detail-header-selected-color:#1573ca;
@flogo-flow-detail-header-unselected-color:#666666;

:host {
display: flex;
align-items: stretch;
@@ -78,12 +75,16 @@

.flogo-flow-detail {
background-color: #FAFAFA;
height: 113px;
display: flex;
align-items: center;
}

.flogo-flow-detail-name {
font-size: 24px;
color: #666666;
color: @color-plane;
margin: 0;
margin-bottom: -5px;
line-height: 1.5;
}

@@ -117,7 +118,6 @@
}

.flogo-flow-detail-log-button-container {
margin-top: 36px;
width: 40px;
height: 40px;
margin-right: 10px;
@@ -143,40 +143,42 @@

.flogo-flow-detail-menu{
margin-right: 15px;
margin-top: 36px;
}

.flogo-flow-detail-header {
padding: 20px 0 30px 30px;

.flogo-flow-detail-name + span{
font-size: .875em;
}

.flogo-flow-detail-header-back {
display: flex;
flex-direction: row;

.flogo-flow-detail-header-back-icon {
cursor: pointer;
width: 20px;
margin-top: 10px;

li {
font-size: 30px;
position: absolute;
top: 20px;
color: @flogo-flow-detail-header-unselected-color;
.flogo-icon-back {
font-size: 1.2em;
padding: 0 10px;
color: @color-secondary;
}
}

.flogo-flow-detail-header-back-app-name {
font-size: .875em;
color: @color-secondary;
cursor: pointer;
color: @flogo-flow-detail-header-selected-color;
}

&.--hover {
.flogo-flow-detail-header-back-app-name {
text-decoration: underline;
color: @color-primary;
font-weight: bold;
}
.flogo-flow-detail-header-back-icon li {
color: @flogo-flow-detail-header-selected-color;
.flogo-flow-detail-header-back-icon .flogo-icon {
color: @color-primary
}
}
}
21 changes: 21 additions & 0 deletions src/client/app/flogo.flows.detail/components/canvas.component.ts
Original file line number Diff line number Diff line change
@@ -948,6 +948,27 @@ export class FlogoCanvasComponent implements OnInit {
}
}

deleteFlow() {
let message = this.translate.instant('FLOWS:CONFIRM_DELETE', {flowName: this.flow.name});
this._flogoModal.confirmDelete(message)
.then((res) => {
if (res) {
this._restAPIFlowsService.deleteFlow(this.flowId)
.then(() => {
this.navigateToApp();
})
.then(() => {
let message = this.translate.instant('FLOWS:SUCCESS-MESSAGE-FLOW-DELETED');
notification(message, 'success', 3000);
})
.catch(err => {
let message = this.translate.instant('FLOWS:ERROR-MESSAGE-REMOVE-FLOW', err);
notification(message, 'error');
console.error(err);
});
}
})
}

exportTriggerAndFlow() {
return this._exportTriggerAndFlow.bind(this);
5 changes: 3 additions & 2 deletions src/client/app/flogo.flows.detail/components/canvas.tpl.html
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
(click)="navigateToApp()"
(mouseover)="onMouseOverBackControl()"
(mouseout)="onMouseOutBackControl()">
<li class="fa fa-angle-left"></li>
<i class="flogo-icon flogo-icon-back"></i>
</div>
<div class="">
<h3 class="flogo-flow-detail-name" [(myContenteditable)]="flow.name" (myContenteditableChange)="changeFlowDetail($event, 'name')"></h3>
@@ -29,6 +29,7 @@ <h3 class="flogo-flow-detail-name" [(myContenteditable)]="flow.name" (myContente

<div class="col-sm-3 flogo-flow-detail-menu-container">
<div class="flogo-flow-detail-menu">
<i class="flogo-icon-kebabmenu"></i>
<div class="flogo-flow-detail-menu-list-wrapper">
<ul class="flogo-flow-detail-menu-list">
<li class="flogo-flow-detail-menu-item">
@@ -42,7 +43,7 @@ <h3 class="flogo-flow-detail-name" [(myContenteditable)]="flow.name" (myContente
<li class="flogo-flow-detail-menu-item"><a disabled href="javascript:void(0);"><i class="fa fa-clone fa-fw"></i>{{ 'CANVAS:COPY' | translate }}</a></li>
<li class="flogo-flow-detail-menu-item"><a [jsonDownloader]="exportTriggerAndFlow()"><i class="fa fa-cloud-download fa-fw"></i> {{ 'CANVAS:EXPORT-FOR-CLI' | translate }}</a></li>
<li class="flogo-flow-detail-menu-item"><a [href]="exportLink" download><i class="fa fa-cloud-download fa-fw"></i>{{ 'CANVAS:EXPORT-FOR-WEB-UI' | translate }}</a></li>
<li class="flogo-flow-detail-menu-item"><a href="javascript:void(0);"><i class="flogo-icon flogo-icon-delete"></i>{{ 'CANVAS:DELETE' | translate }}</a></li>
<li class="flogo-flow-detail-menu-item"><a (click)="deleteFlow()" href="javascript:void(0);"><i class="flogo-icon flogo-icon-delete"></i>{{ 'CANVAS:DELETE' | translate }}</a></li>
</ul>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<label class="flogo-flows-import-label" (click)="selectFile($event)">
<span class="flogo-common-flows-new-flow__text"><i class="flogo-icon flogo-icon-download"></i>{{ 'IMPORT-FLOW:IMPORT-FLOW' | translate }}</span>
<span class="flogo-common-flows-new-flow__text"><i class="flogo-icon flogo-icon-import"></i>{{ 'IMPORT-FLOW:IMPORT-FLOW' | translate }}</span>
<input class="flogo-flows-import-input-file" type="file" accept="application/json" hidden
(change)="onFileChange($event)" name="importFile">
</label>
9 changes: 6 additions & 3 deletions src/client/app/flogo/components/navbar.component.less
Original file line number Diff line number Diff line change
@@ -40,13 +40,16 @@ ul.flogo-header__help-menu-content {
background-color: #ffffff;
box-shadow: 0 2px 4px 0 rgba(199, 199, 199, 0.5);
border: solid 1px #727272;
display: none;
list-style: none;
margin: 0;
min-width: 280px;
padding: 9px 15px;
position: absolute;
right: 0;
right: 30px;
top: 40px;
transform: scale(0);
transform-origin: top right;
transition: all 300ms ease-in;

li, a {
margin: 0;
@@ -92,7 +95,7 @@ ul.flogo-header__help-menu-content {
.flogo-header__help-menu:hover {

.flogo-header__help-menu-content {
display: block;
transform: scale(1);
}

.flogo-header__help-menu-btn {
48 changes: 30 additions & 18 deletions src/client/assets/flogo-icons.less
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'flogo-icon';
src: url('fonts/flogo-icon.eot?gsmp63');
src: url('fonts/flogo-icon.eot?gsmp63#iefix') format('embedded-opentype'),
url('fonts/flogo-icon.ttf?gsmp63') format('truetype'),
url('fonts/flogo-icon.woff?gsmp63') format('woff'),
url('fonts/flogo-icon.svg?gsmp63#flogo-icon') format('svg');
src: url('fonts/flogo-icon.eot?dz3w7j');
src: url('fonts/flogo-icon.eot?dz3w7j#iefix') format('embedded-opentype'),
url('fonts/flogo-icon.ttf?dz3w7j') format('truetype'),
url('fonts/flogo-icon.woff?dz3w7j') format('woff'),
url('fonts/flogo-icon.svg?dz3w7j#flogo-icon') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -24,46 +24,58 @@
-moz-osx-font-smoothing: grayscale;
}

.flogo-icon-edit:before {
.flogo-icon-import:before {
content: "\e910";
}
.flogo-icon-export:before {
content: "\e911";
}
.flogo-icon-add:before {
content: "\e900";
}
.flogo-icon-delete:before {
.flogo-icon-back:before {
content: "\e901";
}
.flogo-icon-add:before {
.flogo-icon-debug:before {
content: "\e902";
}
.flogo-icon-debug:before {
.flogo-icon-delete:before {
content: "\e903";
}
.flogo-icon-download:before {
content: "\e904";
}
.flogo-icon-export:before {
.flogo-icon-edit:before {
content: "\e905";
}
.flogo-icon-help:before {
.flogo-icon-upload:before {
content: "\e906";
}
.flogo-icon-info:before {
.flogo-icon-help:before {
content: "\e907";
}
.flogo-icon-info-dark:before {
.flogo-icon-info-outline:before {
content: "\e908";
}
.flogo-icon-link:before {
.flogo-icon-info:before {
content: "\e909";
}
.flogo-icon-log:before {
.flogo-icon-kebabmenu:before {
content: "\e90a";
}
.flogo-icon-search:before {
.flogo-icon-link:before {
content: "\e90b";
}
.flogo-icon-trigger:before {
.flogo-icon-log:before {
content: "\e90c";
}
.flogo-icon-video:before {
.flogo-icon-search:before {
content: "\e90d";
}
.flogo-icon-trigger:before {
content: "\e90e";
}
.flogo-icon-video:before {
content: "\e90f";
}

Binary file modified src/client/assets/fonts/flogo-icon.eot
Binary file not shown.
30 changes: 17 additions & 13 deletions src/client/assets/fonts/flogo-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/client/assets/fonts/flogo-icon.ttf
Binary file not shown.
Binary file modified src/client/assets/fonts/flogo-icon.woff
Binary file not shown.
27 changes: 18 additions & 9 deletions src/client/assets/main.less
Original file line number Diff line number Diff line change
@@ -400,7 +400,7 @@ label {
.flogo-common-edit-panel__btn-download {
width: 100%;
height: 40px;
.flogo-icon-download{
.flogo-icon-import{
margin-right: 5px;
}
}
@@ -594,17 +594,26 @@ label {
width: 100%;
}

.flogo-flow-detail-menu{
height: 43px;
width: 29px;
.flogo-flow-detail-menu {
background: white;
border: solid 2px #d8d8d8;
border-radius: 7px;
color: @color-secondary;
display: flex;
justify-content: center;
align-items: center;
position: relative;
background: url("/assets/svg/flogo.flows.detail.menu.icon.svg") left top no-repeat;
&:hover, &:active{
background: url("/assets/svg/flogo.flows.detail.menu.hover.icon.svg") left top no-repeat;
.flogo-flow-detail-menu-list-wrapper{
height: 42px;
width: 29px;

&:hover, &:active {
color: #fff;
background: @color-secondary;
border: 0;
.flogo-flow-detail-menu-list-wrapper {
transform: scale(1, 1);
}
.flogo-flow-detail-menu-list{
.flogo-flow-detail-menu-list {
opacity: 1;
}
}
15 changes: 0 additions & 15 deletions src/client/assets/svg/flogo.flows.detail.menu.hover.icon.svg

This file was deleted.

15 changes: 0 additions & 15 deletions src/client/assets/svg/flogo.flows.detail.menu.icon.svg

This file was deleted.

4 changes: 4 additions & 0 deletions src/client/i18n/en.json
Original file line number Diff line number Diff line change
@@ -55,13 +55,17 @@
"FLOW-NAME:RENAME": "Rename flow",
"FLOW-NAME:GETTING-FLOW-NAME": "Error getting flow name",
"FLOWS:ALL": "All Flows",
"FLOWS:CONFIRM_DELETE": "Are you sure you want to delete the flow \"{{flowName}}\"?",
"FLOWS:CREATED": "Created {{value}}",
"FLOWS:CREATE_FLOW_ERROR": "An error occurred creating the flow",
"FLOWS:ERROR-MESSAGE-IMPORT":"{{value}}",
"FLOWS:ERROR-MESSAGE-REMOVE-FLOW": "Remove flow error: {{value}}",
"FLOWS:FEATURED-VIDEO-TUTORIAL": "Featured Video tutorial",
"FLOWS:MY-FLOWS": "My Flows",
"FLOWS:NEW-INSTRUCTIONS": "We have got some new instructional videos you can check out that can help you",
"FLOWS:OPTION-DELETE": "Delete",
"FLOWS:OPTION-EXPORT": "Export",
"FLOWS:OPTION-RENAME": "Rename",
"FLOWS:RECENTLY-MODIFIED": "Recently Modified",
"FLOWS:SEARCH": "Filter",
"FLOWS:SUCCESS-MESSAGE-FLOW-CREATED": "Flow was created successfully!",

0 comments on commit 1b4905e

Please sign in to comment.