Merge branch 'master' into list-border-refactor

demos/component-docs/action-sheets/action-sheets.ts

@@ -0,0 +1 @@
+export * from './basic/pages';

demos/component-docs/action-sheets/basic/pages.ts

@@ -1,13 +1,13 @@
 import {Platform, Page, ActionSheet} from 'ionic/ionic';
 import {forwardRef} from 'angular2/angular2';
-import {AndroidAttribute} from '../helpers';
+import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'actionSheet/actionSheet.html',
+  templateUrl: 'action-sheets/basic/basic.html',
   directives: [forwardRef(() => AndroidAttribute)]
 
 })
-export class ActionSheetPage {
+export class BasicPage {
 
   constructor(actionSheet: ActionSheet, platform: Platform) {
     this.actionSheet = actionSheet;

demos/component-docs/buttons/basic/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/basic/basic.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BasicPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/block/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/block.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BlockPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/buttons.ts

@@ -1,103 +1,10 @@
-import {Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import {AndroidAttribute} from '../helpers';
-
-@Page({
-  templateUrl: 'buttons/buttons.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/block.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class BlockButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/clear.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ClearButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/full.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class FullButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/outline.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class OutlineButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/round.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class RoundButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/fab.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class FabPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/sizes.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ButtonSizesPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/icons.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class IconButtonsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'buttons/components.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ButtonsInComponentsPage {
-    constructor() {
-
-    }
-}
+export * from './basic/pages';
+export * from './block/pages';
+export * from './clear/pages';
+export * from './components/pages';
+export * from './fab/pages';
+export * from './full/pages';
+export * from './icons/pages';
+export * from './outline/pages';
+export * from './round/pages';
+export * from './sizes/pages';

demos/component-docs/buttons/clear/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/clear.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class ClearPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/components/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/components.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class ComponentsPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/fab/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/fab.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class FabPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/full/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/full.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class FullPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/icons/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/icons.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class IconsPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/outline/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/outline.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class OutlinePage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/round/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/round.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class RoundPage {
+    constructor() {
+
+    }
+}

demos/component-docs/buttons/sizes/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'buttons/sizes.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class SizesPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/advanced-map/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/advanced-map/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class AdvancedMapPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/advanced-social/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/advanced-social/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class AdvancedSocialPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/advanced-weather/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/advanced-weather/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class AdvancedWeatherPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/background/pages.ts

@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'cards/cards-background/main.html',
+  templateUrl: 'cards/background/template.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class BackgroundPage {

demos/component-docs/cards/basic/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/basic/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BasicPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/cards-background/main.html

@@ -1,36 +0,0 @@
-
-<ion-navbar *navbar hide-back-button class="show-navbar android-attr">
-  <ion-title>Background Images</ion-title>
-</ion-navbar>
-
-<ion-content class="has-header components-demo cards-bg">
-
-<ion-card class="advanced-background">
-  <img src="img/card-saopaolo.png"/>
-  <p class="advanced-background-title">São Paulo</p>
-  <p class="advanced-background-subtitle">41 Listings</p>
-</ion-card>
-
-<ion-card class="advanced-background">
-  <img src="img/card-amsterdam.png"/>
-  <p class="advanced-background-title">Amsterdam</p>
-  <p class="advanced-background-subtitle">64 Listings</p>
-</ion-card>
-
-<ion-card class="advanced-background">
-  <img src="img/card-sf.png"/>
-  <p class="advanced-background-title">San Francisco</p>
-  <p class="advanced-background-subtitle">72 Listings</p>
-</ion-card>
-
-<ion-card class="advanced-background">
-  <img src="img/card-madison.png"/>
-  <p class="advanced-background-title">Madison</p>
-  <p class="advanced-background-subtitle">28 Listings</p>
-</ion-card>
-
-</ion-content>
-
-
-
-

demos/component-docs/cards/cards.ts

@@ -1,76 +1,8 @@
-import {Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import {AndroidAttribute} from '../helpers';
-
-export * from './cards-background/pages';
-
-@Page({
-  templateUrl: 'cards/cards-basic.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class BasicPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'cards/cards-header.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class HeaderPage {
-    constructor() {
-
-    }
-}
-
-
-@Page({
-  templateUrl: 'cards/cards-list.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ListPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'cards/cards-image.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ImagePage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'cards/cards-advanced-social.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class AdvancedSocialPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'cards/cards-advanced-map.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class AdvancedMapPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'cards/cards-advanced-weather.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class AdvancedWeatherPage {
-    constructor() {
-
-    }
-}
+export * from './advanced-map/pages';
+export * from './advanced-social/pages';
+export * from './advanced-weather/pages';
+export * from './background/pages';
+export * from './basic/pages';
+export * from './header/pages';
+export * from './image/pages';
+export * from './list/pages';

demos/component-docs/cards/header/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/header/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class HeaderPage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/image/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/image/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class ImagePage {
+    constructor() {
+
+    }
+}

demos/component-docs/cards/list/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'cards/list/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class ListPage {
+    constructor() {
+
+    }
+}

demos/component-docs/forms/forms.ts

@@ -1,91 +0,0 @@
-import {FORM_DIRECTIVES, FormBuilder, forwardRef, Validators, Control, ControlGroup} from 'angular2/angular2';
-import {Page} from 'ionic/ionic';
-import {AndroidAttribute} from '../helpers';
-
-
-
-@Page({
-  templateUrl: 'forms/forms.html',
-  providers: [FormBuilder],
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class FormsPage {
-
-  constructor() {
-    this.form = new ControlGroup({
-      firstName: new Control("", Validators.required),
-      lastName: new Control("", Validators.required)
-    });
-  }
-
-  processForm(event) {
-    // TODO: display input in a popup
-    console.log(event);
-  }
-
-
-}
-
-@Page({
-  templateUrl: 'forms/fixed-inline.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class FixedInlinePage {
-    constructor() {
-
-    }
-}
-
-@Page({
-  templateUrl: 'forms/floating.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class FloatingPage {
-    constructor() {
-
-    }
-}
-
-
-@Page({
-  templateUrl: 'forms/inline.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class InlinePage {
-    constructor() {
-
-    }
-}
-
-
-@Page({
-  templateUrl: 'forms/inset.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class InsetPage {
-    constructor() {
-
-    }
-}
-
-
-@Page({
-  templateUrl: 'forms/placeholder.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class PlaceholderPage {
-    constructor() {
-
-    }
-}
-
-
-@Page({
-  templateUrl: 'forms/stacked.html',
-  directives: [forwardRef(() => AndroidAttribute)]
-})
-export class StackedPage {
-    constructor() {
-
-    }
-}

demos/component-docs/helpers.ts

@@ -1,56 +1,19 @@
 import {Directive, ElementRef, Renderer} from 'angular2/angular2';
 import {Platform, Navbar} from 'ionic/ionic';
 
-
-import {ActionSheetPage} from './actionSheet/actionSheet';
-
-import {ButtonsPage,
-        BlockButtonsPage,
-        ClearButtonsPage,
-        FullButtonsPage,
-        OutlineButtonsPage,
-        RoundButtonsPage,
-        FabPage,
-        ButtonSizesPage,
-        IconButtonsPage,
-        ButtonsInComponentsPage} from './buttons/buttons';
-
+import * as actionSheets from './action-sheets/action-sheets';
+import * as buttons from './buttons/buttons';
 import * as cards from './cards/cards';
-
-import {FormsPage,
-        FixedInlinePage,
-        FloatingPage,
-        InlinePage,
-        InsetPage,
-        PlaceholderPage,
-        StackedPage} from './forms/forms';
-        
-import {IconsPage} from './icons/icons';
-
-import {CheckboxPage,
-        RadioPage,
-        RangePage,
-        SelectPage,
-        SwitchPage} from './inputs/inputs';
-
-import {BasicListsPage,
-        AvatarListsPage,
-        IconListsPage,
-        BasicDividersPage,
-        BasicInsetListsPage,
-        ListHeadersPage,
-        MultilineListsPage,
-        ThumbnailListsPage} from './lists/lists';
-
-import {MenusPage} from './menus/menus';
-import {ModalsPage} from './modals/modals';
-import {NavigationPage} from './navigation/navigation';
-import {PopupsPage} from './popups/popups';
-import {SlidesPage} from './slides/slides';
-
-import {TabsPage} from './tabs/tabs';
-import {TabsIconPage} from './tabs/tabs-icon';
-import {TabsIconTextPage} from './tabs/tabs-icon-text';
+import * as labels from './labels/labels';
+import * as icons from './icons/icons';
+import * as inputs from './inputs/inputs';
+import * as lists from './lists/lists';
+import * as menus from './menus/menus';
+import * as modals from './modals/modals';
+import * as navigation from './navigation/navigation';
+import * as popups from './popups/popups';
+import * as slides from './slides/slides';
+import * as tabs from './tabs/tabs';
 
 
 @Directive({
@@ -105,17 +68,18 @@ export function hasScrollbar() {
 
 export function getPageFor(hash) {
     return {
-        'action-sheets': ActionSheetPage,
-        'buttons': ButtonsPage,
-        'block-buttons': BlockButtonsPage,
-        'clear-buttons': ClearButtonsPage,
-        'full-buttons': FullButtonsPage,
-        'outline-buttons': OutlineButtonsPage,
-        'round-buttons': RoundButtonsPage,
-        'floating-action-buttons': FabPage,
-        'buttons-in-components': ButtonsInComponentsPage,
-        'button-sizes': ButtonSizesPage,
-        'icon-buttons': IconButtonsPage,
+        'action-sheets': actionSheets.BasicPage,
+
+        'buttons': buttons.BasicPage,
+        'block-buttons': buttons.BlockPage,
+        'clear-buttons': buttons.ClearPage,
+        'full-buttons': buttons.FullPage,
+        'outline-buttons': buttons.OutlinePage,
+        'round-buttons': buttons.RoundPage,
+        'floating-action-buttons': buttons.FabPage,
+        'buttons-in-components': buttons.ComponentsPage,
+        'button-sizes': buttons.SizesPage,
+        'icon-buttons': buttons.IconsPage,
 
         'cards': cards.BasicPage,
         'card-header': cards.HeaderPage,
@@ -127,40 +91,40 @@ export function getPageFor(hash) {
         'card-advanced-social': cards.AdvancedSocialPage,
         'card-advanced-weather': cards.AdvancedWeatherPage,
 
-        'checkbox': CheckboxPage,
-        'radio': RadioPage,
-        'range': RangePage,
-        'select': SelectPage,
-        'switch': SwitchPage,
+        'checkbox': inputs.CheckboxPage,
+        'radio': inputs.RadioPage,
+        'range': inputs.RangePage,
+        'select': inputs.SelectPage,
+        'switch': inputs.SwitchPage,
 
-        'inputs': FormsPage,
-        'fixed-inline-labels': FixedInlinePage,
-        'floating-labels': FloatingPage,
-        'inline-labels': InlinePage,
-        'inset-labels': InsetPage,
-        'placeholder-labels': PlaceholderPage,
-        'stacked-labels': StackedPage,
+        'inputs': labels.BasicPage,
+        'fixed-inline-labels': labels.FixedInlinePage,
+        'floating-labels': labels.FloatingPage,
+        'inline-labels': labels.InlinePage,
+        'inset-labels': labels.InsetPage,
+        'placeholder-labels': labels.PlaceholderPage,
+        'stacked-labels': labels.StackedPage,
 
-        'icons': IconsPage,
+        'icons': icons.BasicPage,
 
-        'lists': BasicListsPage,
-        'avatar-list': AvatarListsPage,
-        'icon-list': IconListsPage,
-        'list-dividers': BasicDividersPage,
-        'inset-list': BasicInsetListsPage,
-        'list-headers': ListHeadersPage,
-        'multiline-list': MultilineListsPage,
-        'thumbnail-list': ThumbnailListsPage,
+        'lists': lists.BasicPage,
+        'avatar-list': lists.AvatarPage,
+        'icon-list': lists.IconPage,
+        'list-dividers': lists.LinesPage,
+        'inset-list': lists.InsetPage,
+        'list-headers': lists.HeadersPage,
+        'multiline-list': lists.MultilinePage,
+        'thumbnail-list': lists.ThumbnailPage,
 
-        'menus': MenusPage,
-        'modals': ModalsPage,
-        'navigation': NavigationPage,
-        'popups': PopupsPage,
-        'slides': SlidesPage,
+        'menus': menus.BasicPage,
+        'modals': modals.BasicPage,
+        'navigation': navigation.BasicPage,
+        'popups': popups.BasicPage,
+        'slides': slides.BasicPage,
 
-        'tabs': TabsPage,
-        'tabs-icon': TabsIconPage,
-        'tabs-icon-text': TabsIconTextPage,
+        'tabs': tabs.BasicPage,
+        'tabs-icon': tabs.IconPage,
+        'tabs-icon-text': tabs.IconTextPage,
     }[hash]
 }
 

demos/component-docs/icons/basic/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'icons/basic/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BasicPage {
+    constructor() {
+
+    }
+}

demos/component-docs/icons/icons.ts

@@ -1,13 +1 @@
-import {Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import {AndroidAttribute} from '../helpers';
-
-@Page({
-    templateUrl: 'icons/icons.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class IconsPage {
-    constructor() {
-
-    }
-}
+export * from './basic/pages';

demos/component-docs/index.ts

@@ -1,7 +1,7 @@
 import {App, IonicApp, Platform, ActionSheet} from 'ionic/ionic';
 import {Page, Config, Events} from 'ionic/ionic';
 import {PageOne, PageTwo, PageThree} from './menus/menus';
-import {ActionSheetPage} from './actionSheet/actionSheet';
+import * as actionSheets from './action-sheets/action-sheets';
 import * as helpers from './helpers';
 
 
@@ -14,7 +14,6 @@ class DemoApp {
   androidAttribute: any;
 
   constructor(app: IonicApp, platform: Platform) {
-    debugger;
     this.app = app;
     this.platform = platform;
     this.androidAttribute = helpers.AndroidAttribute;
@@ -33,7 +32,7 @@ class DemoApp {
             if (data.hash) {
               this.nextPage = helpers.getPageFor(data.hash.replace('#', ''));
             } else {
-              this.nextPage = ActionSheetPage;
+              this.nextPage = actionSheets.BasicPage;
             }
             let nav = this.app.getComponent('nav');
             nav.setRoot(this.nextPage);

demos/component-docs/inputs/checkbox/pages.ts

@@ -0,0 +1,12 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'inputs/checkbox/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class CheckboxPage{
+  constructor() {
+  }
+}

demos/component-docs/inputs/inputs.ts

@@ -1,48 +1,5 @@
-import {App, IonicApp, Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import * as helpers from '../helpers';
-
-@Page({
-  templateUrl: 'inputs/checkbox.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class CheckboxPage{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'inputs/radio.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class RadioPage{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'inputs/range.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class RangePage{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'inputs/select.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class SelectPage{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'inputs/switch.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class SwitchPage{
-  constructor() {
-  }
-}
+export * from './checkbox/pages';
+export * from './radio/pages';
+export * from './range/pages';
+export * from './select/pages';
+export * from './switch/pages';

demos/component-docs/inputs/radio/pages.ts

@@ -0,0 +1,12 @@
+import {App, IonicApp, Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import * as helpers from '../../helpers';
+
+@Page({
+    templateUrl: 'inputs/radio/template.html',
+    directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+export class RadioPage {
+    constructor() {
+    }
+}

demos/component-docs/inputs/range/pages.ts

@@ -0,0 +1,12 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'inputs/range/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class RangePage{
+  constructor() {
+  }
+}

demos/component-docs/inputs/select/pages.ts

@@ -0,0 +1,12 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'inputs/select/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class SelectPage{
+  constructor() {
+  }
+}

demos/component-docs/inputs/switch/pages.ts

@@ -0,0 +1,12 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'inputs/switch/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class SwitchPage{
+  constructor() {
+  }
+}

demos/component-docs/labels/basic/pages.ts

@@ -0,0 +1,24 @@
+import {FORM_DIRECTIVES, FormBuilder, forwardRef, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {Page} from 'ionic/ionic';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/basic/template.html',
+  providers: [FormBuilder],
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BasicPage {
+
+  constructor() {
+    this.form = new ControlGroup({
+      firstName: new Control("", Validators.required),
+      lastName: new Control("", Validators.required)
+    });
+  }
+
+  processForm(event) {
+    // TODO: display input in a popup
+    console.log(event);
+  }
+
+}

demos/component-docs/labels/fixed-inline/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/fixed-inline/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class FixedInlinePage {
+    constructor() {
+
+    }
+}

demos/component-docs/labels/floating/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/floating/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class FloatingPage {
+    constructor() {
+
+    }
+}

demos/component-docs/labels/inline/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/inline/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class InlinePage {
+    constructor() {
+
+    }
+}

demos/component-docs/labels/inset/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/inset/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class InsetPage {
+    constructor() {
+
+    }
+}

demos/component-docs/labels/labels.ts

@@ -0,0 +1,7 @@
+export * from './basic/pages';
+export * from './fixed-inline/pages';
+export * from './floating/pages';
+export * from './inline/pages';
+export * from './inset/pages';
+export * from './placeholder/pages';
+export * from './stacked/pages';

demos/component-docs/labels/placeholder/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/placeholder/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class PlaceholderPage {
+    constructor() {
+
+    }
+}

demos/component-docs/labels/stacked/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+  templateUrl: 'labels/stacked/template.html',
+  directives: [forwardRef(() => AndroidAttribute)]
+})
+export class StackedPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/avatar/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/avatar/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class AvatarPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/basic/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/basic/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BasicPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/headers/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/headers/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class HeadersPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/icon/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/icon/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class IconPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/inset/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/inset/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class InsetPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/lines/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/lines/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class LinesPage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/lists.ts

@@ -1,84 +1,8 @@
-import {Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import {AndroidAttribute} from '../helpers';
-
-
-@Page({
-    templateUrl: 'lists/basic-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class BasicListsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/dividers.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class BasicDividersPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/inset-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class BasicInsetListsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/list-headers.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ListHeadersPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/icon-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class IconListsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/avatar-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class AvatarListsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/multiline-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class MultilineListsPage {
-    constructor() {
-
-    }
-}
-
-@Page({
-    templateUrl: 'lists/thumbnail-lists.html',
-    directives: [forwardRef(() => AndroidAttribute)]
-})
-export class ThumbnailListsPage {
-    constructor() {
-
-    }
-}
+export * from './avatar/pages';
+export * from './basic/pages';
+export * from './headers/pages';
+export * from './icon/pages';
+export * from './inset/pages';
+export * from './lines/pages';
+export * from './multiline/pages';
+export * from './thumbnail/pages';

demos/component-docs/lists/multiline/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/multiline/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class MultilinePage {
+    constructor() {
+
+    }
+}

demos/component-docs/lists/thumbnail/pages.ts

@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+    templateUrl: 'lists/thumbnail/template.html',
+    directives: [forwardRef(() => AndroidAttribute)]
+})
+export class ThumbnailPage {
+    constructor() {
+
+    }
+}

demos/component-docs/menus/basic/pages.ts

@@ -0,0 +1,35 @@
+import {App, IonicApp, Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import * as helpers from '../../helpers';
+
+@Page({
+  templateUrl: 'menus/basic/menu-home.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+export class BasicPage{
+  constructor() {
+  }
+}
+
+@Page({
+  templateUrl: 'menus/basic/menu-home.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+export class PageOne{
+  constructor() {
+  }
+}
+
+@Page({
+  templateUrl: 'menus/basic/menu-friends.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+export class PageTwo{
+}
+
+@Page({
+  templateUrl: 'menus/basic/menu-events.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+export class PageThree{
+}

demos/component-docs/menus/menus.ts

@@ -1,35 +1 @@
-import {App, IonicApp, Page} from 'ionic/ionic';
-import {forwardRef} from 'angular2/angular2';
-import * as helpers from '../helpers';
-
-@Page({
-  templateUrl: 'menus/menu-home.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class MenusPage{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'menus/menu-home.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class PageOne{
-  constructor() {
-  }
-}
-
-@Page({
-  templateUrl: 'menus/menu-friends.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class PageTwo{
-}
-
-@Page({
-  templateUrl: 'menus/menu-events.html',
-  directives: [forwardRef(() => helpers.AndroidAttribute)]
-})
-export class PageThree{
-}
+export * from './basic/pages';

demos/component-docs/modals/basic/pages.ts

@@ -0,0 +1,63 @@
+import {App, IonicApp, Animation, Modal, NavController, Page, Events} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import * as helpers from '../../helpers';
+
+
+@Page({
+  templateUrl: 'modals/basic/template.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+})
+class ModalsFirstPage {
+
+  constructor(
+    nav: NavController,
+    modal: Modal,
+    events: Events
+  ) {
+    this.nav = nav;
+    this.modal = modal;
+  }
+
+  openModal() {
+    this.modal.open(ModalsContentPage);
+  }
+
+}
+
+@Page({
+  templateUrl: 'modals/basic/modals-content.html',
+  directives: [forwardRef(() => helpers.AndroidAttribute)]
+
+})
+class ModalsContentPage {
+
+  constructor(
+    modal: Modal,
+    events: Events
+  ) {
+    this.modal = modal;
+  }
+
+  closeModal() {
+    let modal = this.modal.get();
+    if (modal) {
+      modal.close();
+    }
+  }
+}
+
+@Page({
+  template: '<ion-nav [root]="rootView"></ion-nav>'
+})
+export class BasicPage {
+  constructor(modal: Modal) {
+    this.rootView = ModalsFirstPage;
+    this.modal = modal;
+  }
+  onPageWillLeave() {
+    let modal = this.modal.get();
+    if (modal) {
+      modal.close();
+    }
+  }
+}