Merge branch 'master' of https://github.com/akveo/ng2-admin into dev-tree-view

src/app/pages/components/components/treeView/treeView.component.ts

@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {BranchyComponent, TreeModel} from 'ng2-branchy';
-import {BaCard} from "../../../../theme/components/baCard/baCard.component";
+import {BaCard} from '../../../../theme/components/baCard';
 
 @Component({
   selector: 'tree-view',

src/app/pages/forms/components/inputs/components/ratinginputs/index.ts

@@ -0,0 +1 @@
+export * from './ratinginputs.component';

src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts

@@ -0,0 +1,20 @@
+import { RatingComponent } from 'ng2-bootstrap/ng2-bootstrap';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'rating-inputs',
+  directives: [RatingComponent],
+  template: require('./ratinginputs.html')
+})
+
+export class Rating {
+  private _rate1:number = 3;
+  private _rate2:number = 4;
+
+  private _max1:number = 5;
+  private _max2:number = 10;
+
+  constructor() {
+  }
+
+}

src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.html

@@ -0,0 +1,9 @@
+<div class="col-md-4">
+  <rating [(ngModel)]="_rate1" max="{{_max1}}" stateOn="ion-android-star" stateOff="ion-android-star-outline" class="rating"></rating>
+  <span class="help-block">Rate: {{_rate1}}</span>
+</div>
+
+<div class="col-md-8">
+  <rating [(ngModel)]="_rate2" max="{{_max2}}" stateOn="ion-ios-heart" stateOff="ion-ios-heart-outline" class="rating"></rating>
+  <span class="help-block">Rate: {{_rate2}}</span>
+</div>

src/app/pages/forms/components/inputs/inputs.component.ts

@@ -6,11 +6,13 @@ import {StandardInputs} from './components/standardInputs';
 import {ValidationInputs} from './components/validationInputs';
 import {GroupInputs} from './components/groupInputs';
 import {CheckboxInputs} from './components/checkboxInputs';
+import {Rating} from './components/ratinginputs';
+
 
 @Component({
   selector: 'inputs',
   encapsulation: ViewEncapsulation.None,
-  directives: [BaCard, StandardInputs, ValidationInputs, GroupInputs, CheckboxInputs],
+  directives: [BaCard, StandardInputs, ValidationInputs, GroupInputs, CheckboxInputs, Rating],
   template: require('./inputs.html'),
 })
 export class Inputs {

src/app/pages/forms/components/inputs/inputs.html

@@ -19,6 +19,10 @@
       <ba-card title="Checkboxes & Radios" baCardClass="with-scroll">
         <checkbox-inputs></checkbox-inputs>
       </ba-card>
+
+      <ba-card title="Rating" baCardClass="with-scroll">
+        <rating-inputs></rating-inputs>
+      </ba-card>
     </div>
   </div>
 

src/app/pages/forms/components/layouts/layouts.component.ts

@@ -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() {
   }
 

src/app/pages/forms/components/layouts/layouts.html

@@ -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>