Merge lp:~andreserl/maas/lp1628067 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Update FUJ to match the copy doc.

Copy doc changed after the FUJ was implemented. This updates as close as per https://github.com/CanonicalLtd/MAAS-design/tree/master/First%20Use%20Journey/Flat_Visuals

[Gavin Panella (allenap)]

A few things need fixing and I've made several suggestions for improvements. I've strayed close to the bike shed but tried not to imagine its colour.

review: Needs Fixing

[Blake Rouse (blake-rouse)]

I think most of Gavins comments should be addressed.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Note that this follows the copy doc: https://github.com/CanonicalLtd/MAAS-design/tree/master/First%20Use%20Journey/Flat_Visuals

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

5467. By Andres Rodriguez on 2016-10-10

FUJ changes to match copy-doc

=== modified file 'src/maasserver/static/partials/boot-images.html'
--- src/maasserver/static/partials/boot-images.html	2016-10-07 19:27:52 +0000
+++ src/maasserver/static/partials/boot-images.html	2016-10-10 17:35:15 +0000
@@ -6,7 +6,7 @@
         </h2>
         <div data-ng-class="{ 'action-card__controls': design === 'action-card' }">
             <p class="u-margin--top-small u-margin--bottom-small" data-ng-if="isSuperUser() && !source.tooMany">
-                Select images and architecture to be imported and kept in sync daily. Images will be available for deploying to machines managed by MAAS.
+                Select versions and architecture to be available for installation - automatically kept current.
             </p>
             <form class="form">
                 <div data-ng-if="isSuperUser() && !source.tooMany">

=== modified file 'src/maasserver/static/partials/intro-user.html'
--- src/maasserver/static/partials/intro-user.html	2016-09-20 18:53:29 +0000
+++ src/maasserver/static/partials/intro-user.html	2016-10-10 17:35:15 +0000
@@ -8,7 +8,7 @@
                 SSH Keys for {$ user.username $}
             </h2>
             <div class="action-card__controls">
-                <p class="u-margin--top">Add multiple keys from Launchpad and Github or enter them manually.</p>
+                <p class="u-margin--top">Add SSH keys from Launchpad or Github or enter them manually. These keys will be installed on machines you deploy with MAAS.</p>
                 <h3>Keys</h3>
                 <maas-ssh-keys></maas-ssh-keys>
             </div>
@@ -17,12 +17,10 @@
             data-ng-if="isSuperUser()"
             data-ng-class="{'u-muted': !canContinue()}">
             <h2 class="action-card__title">
-                MAAS has been successfully set up
+                MAAS setup complete
             </h2>
             <div class="action-card__controls">
-                <p class="u-margin--top"><i class="icon icon--success"></i> Once DHCP is enabled, set your machines to PXE boot and they will be automatically enlisted in the Nodes tab.</p>
-                <p class="u-margin--top"><i class="icon icon--success"></i> Discovered MAC/IP pairs in your network will be listed on your dashboard and can be added to MAAS.</p>
-                <p class="u-margin--top u-margin--bottom"><i class="icon icon--success"></i> The fabrics, VLANs and subnets in your network will be automatically added to MAAS in Networks.</p>
+                <p class="u-margin--top"><i class="icon icon--success"></i> MAAS will now monitor the networks visible to its controllers. We recommend that you declare all machines and devices explicitly to MAAS, then activate the MAAS DHCP services.</p>
             </div>
         </div>
         <button class="button button--primary"

=== modified file 'src/maasserver/static/partials/intro.html'
--- src/maasserver/static/partials/intro.html	2016-09-27 15:47:43 +0000
+++ src/maasserver/static/partials/intro.html	2016-10-10 17:35:15 +0000
@@ -13,6 +13,8 @@
                         <div class="three-col">
                             <maas-obj-field type="text" key="value" label="Region name" placeholder="e.g. us-west"  subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
+                        <div class="one-col"></div>
+                        <div class="five-col last-col u-text--subtle">The on-demand bare-metal provisioning of MAAS allows you to think of your data center as a cloud, so we use the common language of clouds to describe capacity - this MAAS controller will manage a ‘region’ which is internally made up of several 'Availability Zones'.</div>
                     </maas-obj-form>
                 </div>
             </div>
@@ -27,37 +29,37 @@
                 <div class="row u-border--none u-padding--none u-margin--top">
                     <maas-obj-form obj="upstreamDNS" manager="configManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="value" label="DNS forwarder" placeholder="e.g. 8.8.8.8" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="value" label="DNS forwarder" placeholder="e.g. 8.8.8.8, 8.8.4.4" subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                         <div class="one-col"></div>
-                        <div class="five-col last-col u-text--subtle">The address used to resolve domains not managed by MAAS. The value is used as the value of 'forwarders' in the DNS server configuration.</div>
+                        <div class="five-col last-col u-text--subtle">The DNS server used to resolve names outside the domains managed by this MAAS.</div>
                     </maas-obj-form>
                 </div>
                 <div class="row u-border--none u-padding--none u-margin--top">
                     <maas-obj-form obj="mainArchive" manager="repoManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="url" label="Ubuntu archive" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="url" label="Ubuntu archive" placeholder="e.g. http://archive.ubuntu.com/ubuntu" subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                         <div class="one-col"></div>
-                        <div class="five-col last-col u-text--subtle">The server where machines retrieve packages for Intel architectures.</div>
+                        <div class="five-col last-col u-text--subtle">The Ubuntu package archive for x86.</div>
                     </maas-obj-form>
                 </div>
                 <div class="row u-border--none u-padding--none u-margin--top">
                     <maas-obj-form obj="portsArchive" manager="repoManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="url" label="Ubuntu extra architectures" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="url" label="Ubuntu extra architectures" placeholder="e.g. http://ports.ubuntu.com/ubuntu-ports" subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                         <div class="one-col"></div>
-                        <div class="five-col last-col u-text--subtle">Archive used by machines to retrieve packages for non-Intel architectures.</div>
+                        <div class="five-col last-col u-text--subtle">The Ubuntu package archive for ARM, POWER.</div>
                     </maas-obj-form>
                 </div>
                 <div class="row u-border--none u-padding--none u-margin--top">
                     <maas-obj-form obj="httpProxy" manager="configManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" placeholder="e.g. http://172.16.160.120:8080 (optional)" subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                         <div class="one-col"></div>
-                        <div class="five-col last-col u-text--subtle">This will be passed onto deployed machines to use as a proxy for APT traffic. MAAS also uses the proxy for downloading boot images. In no URL is provided, the build-in MAAS proxy will be used.</div>
+                        <div class="five-col last-col u-text--subtle">A proxy for APT - if no URL is provided, the MAAS controller itself will be used.</div>
                     </maas-obj-form>
                 </div>
             </div>