From c5be799810d33c1bedffb37d183704b5ee5ad595 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 11:58:50 -0500
Subject: [PATCH 01/20] feat(nav): popTo and popToRoot

---
 ionic/components/nav/nav-controller.ts | 55 ++++++++++++++++++++++++++
 ionic/components/tabs/tabs.ts          | 19 +++++++++
 2 files changed, 74 insertions(+)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 83a88b6a3a..16254f9826 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -180,6 +180,61 @@ export class NavController extends Ion {
     this.views.splice(index, 0, viewCtrl);
   }
 
+  /**
+   * Pop to a specific view in the history stack
+   *
+   * @param view {Component} to pop to
+   * @param opts {object} pop options
+   */
+  popTo(view, opts = {}) {
+
+    // Get the target index of the view to pop to
+    let viewIndex = this.views.indexOf(view);
+    let targetIndex = viewIndex + 1;
+    let resolve;
+    let promise = new Promise(res => { resolve = res; });
+    // Don't pop to the view if it wasn't found, or the target is beyond the view list
+    if(viewIndex < 0 || targetIndex > this.views.length - 1) {
+      resolve();
+      return;
+    }
+
+
+    opts.direction = opts.direction || 'back';
+
+    // get the views to auto remove without having to do a transiton for each
+    // the last view (the currently active one) will do a normal transition out
+    if (this.views.length > 1) {
+      let autoRemoveItems = this.views.slice(targetIndex, this.views.length);
+      for (let i = 0; i < autoRemoveItems.length; i++) {
+        autoRemoveItems[i].shouldDestroy = true;
+        autoRemoveItems[i].shouldCache = false;
+        autoRemoveItems[i].willUnload();
+      }
+    }
+
+    let leavingView = this.views[this.views.length - 1];
+    let enteringView = view;
+
+    if(this.router) {
+      this.router.stateChange('pop', enteringView);
+    }
+
+    this.transition(enteringView, leavingView, opts, () => {
+      resolve();
+    });
+
+    return promise;
+  }
+
+  /**
+   * Pop to the root view.
+   * @param opts extra animation options
+   */
+  popToRoot(opts = {}) {
+    this.popTo(this.views[0]);
+  }
+
   /**
    * Set the view stack to reflect the given component classes.
    * @param {TODO} components  TODO
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index a2ed163e71..58b6255efb 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -126,6 +126,12 @@ export class Tabs extends NavController {
       enteringView = this.getByInstance(tab)
     }
 
+    // If we select the same tab as the active one, do some magic.
+    if(enteringView === this.getActive()) {
+      this._touchActive(tab);
+      return;
+    }
+
     if (!enteringView || !enteringView.instance || !this.app.isEnabled()) {
       return Promise.reject();
     }
@@ -149,6 +155,19 @@ export class Tabs extends NavController {
     });
   }
 
+  /**
+   * "Touch" the active tab, either going back to the root view of the tab
+   * or scrolling the tab to the top
+   */
+  _touchActive(tab) {
+    let stateLen = tab.length();
+
+    if(stateLen > 1) {
+      // Pop to the root view
+      tab.popToRoot();
+    }
+  }
+
   get tabs() {
     return this.instances();
   }

From c1959cfef39afc58ccd67ef74530c56eac185dbb Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Wed, 30 Sep 2015 12:49:31 -0500
Subject: [PATCH 02/20] chore(demos): add docs demo build task

---
 gulpfile.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gulpfile.js b/gulpfile.js
index bb764afb95..44f2681433 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -386,6 +386,12 @@ gulp.task('demos', function(){
   }
 })
 
