upgrade angular

ionic/components/split-view/split-view.js

@@ -1,8 +1,8 @@
-import {Component, Parent, Decorator, Template, NgElement} from 'angular2/angular2'
-import {NavViewport} from 'ionic2/components/nav-viewport/nav-viewport'
-import {View} from 'ionic2/components/view/view'
-import {NavPane} from 'ionic2/components/nav-pane/nav-pane'
-import * as util from 'ionic2/util'
+import {Component, Parent, Decorator, View as NgView, NgElement} from 'angular2/angular2'
+import {NavViewport} from 'ionic/components/nav-viewport/nav-viewport'
+import {View} from 'ionic/components/view/view'
+import {NavPane} from 'ionic/components/nav-pane/nav-pane'
+import * as util from 'ionic/util'
 
 // TODO consider more explicit API, a la tabs
 
@@ -29,8 +29,8 @@ class SplitViewportDecorator {
     navTitle: 'navTitle'
   },
 })
-@Template({
-  inline: `
+@NgView({
+  template: `
   <ion-view [nav-title]="navTitle" class="split-view">
     <div class="pane-container">
       <content></content>

ionic/components/split-view/test/settings/groups/general.js

@@ -1,11 +1,11 @@
-import {Component, Template} from 'angular2/angular2'
-import {View} from 'ionic2/ionic2'
+import {Component, View} from 'angular2/angular2'
+import {View} from 'ionic/components'
 
 @Component({
   selector: 'settings-general'
 })
-@Template({
-  inline: `
+@View({
+  template: `
 <ion-view nav-title="General Stuff">
   General Settings
 </ion-view>

ionic/components/split-view/test/settings/groups/privacy.js

@@ -1,9 +1,9 @@
-import {Component, Template} from 'angular2/angular2'
-import {View, NavPane} from 'ionic2/ionic2'
+import {Component, View} from 'angular2/angular2'
+import {View, NavPane} from 'ionic/components'
 
 @Component({ selector: 'privacy-settings' })
-@Template({
-  inline: `
+@View({
+  template: `
 <ion-view nav-title="Privacy">
   Privacy
 <button class="button button-primary" (click)="next()">
@@ -22,8 +22,8 @@ export class PrivacyPage {
 }
 
 @Component({ selector: 'privp1' })
-@Template({
-  inline: `
+@View({
+  template: `
 <ion-view nav-title="Privacy Page 1">
 This is page 1
 <br/>
@@ -51,8 +51,8 @@ class PrivacyP1 {
 }
 
 @Component({ selector: 'privp2' })
-@Template({
-  inline: `
+@View({
+  template: `
 <ion-view nav-title="Privacy Page 2">
 Page 2 here
 <br/>