Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-27 03:36:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/uploader'

Browse source 
Conflicts:
	package.json
This commit is contained in:
nixa 2016-07-01 15:30:32 +03:00
commit e72467a00d
8 changed files with 240 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app/pages/forms/components/layouts/layouts.component.ts
View file

@ -7,16 +7,25 @@ import {BlockForm} from './components/blockForm';
import {HorizontalForm} from './components/horizontalForm';
import {BasicForm} from './components/basicForm';
import {WithoutLabelsForm} from './components/withoutLabelsForm';
import {BaPictureUploader} from '../../../../theme/components';
@Component({
selector: 'layouts',
encapsulation: ViewEncapsulation.None,
directives: [BaCard, InlineForm, BlockForm, HorizontalForm, BasicForm, WithoutLabelsForm],
directives: [BaCard, InlineForm, BlockForm, HorizontalForm, BasicForm, WithoutLabelsForm, BaPictureUploader],
styles: [],
template: require('./layouts.html'),
})
export class Layouts {
public defaultPicture = 'assets/img/theme/no-photo.png';
public profile:any = {
picture: 'assets/img/app/profile/Nasta.png'
};
public uploaderOptions:any = {
// url: 'http://website.com/upload'
};
constructor() {
}

7
src/app/pages/forms/components/layouts/layouts.html
View file

@ -35,4 +35,11 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<ba-card title="Picture Uploader" baCardClass="with-scroll">
<ba-picture-uploader [picture]="profile.picture" [defaultPicture]="defaultPicture" [uploaderOptions]="uploaderOptions"></ba-picture-uploader>
</ba-card>
</div>
</div>
</div>