+gulp.task('copy.docs-demo', function () {
+  return gulp
+    .src('dist/demos/component-docs/*')
+    .pipe(gulp.dest('dist/ionic-site/docs/v2/components/demo/'))
+})
+
 gulp.task('publish', function(done) {
   var version = flags.version;
   var ngVersion = flags.ngVersion;

From 3042e7e9d095a234d7b070a7086e8d6c64d21d95 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Wed, 30 Sep 2015 14:01:53 -0500
Subject: [PATCH 03/20] chore(demos): add local app.css to each demo

---
 demos/component-docs/app.css      |  7 +++++
 demos/component-docs/index.ts     | 49 +++++++++++++++++++++++++++++++
 demos/component-docs/main.html    | 49 +++++++++++++++++++++++++++++++
 gulpfile.js                       |  1 +
 scripts/demos/index.template.html |  2 ++
 5 files changed, 108 insertions(+)
 create mode 100644 demos/component-docs/app.css
 create mode 100644 demos/component-docs/index.ts
 create mode 100644 demos/component-docs/main.html

diff --git a/demos/component-docs/app.css b/demos/component-docs/app.css
new file mode 100644
index 0000000000..08f2652abd
--- /dev/null
+++ b/demos/component-docs/app.css
@@ -0,0 +1,7 @@
+body {
+  cursor: url('http://ionicframework.com/img/finger.png'), auto;
+}
+
+section.hidden {
+  display: none !important;
+}
diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts
new file mode 100644
index 0000000000..ec8ee55d69
--- /dev/null
+++ b/demos/component-docs/index.ts
@@ -0,0 +1,49 @@
+import {App, ActionSheet} from 'ionic/ionic';
+
+function toTitleCase(str) {
+  return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+}
+
+@App({
+  templateUrl: 'main.html'
+})
+class DemoApp {
+
+  constructor(actionSheet: ActionSheet) {
+    this.actionSheet = actionSheet;
+    this.component = {
+      title: 'Action Sheet',
+    }
+    window.onmessage = (e) => {
+        this.component.title = toTitleCase(e.data.replace('-', ' '));
+    };
+  }
+
+  openMenu() {
+    this.actionSheet.open({
+      buttons: [
+        { text: 'Share This' },
+        { text: 'Move' }
+      ],
+      destructiveText: 'Delete',
+      titleText: 'Modify your album',
+      cancelText: 'Cancel',
+      cancel: function() {
+        console.log('Canceled');
+      },
+      destructiveButtonClicked: () => {
+        console.log('Destructive clicked');
+      },
+      buttonClicked: function(index) {
+        console.log('Button clicked', index);
+        if(index == 1) { return false; }
+        return true;
+      }
+
+    }).then(actionSheetRef => {
+      this.actionSheetRef = actionSheetRef;
+    });
+  }
+
+
+}
\ No newline at end of file
diff --git a/demos/component-docs/main.html b/demos/component-docs/main.html
new file mode 100644
index 0000000000..f364a7fa34
--- /dev/null
+++ b/demos/component-docs/main.html
@@ -0,0 +1,49 @@
+
+<ion-toolbar><ion-title>{{ component.title }}</ion-title></ion-toolbar>
+
+<ion-content class="has-header padding components-demo">
+
+
+  <section id="action-sheet" [ng-class]="{hidden: component.title !== 'Action Sheet' }">
+    <button class="button" (click)="openMenu()">
+      Show Actionsheet
+    </button>
+  </section>
+
+  <section id="animation" [ng-class]="{hidden: component.title !== 'Animations' }">
+   TODO
+  </section>
+
+  <section id="buttons" [ng-class]="{hidden: component.title !== 'Buttons' }">
+   TODO
+  </section>
+
+   <section id="cards" [ng-class]="{hidden: component.title !== 'Cards' }">
+   TODO
+  </section>
+   
+    <section id="icons" [ng-class]="{hidden: component.title !== 'Icons' }">
+   TODO
+  </section>
+
+     <section id="lists" [ng-class]="{hidden: component.title !== 'Lists' }">
+   TODO
+  </section>
+    <section id="menus" [ng-class]="{hidden:component.title !== 'Menus' }">
+   TODO
+  </section>
+    <section id="modals" [ng-class]="{hidden: component.title !== 'Modals' }">
+   TODO
+  </section>
+    <section id="navigation" [ng-class]="{hidden: component.title !== 'Navigation' }">
+   TODO
+  </section>
+    <section id="slides" [ng-class]="{hidden: component.title !== 'Slides' }">
+   TODO
+  </section>
+
+    <section id="tabs" [ng-class]="{hidden: component.title !== 'Tabs' }">
+   TODO
+  </section>
+
+</ion-content>
diff --git a/gulpfile.js b/gulpfile.js
index 44f2681433..b1f5aff1d6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -58,6 +58,7 @@ gulp.task('build', function(done) {
     'bundle',
     'e2e',
     'demos',
+    'copy.docs-demo',
     'sass',
     'fonts',
     done
diff --git a/scripts/demos/index.template.html b/scripts/demos/index.template.html
index 6c5ec2649d..bc1240c66d 100644
--- a/scripts/demos/index.template.html
+++ b/scripts/demos/index.template.html
@@ -6,6 +6,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
   <link href="../../css/ionic.css" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="app.css">
+
 </head>
 <body>
 

From 3d36cc6e070a9b38497f0cb07e3f00818d33a7e1 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 30 Sep 2015 15:05:35 -0400
Subject: [PATCH 04/20] Styling some of the popups more - mostly MD mode.
 References #183

---
 ionic/components/popup/modes/ios.scss      |  4 --
 ionic/components/popup/modes/md.scss       | 50 +++++++++++++++-------
 ionic/components/popup/popup.scss          | 18 +++++---
 ionic/components/popup/popup.ts            | 24 ++++++-----
 ionic/components/popup/test/basic/index.ts | 21 +++++++--
 5 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/ionic/components/popup/modes/ios.scss b/ionic/components/popup/modes/ios.scss
index 0fd507d0e1..d54f63bd7c 100644
--- a/ionic/components/popup/modes/ios.scss
+++ b/ionic/components/popup/modes/ios.scss
@@ -39,10 +39,6 @@ ion-popup {
   color: $popup-ios-body-text-color;
 }
 
-.popup-body:empty {
-  padding: 0;
-}
-
 .popup-buttons {
   padding: 0;
   min-height: 0;
diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index 3b3a20846d..b895681f45 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -2,18 +2,20 @@
 // Material Design Popups
 // --------------------------------------------------
 
-$popup-md-max-width:           280px !default;
-$popup-md-background:          rgba(0,0,0,0.5) !default;
-$popup-md-border-radius:       2px !default;
-$popup-md-background-color:    #fafafa !default;
-$popup-md-box-shadow:          0px 16px 20px rgba(0, 0, 0, 0.4) !default;
+$popup-md-max-width:                      280px !default;
+$popup-md-background:                     rgba(0,0,0,0.5) !default;
+$popup-md-border-radius:                  2px !default;
+$popup-md-background-color:               #fafafa !default;
+$popup-md-box-shadow:                     0px 16px 20px rgba(0, 0, 0, 0.4) !default;
 
-$popup-md-head-text-align:     left !default;
-$popup-md-title-font-size:     20px !default;
-$popup-md-body-text-color:     rgba(0,0,0,.5) !default;
+$popup-md-head-text-align:                left !default;
+$popup-md-title-font-size:                20px !default;
+$popup-md-body-text-color:                rgba(0,0,0,.5) !default;
 
-$popup-md-button-text-color:   color(primary) !default;
-$popup-md-button-min-height:   36px !default;
+$popup-md-button-text-color:              color(primary) !default;
+$popup-md-button-min-height:              36px !default;
+$popup-md-prompt-input-highlight-color:   map-get($colors, primary) !default;
+$popup-md-prompt-input-placeholder-color: #b9b9b9;
 
 
 ion-popup {
@@ -42,8 +44,28 @@ ion-popup {
   color: $popup-md-body-text-color;
 }
 
-.popup-body:empty {
-  padding: 0;
+.prompt-input {
+  border-bottom: 1px solid #dedede;
+
+  &::-webkit-input-placeholder {
+     color: $popup-md-prompt-input-placeholder-color;
+  }
+
+  &:-moz-placeholder { /* Firefox 18- */
+     color: $popup-md-prompt-input-placeholder-color;
+  }
+
+  &::-moz-placeholder {  /* Firefox 19+ */
+     color: $popup-md-prompt-input-placeholder-color;
+  }
+
+  &:-ms-input-placeholder {
+     color: $popup-md-prompt-input-placeholder-color;
+  }
+
+  &:focus {
+    border-bottom: 2px solid $popup-md-prompt-input-highlight-color;
+  }
 }
 
 .popup-buttons {
@@ -63,9 +85,5 @@ ion-popup {
     box-shadow: none;
     -webkit-transition: none;
     transition: none;
-
-    &:last-child {
-      margin-right: 0;
-    }
   }
 }
diff --git a/ionic/components/popup/popup.scss b/ionic/components/popup/popup.scss
index 971dbaee28..c37c221f31 100644
--- a/ionic/components/popup/popup.scss
+++ b/ionic/components/popup/popup.scss
@@ -6,7 +6,7 @@ $popup-min-width:                 250px !default;
 $popup-max-width:                 100% !default;
 $popup-max-height:                90% !default;
 
-$popup-sub-title-font-size:       11px !default;
+$popup-sub-title-font-size:       15px !default;
 
 $popup-button-line-height:        20px !default;
 $popup-button-font-size:          14px !default;
@@ -59,6 +59,18 @@ ion-popup {
 
 .popup-body {
   overflow: auto;
+
+  // TODO is this needed?
+  &:empty {
+    padding: 0;
+  }
+}
+
+.prompt-input {
+  border: 0;
+  background: inherit;
+  padding: 10px 0;
+  margin: 5px 0;
 }
 
 .popup-buttons {
@@ -72,9 +84,5 @@ ion-popup {
     line-height: $popup-button-line-height;
     font-size: $popup-button-font-size;
     margin-right: $popup-button-margin-right;
-
-    &:last-child {
-      margin-right: 0;
-    }
   }
 }
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index ebcea5fa56..99c8ebd875 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -3,6 +3,8 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup,
 
 import {Overlay} from '../overlay/overlay';
 import {Animation} from '../../animations/animation';
+import {Ion} from '../ion';
+import {IonInput} from '../form/input';
 import * as util from 'ionic/util';
 
 
@@ -81,7 +83,7 @@ export class Popup extends Overlay {
       };
     }
     let button = {
-      text: 'OK',
+      text: context.okText || 'OK',
       onTap: (event, popupRef) => {
         // Allow it to close
         //resolve();
@@ -112,13 +114,13 @@ export class Popup extends Overlay {
       }
     }
     let okButton = {
-      text: 'OK',
+      text: context.okText || 'OK',
       onTap: (event, popupRef) => {
         // Allow it to close
       }
     }
     let cancelButton = {
-      text: 'Cancel',
+      text: context.cancelText || 'Cancel',
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -146,16 +148,17 @@ export class Popup extends Overlay {
         title: context
       };
     }
-
     let okButton = {
-      text: 'Ok',
+      text: context.okText || 'OK',
+      type: context.okType,
       onTap: (event, popupRef) => {
         // Allow it to close
       }
     }
 
     let cancelButton = {
-      text: 'Cancel',
+      text: context.cancelText || 'Cancel',
+      type: context.cancelType,
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -201,14 +204,15 @@ const OVERLAY_TYPE = 'popup';
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
   '<popup-wrapper>' +
     '<div class="popup-head">' +
-      '<h3 class="popup-title" [inner-html]="title"></h3>' +
-      '<h5 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h5>' +
+      '<h2 class="popup-title" [inner-html]="title" *ng-if="title"></h2>' +
+      '<h3 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h3>' +
     '</div>' +
     '<div class="popup-body">' +
-      '<input type="text" *ng-if="showPrompt" placeholder="{{promptPlaceholder}}">' +
+      '<div [inner-html]="template" *ng-if="template"></div>' +
+      '<input type="{{inputType || \'text\'}}" placeholder="{{inputPlaceholder}}" *ng-if="showPrompt" class="prompt-input">' +
     '</div>' +
     '<div class="popup-buttons" *ng-if="buttons.length">' +
-      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [ng-class]="button.type || \'button-default\'" [inner-html]="button.text"></button>' +
+      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [inner-html]="button.text"></button>' +
     '</div>' +
   '</popup-wrapper>',
   directives: [FORM_DIRECTIVES, NgClass, NgIf, NgFor]
diff --git a/ionic/components/popup/test/basic/index.ts b/ionic/components/popup/test/basic/index.ts
index c5b29fc893..3d2484f43e 100644
--- a/ionic/components/popup/test/basic/index.ts
+++ b/ionic/components/popup/test/basic/index.ts
@@ -17,14 +17,23 @@ class E2EApp {
 
   doAlert() {
     this.alertOpen = true;
-    this.popup.alert('Alert').then(() => {
+    this.popup.alert({
+      title: "New Friend!",
+      template: "Your friend, Obi wan Kenobi, just accepted your friend request!"
+    }).then(() => {
       this.alertOpen = false;
     });
   }
 
   doPrompt() {
     this.promptOpen = true;
-    this.popup.prompt('What is your name?').then((name) => {
+    this.popup.prompt({
+      title: "New Album",
+      template: "Enter a name for this new album you're so keen on adding",
+      inputPlaceholder: "Title",
+      okText: "Save",
+      okType: "secondary"
+    }).then((name) => {
       this.promptResult = name;
       this.promptOpen = false;
     }, () => {
@@ -35,7 +44,13 @@ class E2EApp {
 
   doConfirm() {
     this.confirmOpen = true;
-    this.popup.confirm('Are you sure?').then((result, ev) => {
+    this.popup.confirm({
+      title: "Use this lightsaber?",
+      subTitle: "You can't exchange lightsabers",
+      template: "Do you agree to use this lightsaber to do good across the intergalactic galaxy?",
+      cancelText: "Disagree",
+      okText: "Agree"
+    }).then((result, ev) => {
       console.log('CONFIRMED', result);
       this.confirmResult = result;
       this.confirmOpen = false;

From 89f131b2dec28af00b315f80f8b26fe239dd06db Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 13:35:12 -0500
Subject: [PATCH 05/20] Scroll to top

---
 ionic/components/content/content.ts     | 20 ++++++++++++++++++--
 ionic/components/nav/view-controller.ts |  8 ++++++++
 ionic/components/tabs/tab.ts            |  7 +++++--
 ionic/components/tabs/tabs.ts           |  9 +++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/ionic/components/content/content.ts b/ionic/components/content/content.ts
index 96ebaed27e..a9ba0d6b34 100644
--- a/ionic/components/content/content.ts
+++ b/ionic/components/content/content.ts
@@ -1,9 +1,11 @@
-import {Component, View, ElementRef} from 'angular2/angular2';
+import {Component, View, ElementRef, Optional, Host} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';
 import {IonicPlatform} from '../../platform/platform';
 import {IonicComponent} from '../../config/decorators';
+import {ViewController} from '../nav/view-controller';
+import {Tab} from '../tabs/tab';
 import {ScrollTo} from '../../animations/scroll-to';
 
 
@@ -38,10 +40,14 @@ export class Content extends Ion {
    * @param {ElementRef} elementRef  A reference to the component's DOM element.
    * @param {IonicConfig} config  The config object to change content's default settings.
    */
-  constructor(elementRef: ElementRef, config: IonicConfig, platform: IonicPlatform) {
+  constructor(elementRef: ElementRef, config: IonicConfig, platform: IonicPlatform, @Optional() viewCtrl: ViewController) {
     super(elementRef, config);
     this.scrollPadding = 0;
     this.platform = platform;
+
+    if(viewCtrl) {
+      viewCtrl.setContent(this);
+    }
   }
 
   /**
@@ -107,6 +113,16 @@ export class Content extends Ion {
     return this._scrollTo.start(x, y, duration, tolerance);
   }
 
+  scrollToTop() {
+    if (this._scrollTo) {
+      this._scrollTo.dispose();
+    }
+
+    this._scrollTo = new ScrollTo(this.scrollElement);
+
+    return this._scrollTo.start(0, 0, 300, 0);
+  }
+
   /**
    * Returns the content and scroll elements' dimensions.
    * @returns {Object} dimensions  The content and scroll elements' dimensions
diff --git a/ionic/components/nav/view-controller.ts b/ionic/components/nav/view-controller.ts
index ea13d2cd2d..9842cd61b7 100644
--- a/ionic/components/nav/view-controller.ts
+++ b/ionic/components/nav/view-controller.ts
@@ -23,6 +23,14 @@ export class ViewController {
     this.templateRefs = {};
   }
 
+  setContent(content) {
+    this._content = content;
+  }
+
+  getContent() {
+    return this._content;
+  }
+
   /**
    * TODO
    * @param {TODO} name  TODO
diff --git a/ionic/components/tabs/tab.ts b/ionic/components/tabs/tab.ts
index 22b29d168d..4cdd9f2db9 100644
--- a/ionic/components/tabs/tab.ts
+++ b/ionic/components/tabs/tab.ts
@@ -1,8 +1,10 @@
-import {Directive, Component, View, Host, ElementRef, forwardRef, Injector, NgZone} from 'angular2/angular2';
+import {Directive, Component, View, Host, ElementRef, forwardRef,
+  Injector, NgZone, Query, ViewQuery, QueryList} from 'angular2/angular2';
 
 import {NavController} from '../nav/nav-controller';
 import {ViewController} from '../nav/view-controller';
 import {Tabs} from './tabs';
+import {Content} from '../content/content';
 
 
 /**
@@ -47,7 +49,7 @@ export class Tab extends NavController {
     @Host() tabs: Tabs,
     elementRef: ElementRef,
     injector: Injector,
-    zone: NgZone
+    zone: NgZone,
   ) {
     // A Tab is both a container of many views, and is a view itself.
     // A Tab is one ViewController within it's Host Tabs (which extends NavController)
@@ -141,6 +143,7 @@ class TabPaneAnchor {
   * @param {ElementRef} elementRef  TODO
   */
   constructor(@Host() tab: Tab, elementRef: ElementRef) {
+
     tab.anchorElementRef(elementRef);
   }
 }
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index 58b6255efb..720128a4b7 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -166,6 +166,15 @@ export class Tabs extends NavController {
       // Pop to the root view
       tab.popToRoot();
     }
+    /*
+     TODO: Uncomment to enable root scroll to top
+     else {
+      let content = tab.views[0] && tab.views[0].getContent();
+      if(content) {
+        content.scrollToTop();
+      }
+    }
+    */
   }
 
   get tabs() {

From b66fc45a20bc849e3a8217876a9f9746190572ce Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 15:57:05 -0500
Subject: [PATCH 06/20] chore(logs): removed bad console error

---
 ionic/components/app/app.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts
index b1869f1696..c4164b4201 100644
--- a/ionic/components/app/app.ts
+++ b/ionic/components/app/app.ts
@@ -65,6 +65,11 @@ export class IonicApp {
     window.addEventListener('orientationchange', (event) => {
       events.publish('app:rotated', event);
     });
+
+    window.addEventListener('statusTap', (event) => {
+      alert('Status tap!');
+      console.log(event);
+    })
   }
 
   /**
@@ -176,7 +181,7 @@ export class IonicApp {
    */
   register(id, component) {
     if (this.components[id] && this.components[id] !== component) {
-      console.error('Component id "' + id + '" already registered.');
+      //console.error('Component id "' + id + '" already registered.');
     }
     this.components[id] = component;
   }

From 8ef7a67f553c4399d3d3db79e926f1f9081881c4 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 16:59:31 -0500
Subject: [PATCH 07/20] Removed alert

---
 ionic/components/app/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts
index c4164b4201..5a7614c3a4 100644
--- a/ionic/components/app/app.ts
+++ b/ionic/components/app/app.ts
@@ -67,8 +67,8 @@ export class IonicApp {
     });
 
     window.addEventListener('statusTap', (event) => {
-      alert('Status tap!');
-      console.log(event);
+      //alert('Status tap!');
+      //console.log(event);
     })
   }
 

From 873ea742eb41669266189a16b36b1bac97256446 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 16:59:40 -0500
Subject: [PATCH 08/20] Fixed bad check bug

---
 ionic/platform/plugin.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ionic/platform/plugin.ts b/ionic/platform/plugin.ts
index 49f4e5e6a5..c0b3ff6c48 100644
--- a/ionic/platform/plugin.ts
+++ b/ionic/platform/plugin.ts
@@ -5,9 +5,12 @@ export class NativePluginDecorator {
 
     cls.ifPlugin = (cb, returnType=null) => {
       // Convert to boolean the plugin param
-      var exists = !!check;
+      var exists;
       if(typeof this.config.pluginCheck === 'function') {
         exists = this.config.pluginCheck();
+      } else {
+        console.error('Plugin "' + this.config.name + '" is missing a pluginCheck() function for plugin verification. Please add one."');
+        return false;
       }
       if(exists) {
         return cb();
@@ -20,7 +23,7 @@ export class NativePluginDecorator {
       if(returnType) {
         return (typeof returnType === 'function') ? returnType() : returnType;
       }
-      
+
       return false;
     };
 

From bb74cdc71742424982315402f2c7c45e92bb2649 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 17:26:16 -0500
Subject: [PATCH 09/20] feat(scroll): statusbar tap scroll to top

---
 ionic/components/app/app.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts
index 5a7614c3a4..d4c4afa24f 100644
--- a/ionic/components/app/app.ts
+++ b/ionic/components/app/app.ts
@@ -4,6 +4,7 @@ import {ROUTER_BINDINGS, HashLocationStrategy, LocationStrategy, Router} from 'a
 import {IonicConfig} from '../../config/config';
 import {IonicPlatform, Platform} from '../../platform/platform';
 import {ClickBlock} from '../../util/click-block';
+import {ScrollTo} from '../../animations/scroll-to';
 import * as dom from '../../util/dom';
 
 // injectables
@@ -53,7 +54,7 @@ export class IonicApp {
   /**
    * Bind some global events and publish on the 'app' channel
    */
-  bindEvents(events) {
+  bindEvents(platform, events) {
     window.addEventListener('online', (event) => {
       events.publish('app:online', event);
     }, false);
@@ -66,10 +67,18 @@ export class IonicApp {
       events.publish('app:rotated', event);
     });
 
+    // When that status taps, we respond
     window.addEventListener('statusTap', (event) => {
-      //alert('Status tap!');
-      //console.log(event);
-    })
+      // TODO: Make this more better
+      var el = document.elementFromPoint(platform.width() / 2, platform.height() / 2);
+      if(!el) { return; }
+
+      var content = dom.closest(el, 'scroll-content');
+      if(content) {
+        var scrollTo = new ScrollTo(content);
+        scrollTo.start(0, 0, 300, 0);
+      }
+    });
   }
 
   /**
@@ -77,6 +86,7 @@ export class IonicApp {
    * @param {Object} appRef  TODO
    */
   load(appRef) {
+    console.log('App ref', appRef);
     this.ref(appRef);
     this._zone = appRef.injector.get(NgZone);
   }
@@ -324,7 +334,7 @@ export function ionicBootstrap(rootComponentType, views, config) {
       let translate = new Translate();
       let navRegistry = new NavRegistry(views);
 
-      app.bindEvents(events);
+      app.bindEvents(platform, events);
 
       // add injectables that will be available to all child components
       let appBindings = Injector.resolve([

From 2f446f182f43c98c13f7590da1282a97581cbabe Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 17:29:45 -0500
Subject: [PATCH 10/20] :derp: console.log

---
 ionic/components/app/app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts
index d4c4afa24f..90a30a0772 100644
--- a/ionic/components/app/app.ts
+++ b/ionic/components/app/app.ts
@@ -86,7 +86,6 @@ export class IonicApp {
    * @param {Object} appRef  TODO
    */
   load(appRef) {
-    console.log('App ref', appRef);
     this.ref(appRef);
     this._zone = appRef.injector.get(NgZone);
   }

From 3a0a6b6ee7597bc9b41f131786dbdf19cf2754cd Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 30 Sep 2015 18:31:47 -0500
Subject: [PATCH 11/20] Removed right menu in basic test. #226

---
 ionic/components/menu/test/basic/main.html | 23 ----------------------
 1 file changed, 23 deletions(-)

diff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html
index 4905ae6c36..fed10a13e7 100644
--- a/ionic/components/menu/test/basic/main.html
+++ b/ionic/components/menu/test/basic/main.html
@@ -22,28 +22,5 @@
 </ion-menu>
 
 
-<ion-menu side="right" [content]="content" id="rightMenu">
-
-  <ion-toolbar secondary>
-    <ion-title>Right Menu</ion-title>
-  </ion-toolbar>
-
-  <ion-content>
-
-    <ion-list>
-
-      <button ion-item *ng-for="#p of pages" (click)="openPage(p)">
-        {{p.title}}
-      </button>
-
-      <button ion-item menu-toggle="rightMenu" no-forward-icon class="e2eCloseMenu">
-        Close Menu
-      </button>
-
-    </ion-list>
-  </ion-content>
-
-</ion-menu>
-
 
 <ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>

From 7c70da2212c1a80aab0a97e83a9f2afe5259bef6 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 1 Oct 2015 10:08:29 -0400
Subject: [PATCH 12/20] chore(popup): Fixed MD button so it extends the clear
 button

References #183
---
 ionic/components/popup/modes/md.scss | 14 ++++----------
 ionic/components/popup/popup.ts      |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index b895681f45..011f07613a 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -12,8 +12,8 @@ $popup-md-head-text-align:                left !default;
 $popup-md-title-font-size:                20px !default;
 $popup-md-body-text-color:                rgba(0,0,0,.5) !default;
 
-$popup-md-button-text-color:              color(primary) !default;
 $popup-md-button-min-height:              36px !default;
+$popup-md-prompt-input-text-color:        #000000;
 $popup-md-prompt-input-highlight-color:   map-get($colors, primary) !default;
 $popup-md-prompt-input-placeholder-color: #b9b9b9;
 
@@ -46,25 +46,24 @@ ion-popup {
 
 .prompt-input {
   border-bottom: 1px solid #dedede;
+  color: $popup-md-prompt-input-text-color;
 
   &::-webkit-input-placeholder {
      color: $popup-md-prompt-input-placeholder-color;
   }
-
   &:-moz-placeholder { /* Firefox 18- */
      color: $popup-md-prompt-input-placeholder-color;
   }
-
   &::-moz-placeholder {  /* Firefox 19+ */
      color: $popup-md-prompt-input-placeholder-color;
   }
-
   &:-ms-input-placeholder {
      color: $popup-md-prompt-input-placeholder-color;
   }
 
   &:focus {
     border-bottom: 2px solid $popup-md-prompt-input-highlight-color;
+    margin-bottom: 4px;
   }
 }
 
@@ -73,17 +72,12 @@ ion-popup {
   justify-content: flex-end;
 
   button {
+    @extend button[clear];
     -webkit-box-flex: initial;
     -webkit-flex: intiial;
     -ms-flex: initial;
     flex: initial;
 
-    background-color: transparent;
-    color: $popup-md-button-text-color;
     min-height: $popup-md-button-min-height;
-
-    box-shadow: none;
-    -webkit-transition: none;
-    transition: none;
   }
 }
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index 99c8ebd875..b48bca4d5e 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -204,7 +204,7 @@ const OVERLAY_TYPE = 'popup';
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
   '<popup-wrapper>' +
     '<div class="popup-head">' +
-      '<h2 class="popup-title" [inner-html]="title" *ng-if="title"></h2>' +
+      '<h2 class="popup-title" [inner-html]="title"></h2>' +
       '<h3 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h3>' +
     '</div>' +
     '<div class="popup-body">' +

From 73597c0b42adf5b084ebc6fd8ca49a2e4ca1fa58 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 1 Oct 2015 11:38:34 -0400
Subject: [PATCH 13/20] fix(popup): Some variables were missing the default
 flag, also styled iOS more and got rid of some overrides

References #183
---
 ionic/components/popup/modes/ios.scss | 27 +++++++++++++++------
 ionic/components/popup/modes/md.scss  | 35 +++++++++++----------------
 ionic/components/popup/popup.scss     | 13 +++-------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/ionic/components/popup/modes/ios.scss b/ionic/components/popup/modes/ios.scss
index d54f63bd7c..6919fb32c0 100644
--- a/ionic/components/popup/modes/ios.scss
+++ b/ionic/components/popup/modes/ios.scss
@@ -2,13 +2,15 @@
 // iOS Popups
 // --------------------------------------------------
 
-$popup-ios-max-width:             280px !default;
+$popup-ios-max-width:             84% !default;
 $popup-ios-background:            rgba(0,0,0,0) !default;
 $popup-ios-border-radius:         13px !default;
-$popup-ios-background-color:      #f8f8f8 !default;
+$popup-ios-background-color:      rgba(255,255,255,0.85) !default;
 
 $popup-ios-head-text-align:       center !default;
 $popup-ios-title-font-size:       15px !default;
+$popup-ios-sub-title-font-size:   14px !default;
+$popup-ios-sub-title-text-color:  #666 !default;
 $popup-ios-body-text-color:       inherit !default;
 
 $popup-ios-button-text-color:     color(primary) !default;
@@ -26,26 +28,37 @@ ion-popup {
 }
 
 .popup-head {
+  padding: 10px;
   text-align: $popup-ios-head-text-align;
-  padding-top: 24px;
 }
 
 .popup-title {
+  margin-top: 10px;
   font-size: $popup-ios-title-font-size;
 }
 
+.popup-sub-title {
+  font-size: $popup-ios-sub-title-font-size;
+  color: $popup-ios-sub-title-text-color;
+}
+
 .popup-body {
-  padding: 10px;
+  padding: 10px 20px;
   color: $popup-ios-body-text-color;
 }
 
+.prompt-input {
+  margin-top: 5px;
+}
+
 .popup-buttons {
-  padding: 0;
+  padding-bottom: 10px;
   min-height: 0;
 
   button {
-    background-color: transparent;
-    color: $popup-ios-button-text-color;
+    @extend button[clear];
+
+    flex: 1;
     min-height: $popup-ios-button-min-height;
 
     &:last-child {
diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index 011f07613a..c54d6d6bfc 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -10,12 +10,17 @@ $popup-md-box-shadow:                     0px 16px 20px rgba(0, 0, 0, 0.4) !defa
 
 $popup-md-head-text-align:                left !default;
 $popup-md-title-font-size:                20px !default;
+$popup-md-sub-title-font-size:            15px !default;
 $popup-md-body-text-color:                rgba(0,0,0,.5) !default;
 
 $popup-md-button-min-height:              36px !default;
-$popup-md-prompt-input-text-color:        #000000;
+
+$popup-md-prompt-input-border-color:      #dedede !default;
+$popup-md-prompt-input-text-color:        #000000 !default;
 $popup-md-prompt-input-highlight-color:   map-get($colors, primary) !default;
-$popup-md-prompt-input-placeholder-color: #b9b9b9;
+$popup-md-prompt-input-placeholder-color: #b9b9b9 !default;
+$popup-md-prompt-input-margin-top:        5px !default;
+$popup-md-prompt-input-margin-bottom:     5px !default;
 
 
 ion-popup {
@@ -39,31 +44,23 @@ ion-popup {
   font-size: $popup-md-title-font-size;
 }
 
+.popup-sub-title {
+  font-size: $popup-md-sub-title-font-size;
+}
+
 .popup-body {
   padding: 10px 24px 24px 24px;
   color: $popup-md-body-text-color;
 }
 
 .prompt-input {
-  border-bottom: 1px solid #dedede;
+  border-bottom: 1px solid $popup-md-prompt-input-border-color;
   color: $popup-md-prompt-input-text-color;
-
-  &::-webkit-input-placeholder {
-     color: $popup-md-prompt-input-placeholder-color;
-  }
-  &:-moz-placeholder { /* Firefox 18- */
-     color: $popup-md-prompt-input-placeholder-color;
-  }
-  &::-moz-placeholder {  /* Firefox 19+ */
-     color: $popup-md-prompt-input-placeholder-color;
-  }
-  &:-ms-input-placeholder {
-     color: $popup-md-prompt-input-placeholder-color;
-  }
+  margin: $popup-md-prompt-input-margin-top 0 $popup-md-prompt-input-margin-bottom 0;
 
   &:focus {
     border-bottom: 2px solid $popup-md-prompt-input-highlight-color;
-    margin-bottom: 4px;
+    margin-bottom: $popup-md-prompt-input-margin-bottom - 1;
   }
 }
 
@@ -73,10 +70,6 @@ ion-popup {
 
   button {
     @extend button[clear];
-    -webkit-box-flex: initial;
-    -webkit-flex: intiial;
-    -ms-flex: initial;
-    flex: initial;
 
     min-height: $popup-md-button-min-height;
   }
diff --git a/ionic/components/popup/popup.scss b/ionic/components/popup/popup.scss
index c37c221f31..0c238e091c 100644
--- a/ionic/components/popup/popup.scss
+++ b/ionic/components/popup/popup.scss
@@ -6,8 +6,6 @@ $popup-min-width:                 250px !default;
 $popup-max-width:                 100% !default;
 $popup-max-height:                90% !default;
 
-$popup-sub-title-font-size:       15px !default;
-
 $popup-button-line-height:        20px !default;
 $popup-button-font-size:          14px !default;
 $popup-button-margin-right:       8px !default;
@@ -41,10 +39,6 @@ ion-popup {
   }
 }
 
-.popup-head {
-  padding: 15px 10px;
-}
-
 .popup-title {
   margin: 0;
   padding: 0;
@@ -54,23 +48,23 @@ ion-popup {
   margin: 5px 0 0 0;
   padding: 0;
   font-weight: normal;
-  font-size: $popup-sub-title-font-size;
 }
 
 .popup-body {
   overflow: auto;
 
-  // TODO is this needed?
+  // TODO is this needed, it is never empty
   &:empty {
     padding: 0;
   }
 }
 
 .prompt-input {
+  @include placeholder();
+
   border: 0;
   background: inherit;
   padding: 10px 0;
-  margin: 5px 0;
 }
 
 .popup-buttons {
@@ -78,7 +72,6 @@ ion-popup {
   flex-direction: row;
 
   button {
-    flex: 1;
     display: block;
     margin: 0;
     line-height: $popup-button-line-height;

From f8cbd275c4bf9974677fb23d287d5270889f2da6 Mon Sep 17 00:00:00 2001
From: perry <perry@drifty.com>
Date: Thu, 1 Oct 2015 11:14:51 -0500
Subject: [PATCH 14/20] docs generation for new docs site

---
 scripts/docs/processors/jekyll.js             | 38 +++++++++++++------
 .../docs/templates/api_index.template.html    |  3 +-
 .../api_menu_flat_version.template.html       |  4 ++
 .../api_version_select.template.html          |  4 +-
 scripts/docs/templates/common.template.html   |  5 ++-
 5 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 scripts/docs/templates/api_menu_flat_version.template.html

diff --git a/scripts/docs/processors/jekyll.js b/scripts/docs/processors/jekyll.js
index 04f5093ac0..f1006cc0a1 100644
--- a/scripts/docs/processors/jekyll.js
+++ b/scripts/docs/processors/jekyll.js
@@ -1,31 +1,47 @@
-module.exports = function jekyll(renderDocsProcessor){
+module.exports = function jekyll(renderDocsProcessor) {
   return {
     name: 'jekyll',
     description: 'Create jekyll includes',
-    $runAfter: ['adding-extra-docs'],
-    $runBefore: ['extra-docs-added'],
+    $runAfter: ['paths-computed'],
+    $runBefore: ['rendering-docs'],
     $process: function(docs) {
       var currentVersion = renderDocsProcessor.extraData.version.current.name;
 
+      // pretty up and sort the docs object for menu generation
+      docs = docs.filter(function(doc) {
+        return !!doc.name && !!doc.outputPath;
+      });
+      docs.sort(function(a, b) {
+        textA = a.name ? a.name.toUpperCase() : '';
+        textB = b.name ? b.name.toUpperCase() : '';
+        return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
+      });
+      docs.forEach(function(doc, i) {
+        docs[i].URL = doc.outputPath.replace('docs/v2//','docs/v2/')
+                                    .replace('/index.md','');
+      });
+
       docs.push({
         docType: 'api-menu',
         id: 'api-menu',
         template: 'api_menu.template.html',
-        outputPath: '_includes/v2/api_menu.html'
+        outputPath: '_includes/v2_fluid/api_menu.html'
       });
-     //TODO autogenerate this
       docs.push({
-        docType: 'api-menu-version',
-        id: 'api-menu-version',
-        template: 'api_menu_version.template.html',
-        outputPath: '_includes/v2/api_menu_' + currentVersion + '.html'
+        docType: 'api-menu-flat-version',
+        id: 'api-menu-flat-version',
+        template: 'api_menu_flat_version.template.html',
+        outputPath: '_includes/v2_fluid/api_menu_flat_' + currentVersion + '.html'
       });
       docs.push({
         docType: 'api-version-select',
         id: 'api-version-select',
         template: 'api_version_select.template.html',
-        outputPath: '_includes/v2/api_version_select.html'
+        outputPath: '_includes/v2_fluid/api_version_select.html'
       });
+
+      // returning docs will replace docs object in the next process
+      return docs;
     }
-  }
+  };
 };
diff --git a/scripts/docs/templates/api_index.template.html b/scripts/docs/templates/api_index.template.html
index 85b47a01e9..32c91cc327 100644
--- a/scripts/docs/templates/api_index.template.html
+++ b/scripts/docs/templates/api_index.template.html
@@ -1,9 +1,10 @@
 ---
-layout: "v2/docs_base"
+layout: "v2_fluid/docs_base"
 version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href $>"
 path: ""
 
+category: api
 id: api
 title: Javascript
 header_sub_title: Extend Ionic even further with the power of AngularJS
diff --git a/scripts/docs/templates/api_menu_flat_version.template.html b/scripts/docs/templates/api_menu_flat_version.template.html
new file mode 100644
index 0000000000..b5e1e12f80
--- /dev/null
+++ b/scripts/docs/templates/api_menu_flat_version.template.html
@@ -0,0 +1,4 @@
+<@ for doc in docs @><@ if doc.URL @>
+<li class="{% if page.id == '{{<$ doc.name $> | slugify: 'pretty'}}' %}active{% endif %}">
+  <a href="<$ doc.URL $>"><$ doc.name $></a>
+</li><@ endif @><@ endfor @>
diff --git a/scripts/docs/templates/api_version_select.template.html b/scripts/docs/templates/api_version_select.template.html
index d7cde2d460..93ccc9ddc3 100644
--- a/scripts/docs/templates/api_version_select.template.html
+++ b/scripts/docs/templates/api_version_select.template.html
@@ -1,4 +1,4 @@
-<select onchange="window.location.href=this.options[this.selectedIndex].value">
+<select name="version" id="version-toggle">
 <@ for ver in version.list @>
   <option
    value="<$ ver.href $>/{% if page.path != ''%}{{page.path}}{% else %}api/{% endif %}"
@@ -7,5 +7,3 @@
   </option>
 <@ endfor @>
 </select>
-
-
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index 725b819302..aafa5201ee 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -1,9 +1,10 @@
 ---
-layout: "v2/docs_base"
+layout: "v2_fluid/docs_base"
 version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href $>"
 path: "<$ doc.path $>"
-id: api
+category: api
+id: "{{<$ doc.name $> | slugify: 'pretty'}}"
 title: "<@ if doc.docType == "directive" @><$ doc.name | dashCase $><@ else @><$ doc.name $><@ endif @>"
 header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
 doc: "<$ doc.name $>"

From cb023e795bb9c4d2467c10df720b23a2278ea8a7 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 1 Oct 2015 11:51:36 -0500
Subject: [PATCH 15/20] Use typescript 1.5.3 for now

Workaround for #232
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 746a9fcaf1..e75ae0c89a 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "source-map-support": "^0.2.10",
     "through2": "^0.6.3",
     "traceur-runtime": "0.0.59",
-    "typescript": "^1.5.3",
+    "typescript": "1.5.3",
     "vinyl": "^0.4.6",
     "yargs": "^3.6.0"
   }

From 43505407b3d75ad416dc4feda3b741a07b294e0d Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 1 Oct 2015 13:29:47 -0400
Subject: [PATCH 16/20] chore(popup): Added md mode animation's for popup and
 added to config

Removed the background from the md scss file. References #183
---
 ionic/components/popup/modes/md.scss |  3 ---
 ionic/components/popup/popup.ts      | 26 ++++++++++++++++++++------
 ionic/config/modes.ts                |  5 +++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index c54d6d6bfc..6c2c9a65a7 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -3,7 +3,6 @@
 // --------------------------------------------------
 
 $popup-md-max-width:                      280px !default;
-$popup-md-background:                     rgba(0,0,0,0.5) !default;
 $popup-md-border-radius:                  2px !default;
 $popup-md-background-color:               #fafafa !default;
 $popup-md-box-shadow:                     0px 16px 20px rgba(0, 0, 0, 0.4) !default;
@@ -24,8 +23,6 @@ $popup-md-prompt-input-margin-bottom:     5px !default;
 
 
 ion-popup {
-  background: $popup-md-background;
-
   popup-wrapper {
     max-width: $popup-md-max-width;
     border-radius: $popup-md-border-radius;
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index b48bca4d5e..7ddd6afbbc 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -4,7 +4,6 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup,
 import {Overlay} from '../overlay/overlay';
 import {Animation} from '../../animations/animation';
 import {Ion} from '../ion';
-import {IonInput} from '../form/input';
 import * as util from 'ionic/util';
 
 
@@ -58,9 +57,10 @@ export class Popup extends Overlay {
      */
     popup(context, opts={}) {
     return new Promise((resolve, reject)=> {
+      let config = this.config;
       let defaults = {
-        enterAnimation: 'popup-pop-in',
-        leaveAnimation: 'popup-pop-out',
+        enterAnimation: config.setting('popupPopIn'),
+        leaveAnimation: config.setting('popupPopOut'),
       };
 
       context.promiseResolve = resolve;
@@ -204,7 +204,7 @@ const OVERLAY_TYPE = 'popup';
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
   '<popup-wrapper>' +
     '<div class="popup-head">' +
-      '<h2 class="popup-title" [inner-html]="title"></h2>' +
+      '<h2 class="popup-title" [inner-html]="title" *ng-if="title"></h2>' +
       '<h3 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h3>' +
     '</div>' +
     '<div class="popup-body">' +
@@ -281,7 +281,6 @@ class PopupAnimation extends Animation {
 class PopupPopIn extends PopupAnimation {
   constructor(element) {
     super(element);
-
     this.wrapper.fromTo('opacity', '0', '1')
     this.wrapper.fromTo('scale', '1.1', '1');
 
@@ -290,7 +289,6 @@ class PopupPopIn extends PopupAnimation {
 }
 Animation.register('popup-pop-in', PopupPopIn);
 
-
 class PopupPopOut extends PopupAnimation {
   constructor(element) {
     super(element);
@@ -301,3 +299,19 @@ class PopupPopOut extends PopupAnimation {
   }
 }
 Animation.register('popup-pop-out', PopupPopOut);
+
+class PopupMdPopIn extends PopupPopIn {
+  constructor(element) {
+    super(element);
+    this.backdrop.fromTo('opacity', '0', '0.5')
+  }
+}
+Animation.register('popup-md-pop-in', PopupMdPopIn);
+
+class PopupMdPopOut extends PopupPopOut {
+  constructor(element) {
+    super(element);
+    this.backdrop.fromTo('opacity', '0.5', '0')
+  }
+}
+Animation.register('popup-md-pop-out', PopupMdPopOut);
diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts
index 509c0a854f..ae4e3ac82e 100644
--- a/ionic/config/modes.ts
+++ b/ionic/config/modes.ts
@@ -21,6 +21,8 @@ IonicConfig.modeConfig('ios', {
   tabBarPlacement: 'bottom',
   viewTransition: 'ios',
 
+  popupPopIn: 'popup-pop-in',
+  popupPopOut: 'popup-pop-out',
 });
 
 
@@ -43,6 +45,9 @@ IonicConfig.modeConfig('md', {
   tabBarPlacement: 'top',
   viewTransition: 'md',
 
+  popupPopIn: 'popup-md-pop-in',
+  popupPopOut: 'popup-md-pop-out',  
+
   type: 'overlay',
   mdRipple: true,
 });

From c89deca54260f2511f9010fcfbb7ae085f9ff002 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Wed, 30 Sep 2015 16:21:52 -0500
Subject: [PATCH 17/20] chore(demos): fix zonejs issue, add new template

---
 demos/component-docs/index.ts          | 17 +++++++++----
 demos/component-docs/main.html         |  3 +--
 gulpfile.js                            |  9 ++++++-
 scripts/demos/docs.index.template.html | 33 ++++++++++++++++++++++++++
 scripts/demos/index.template.html      |  1 -
 5 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 scripts/demos/docs.index.template.html

diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts
index ec8ee55d69..577fd60582 100644
--- a/demos/component-docs/index.ts
+++ b/demos/component-docs/index.ts
@@ -1,4 +1,5 @@
 import {App, ActionSheet} from 'ionic/ionic';
+import {NgZone} from 'angular2/angular2';
 
 function toTitleCase(str) {
   return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
@@ -9,13 +10,21 @@ function toTitleCase(str) {
 })
 class DemoApp {
 
-  constructor(actionSheet: ActionSheet) {
+  component: any;
+  actionSheet: any;
+
+  constructor(actionSheet: ActionSheet, zone: NgZone) {
     this.actionSheet = actionSheet;
     this.component = {
-      title: 'Action Sheet',
-    }
+        title: 'Action Sheets',
+    };
     window.onmessage = (e) => {
-        this.component.title = toTitleCase(e.data.replace('-', ' '));
+      zone.run(() => {
+        if (e.data) {
+          var data = JSON.parse(e.data);
+          this.component.title = toTitleCase(data.hash.replace('-', ' '));
+        }
+      });
     };
   }
 
diff --git a/demos/component-docs/main.html b/demos/component-docs/main.html
index f364a7fa34..89aff44058 100644
--- a/demos/component-docs/main.html
+++ b/demos/component-docs/main.html
@@ -3,8 +3,7 @@
 
 <ion-content class="has-header padding components-demo">
 
-
-  <section id="action-sheet" [ng-class]="{hidden: component.title !== 'Action Sheet' }">
+  <section id="action-sheet" [ng-class]="{hidden: component.title !== 'Action Sheets' }">
     <button class="button" (click)="openMenu()">
       Show Actionsheet
     </button>
diff --git a/gulpfile.js b/gulpfile.js
index b1f5aff1d6..ec17ec9a2e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -367,7 +367,8 @@ gulp.task('demos', function(){
     .pipe(tsc, tscOptions, null, tscReporter)
     .pipe(babel, getBabelOptions('demos'))
 
-  var indexTemplate = _.template(fs.readFileSync('scripts/demos/index.template.html'))();
+  var baseIndexTemplate = _.template(fs.readFileSync('scripts/demos/index.template.html'))();
+  var docsIndexTemplate = _.template(fs.readFileSync('scripts/demos/docs.index.template.html'))();
 
   return gulp.src(['demos/**/*'])
     .pipe(cache('demos', { optimizeMemory: true }))
@@ -377,12 +378,18 @@ gulp.task('demos', function(){
 
   function createIndexHTML() {
     return through2.obj(function(file, enc, next) {
+      var indexTemplate = baseIndexTemplate;
+      if (file.path.indexOf('component-docs') > -1) {
+        indexTemplate = docsIndexTemplate;
+      }
       this.push(new VinylFile({
         base: file.base,
         contents: new Buffer(indexTemplate),
         path: path.join(path.dirname(file.path), 'index.html'),
       }));
       next(null, file);
+
+
     });
   }
 })
diff --git a/scripts/demos/docs.index.template.html b/scripts/demos/docs.index.template.html
new file mode 100644
index 0000000000..5870e1b3cf
--- /dev/null
+++ b/scripts/demos/docs.index.template.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <!-- https://www.chromium.org/developers/design-documents/chromium-graphics/how-to-get-gpu-rasterization -->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+
+  <link href="/css/ionic.css" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="app.css">
+
+</head>
+<body>
+
+  <ion-app>
+    <ion-loading-icon></ion-loading-icon>
+  </ion-app>
+
+  <script src="/js/ionic.bundle.js"></script>
+
+  <script>
+    System.config({
+      "paths": {
+        "*": "*.js",
+        "ionic/*": "ionic/*",
+        "angular2/*": "angular2/*",
+        "rx": "rx"
+      }
+    })
+    System.import("index");
+  </script>
+
+</body>
+</html>
diff --git a/scripts/demos/index.template.html b/scripts/demos/index.template.html
index bc1240c66d..4f67125d6f 100644
--- a/scripts/demos/index.template.html
+++ b/scripts/demos/index.template.html
@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
   <link href="../../css/ionic.css" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="app.css">
 
 </head>
 <body>

From ec480b1fd9e270d128539f47f5481fc60617e4e1 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Thu, 1 Oct 2015 11:36:04 -0500
Subject: [PATCH 18/20] docs(demos): add list and item demo

---
 demos/component-docs/app.css           |  21 +++
 demos/component-docs/index.ts          |  24 ++-
 demos/component-docs/main.html         | 219 ++++++++++++++++++++++++-
 scripts/demos/docs.index.template.html |   2 +-
 4 files changed, 258 insertions(+), 8 deletions(-)

diff --git a/demos/component-docs/app.css b/demos/component-docs/app.css
index 08f2652abd..5dd53a967f 100644
--- a/demos/component-docs/app.css
+++ b/demos/component-docs/app.css
@@ -5,3 +5,24 @@ body {
 section.hidden {
   display: none !important;
 }
+
+#ionitron {
+  width: 100px;
+  height: 100px;
+  position: absolute;
+  top: 25%;
+  margin-top: -50px;
+  left: 50%;
+  margin-left: -50px;
+}
+
+.animation-buttons {
+  position: absolute;
+  bottom: 25%; 
+  left: 60px; 
+  display: inline;
+}
+
+.components-demo h4 {
+    text-align: center;
+}
diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts
index 577fd60582..863987886a 100644
--- a/demos/component-docs/index.ts
+++ b/demos/component-docs/index.ts
@@ -1,4 +1,4 @@
-import {App, ActionSheet} from 'ionic/ionic';
+import {App, ActionSheet, Animation} from 'ionic/ionic';
 import {NgZone} from 'angular2/angular2';
 
 function toTitleCase(str) {
@@ -26,6 +26,7 @@ class DemoApp {
         }
       });
     };
+    this.setupAnimations();
   }
 
   openMenu() {
@@ -54,5 +55,26 @@ class DemoApp {
     });
   }
 
+  setupAnimations() {
+    this.animation = new Animation();
+    this.animation
+      .duration(2000)
+
+    var ionitronSpin = new Animation(document.querySelector('#ionitron'));
+    ionitronSpin
+      .from('transform', 'rotate(0deg)')
+      .to('transform', 'rotate(360deg)')
+
+    this.animation.add(ionitronSpin);
+  }
+
+  play() {
+    this.animation.play();
+  }
+
+  pause() {
+    this.animation.pause();
+  }
+
 
 }
\ No newline at end of file
diff --git a/demos/component-docs/main.html b/demos/component-docs/main.html
index 89aff44058..f08a2d9909 100644
--- a/demos/component-docs/main.html
+++ b/demos/component-docs/main.html
@@ -9,24 +9,231 @@
     </button>
   </section>
 
+
   <section id="animation" [ng-class]="{hidden: component.title !== 'Animations' }">
-   TODO
+   <img src="http://ionicframework.com/present-ionic/slides/img/me.png" id="ionitron">
+
+   <div class="animation-buttons">
+     <button icon pause primary (click)="pause($event)">
+       Pause
+       <icon pause></icon>
+     </button>
+     <button icon play secondary (click)="play($event)">
+       Play
+       <icon play></icon>
+     </button>
+   </div>
   </section>
 
+
   <section id="buttons" [ng-class]="{hidden: component.title !== 'Buttons' }">
-   TODO
+    <h4>Colors</h4>
+
+    <p>
+      <button block>Default</button>
+    </p>
+
+    <p>
+      <button secondary block>Secondary</button>
+    </p>
+
+    <p>
+      <button danger block>Danger</button>
+    </p>
+
+    <p>
+      <button light block>Light</button>
+    </p>
+
+    <p>
+      <button dark block>Dark</button>
+    </p>
+
+    <h4>Shapes</h4>
+
+    <p>
+      <button full>Full Button</button>
+    </p>
+
+    <p>
+      <button block>Block Button</button>
+    </p>
+
+    <p>
+      <button round>Round Button</button>
+    </p>
+
+      <p>
+      <button fab style="position: relative;">FAB</button>
+    </p>
+
+    <h4>Outlines</h4>
+
+    <p>
+      <button secondary full outline>Outline + Full</button>
+    </p>
+
+    <p>
+      <button secondary block outline>Outline + Block</button>
+    </p>
+
+    <p>
+      <button secondary round outline>Outline + Round</button>
+    </p>
+
+      <p>
+      <button secondary fab outline style="position: relative;">FAB</button>
+    </p>
+
+    <h4>Icons</h4>
+
+    <p>
+      <button dark>
+        <icon star></icon>
+        Left Icon
+      </button>
+    </p>
+
+    <p>
+      <button dark>
+        Right Icon
+        <icon star></icon>
+      </button>
+    </p>
+
+    <p>
+      <button dark>
+        <icon star></icon>
+      </button>
+    </p>
+
+
+    <h4>Sizes</h4>
+
+    <p>
+      <button light large>Large</button>
+    </p>
+
+    <p>
+      <button light>Default</button>
+    </p>
+
+    <p>
+      <button light small>Small</button>
+    </p>
   </section>
 
-   <section id="cards" [ng-class]="{hidden: component.title !== 'Cards' }">
-   TODO
+
+  <section id="cards" [ng-class]="{hidden: component.title !== 'Cards' }">
+
+    <ion-card>
+
+      <ion-card-header primary>
+        Menu
+      </ion-card-header>
+
+      <ion-card-content>
+        <a ion-item href="#">
+          <icon home item-left></icon>
+          Home
+        </a>
+
+        <a ion-item href="#">
+          <icon people item-left></icon>
+          Friends
+        </a>
+
+        <button ion-item>
+          <icon musical-notes item-left></icon>
+          Music
+        </button>
+
+        <button ion-item>
+          <icon mail item-left></icon>
+          Mail
+        </button>
+      </ion-card-content>
+
+    </ion-card> 
+
+
+    <ion-card>
+
+      <ion-item>
+        <icon football item-left></icon>
+        Schedule
+        <button outline item-right>Open</button>
+      </ion-item>
+
+    </ion-card>
+
+    <ion-card>
+
+      <ion-item>
+        <icon trophy item-left></icon>
+        Trophies
+        <button outline item-right>View</button>
+      </ion-item>
+
+    </ion-card>
+
+
   </section>
    
     <section id="icons" [ng-class]="{hidden: component.title !== 'Icons' }">
    TODO
   </section>
 
-     <section id="lists" [ng-class]="{hidden: component.title !== 'Lists' }">
-   TODO
+  <section id="lists" [ng-class]="{hidden: component.title !== 'Lists' }">
+    <ion-list>
+
+      <ion-header>
+        Classes
+      </ion-header>
+
+      <ion-item>
+        <icon color-wand item-left></icon>
+        Dark Arts
+      </ion-item>
+
+      <ion-item>
+        <icon planet item-left></icon>
+        Astronomy
+      </ion-item>
+
+      <ion-item>
+        <icon flask item-left></icon>
+        Potions
+      </ion-item>
+
+      <ion-item>
+        <icon star item-left></icon>
+        Charms
+      </ion-item>
+
+    </ion-list>
+
+
+    <ion-list>
+
+      <ion-header>
+        Menu
+      </ion-header>
+
+      <ion-switch checked="true">
+        <icon shirt item-left></icon>
+        Invisibility Cloak
+      </ion-switch>
+
+      <ion-item>
+        <icon call item-left></icon>
+        Call Ron
+        <div class="item-note" item-right>Maybe later</div>
+      </ion-item>
+
+    </ion-list>
+
+
   </section>
     <section id="menus" [ng-class]="{hidden:component.title !== 'Menus' }">
    TODO
diff --git a/scripts/demos/docs.index.template.html b/scripts/demos/docs.index.template.html
index 5870e1b3cf..01a6fd3fb8 100644
--- a/scripts/demos/docs.index.template.html
+++ b/scripts/demos/docs.index.template.html
@@ -5,7 +5,7 @@
   <!-- https://www.chromium.org/developers/design-documents/chromium-graphics/how-to-get-gpu-rasterization -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
-  <link href="/css/ionic.css" rel="stylesheet">
+  <link href="/css/v2-demos/css/ionic.css" rel="stylesheet">
   <link rel="stylesheet" type="text/css" href="app.css">
 
 </head>

From 97b3e7c269d04adc2b9b6fbc5754d8157478a469 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Thu, 1 Oct 2015 13:44:57 -0500
Subject: [PATCH 19/20] docs(demos): add slider demo

---
 demos/component-docs/app.css   | 27 +++++++++++++++++++++++++++
 demos/component-docs/main.html | 22 ++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/demos/component-docs/app.css b/demos/component-docs/app.css
index 5dd53a967f..a331f030d4 100644
--- a/demos/component-docs/app.css
+++ b/demos/component-docs/app.css
@@ -26,3 +26,30 @@ section.hidden {
 .components-demo h4 {
     text-align: center;
 }
+
+ion-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.demo-slide {
+  display: block;
+  height: 100%;
+  padding: 500px 0;
+  width: 100%;
+  font-weight: bold;
+  font-size: 2.5em;
+  color: #fff;
+}
+
+.demo-slide-1 {
+  background-color: #32db64;
+}
+
+.demo-slide-2 {
+  background-color: #387ef5;
+}
+
+.demo-slide-3 {
+  background-color: #f53d3d;
+}
diff --git a/demos/component-docs/main.html b/demos/component-docs/main.html
index f08a2d9909..fdcfa40771 100644
--- a/demos/component-docs/main.html
+++ b/demos/component-docs/main.html
@@ -244,8 +244,26 @@
     <section id="navigation" [ng-class]="{hidden: component.title !== 'Navigation' }">
    TODO
   </section>
-    <section id="slides" [ng-class]="{hidden: component.title !== 'Slides' }">
-   TODO
+  
+  <section id="slides" [ng-class]="{hidden: component.title !== 'Slides' }">
+   
+   <ion-slides id="slider" style="background-color: black" pager="true" zoom="false" index="1" loop="true">
+      <ion-slide>
+        <div class="demo-slide demo-slide-1">
+          Slide 1
+        </div>
+      </ion-slide>
+      <ion-slide>
+        <div class="demo-slide demo-slide-2">
+          Slide 2
+        </div>
+      </ion-slide>
+      <ion-slide>
+        <div class="demo-slide demo-slide-3">
+          Slide 3
+        </div>
+      </ion-slide>
+   </ion-slides>
   </section>
 
     <section id="tabs" [ng-class]="{hidden: component.title !== 'Tabs' }">

From 4ad0b9638dd389a205545f18294d10d858ac7946 Mon Sep 17 00:00:00 2001
From: perry <perry@drifty.com>
Date: Thu, 1 Oct 2015 13:46:40 -0500
Subject: [PATCH 20/20] docs(generation): navigation tweaks for automatic
 documentation

---
 scripts/docs/templates/api_menu.template.html              | 4 ++--
 scripts/docs/templates/api_menu_flat_version.template.html | 4 ++--
 scripts/docs/templates/api_version_select.template.html    | 4 +++-
 scripts/docs/templates/common.template.html                | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/docs/templates/api_menu.template.html b/scripts/docs/templates/api_menu.template.html
index 75452d3d2f..9cd013e797 100644
--- a/scripts/docs/templates/api_menu.template.html
+++ b/scripts/docs/templates/api_menu.template.html
@@ -5,10 +5,10 @@
     <@ else @>
 {% elsif page.versionHref == "<$ ver.href $>" %}
     <@ endif @>
-  {% include v2/api_menu_<$ ver.name $>.html %}
+  {% include v2_fluid/api_menu_flat_<$ ver.name $>.html %}
   <@ endif @>
 <@ endfor @>
 <# make the last case always be to show latest version #>
 {% else %}
-  {% include v2/api_menu_<$ version.latest.name $>.html %}
+  {% include v2_fluid/api_menu_flat_<$ version.latest.name $>.html %}
 {% endif %}
diff --git a/scripts/docs/templates/api_menu_flat_version.template.html b/scripts/docs/templates/api_menu_flat_version.template.html
index b5e1e12f80..92633f8932 100644
--- a/scripts/docs/templates/api_menu_flat_version.template.html
+++ b/scripts/docs/templates/api_menu_flat_version.template.html
@@ -1,4 +1,4 @@
 <@ for doc in docs @><@ if doc.URL @>
-<li class="{% if page.id == '{{<$ doc.name $> | slugify: 'pretty'}}' %}active{% endif %}">
-  <a href="<$ doc.URL $>"><$ doc.name $></a>
+<li class="{% if page.id == '{{<$ doc.name $> | slugify}}' %}active{% endif %}">
+  <a href="/<$ doc.URL $>"><$ doc.name $></a>
 </li><@ endif @><@ endfor @>
diff --git a/scripts/docs/templates/api_version_select.template.html b/scripts/docs/templates/api_version_select.template.html
index 93ccc9ddc3..6bb438084a 100644
--- a/scripts/docs/templates/api_version_select.template.html
+++ b/scripts/docs/templates/api_version_select.template.html
@@ -1,4 +1,6 @@
-<select name="version" id="version-toggle">
+<select name="version"
+        id="version-toggle"
+        onchange="window.location.href=this.options[this.selectedIndex].value">
 <@ for ver in version.list @>
   <option
    value="<$ ver.href $>/{% if page.path != ''%}{{page.path}}{% else %}api/{% endif %}"
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index aafa5201ee..2556e73ee5 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -4,7 +4,7 @@ version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href $>"
 path: "<$ doc.path $>"
 category: api
-id: "{{<$ doc.name $> | slugify: 'pretty'}}"
+id: "{{<$ doc.name $> | slugify}}"
 title: "<@ if doc.docType == "directive" @><$ doc.name | dashCase $><@ else @><$ doc.name $><@ endif @>"
 header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
 doc: "<$ doc.name $>"