Fix a couple bugs in plugins and welcome rtfd

osx/installerplugins/common/mixpanel.h

@@ -19,7 +19,7 @@
 
 @implementation Mixpanel
 
-+ (NSString *) trackingUUID {
++ (NSString *) uuid {
     NSString *cachePath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex:0];
     NSString *cacheDirPath = [NSString pathWithComponents:[NSArray arrayWithObjects:cachePath, @"io.docker.pkg.toolbox", nil]];
     NSString *cacheFilePath = [NSString pathWithComponents:[NSArray arrayWithObjects:cacheDirPath, @"id", nil]];
@@ -37,7 +37,7 @@
 
 + (void) trackEvent:(NSString *)name forPane:(InstallerPane*)pane {
     BOOL trackingDisabled = [[[[pane section] sharedDictionary] objectForKey:@"disableTracking"] boolValue];
-    NSString *uuid = [self trackingUUID];
+    NSString *uuid = [self uuid];
     
     if (!uuid || trackingDisabled) {
         return;

osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib

@@ -24,30 +24,22 @@
             <rect key="frame" x="0.0" y="0.0" width="418" height="330"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h63-BP-4UP">
+                <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5n-p7-Zro">
-                    <rect key="frame" x="21" y="127" width="22" height="18"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Jjb-SP-XI0">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="e5n-p7-Zro">
                     <rect key="frame" x="20" y="160" width="378" height="150"/>
                     <clipView key="contentView" misplaced="YES" id="GuL-k4-Axf">
                         <rect key="frame" x="1" y="1" width="223" height="133"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textView editable="NO" importsGraphics="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="cgA-DY-Gw8">
+                            <textView editable="NO" importsGraphics="NO" verticallyResizable="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="cgA-DY-Gw8">
                                 <rect key="frame" x="0.0" y="0.0" width="223" height="207"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <size key="minSize" width="378" height="150"/>
-                                <size key="maxSize" width="463" height="10000000"/>
+                                <size key="maxSize" width="463" height="150"/>
                                 <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <size key="minSize" width="378" height="150"/>
-                                <size key="maxSize" width="463" height="10000000"/>
+                                <size key="maxSize" width="463" height="150"/>
                             </textView>
                         </subviews>
                         <animations/>
@@ -65,6 +57,14 @@
                         <animations/>
                     </scroller>
                 </scrollView>
+                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h63-BP-4UP">
+                    <rect key="frame" x="21" y="127" width="22" height="18"/>
+                    <animations/>
+                    <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Jjb-SP-XI0">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yWs-7K-0pR">
                     <rect key="frame" x="47" y="109" width="353" height="43"/>
                     <animations/>

osx/installerplugins/overviewplugin/Info.plist

@@ -28,5 +28,9 @@
 	<string>overviewplugin</string>
 	<key>NSPrincipalClass</key>
 	<string>InstallerSection</string>
+	<key>Installer Version</key>
+	<string>%INSTALLER_VERSION%</string>
+	<key>Mixpanel Token</key>
+	<string>%MIXPANEL_TOKEN%</string>
 </dict>
 </plist>

osx/installerplugins/quickstartplugin/quickstartpluginPane.m

@@ -16,6 +16,8 @@
 }
 
 - (void) willEnterPane:(InstallerSectionDirection)dir {
+    self.previousEnabled = NO;
+    
     BOOL kitematicInstalled = [[NSFileManager defaultManager] fileExistsAtPath:@"/Applications/Docker/Kitematic (Beta).app"];
     BOOL quickstartInstalled = [[NSFileManager defaultManager] fileExistsAtPath:@"/Applications/Docker/Docker Quickstart Terminal.app"];
     

osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist

@@ -36,8 +36,12 @@
 	<string>0640</string>
 	<key>DTXcodeBuild</key>
 	<string>6E35b</string>
+	<key>Installer Version</key>
+	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>
 	<string>Overview</string>
+	<key>Mixpanel Token</key>
+	<string>%MIXPANEL_TOKEN%</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Docker Inc. All rights reserved.</string>
 	<key>NSMainNibFile</key>

osx/mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf

@@ -1,6 +1,5 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1397
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 HelveticaNeue-Bold;\f2\fnil\fcharset0 HelveticaNeue;
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 HelveticaNeue;}
-}
 {\colortbl;\red255\green255\blue255;}
 \margl1440\margr1440\vieww10800\viewh8400\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
@@ -8,9 +7,9 @@
 \f0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\qc\partightenfactor0
 
-\f1\b\fs48 \cf0 Install Docker Toolbox
+\f1\b\fs48 \cf0 Docker Toolbox Installer
-\f2\b0 \
+\b0 \
-%INSTALLER_VERSION%
+version %INSTALLER_VERSION%
 \f0 \
 \