MAAS

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

  1. lp1628067
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Rejected
Rejected by: MAAS Lander
Proposed branch: lp:~andreserl/maas/lp1628067
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 99 lines (+14/-14)
3 files modified
src/maasserver/static/partials/boot-images.html (+1/-1)
src/maasserver/static/partials/intro-user.html (+3/-5)
src/maasserver/static/partials/intro.html (+10/-8)
To merge this branch: bzr merge lp:~andreserl/maas/lp1628067
Reviewer Review Type Date Requested Status
Blake Rouse (community) Needs Fixing
Gavin Panella (community) Needs Fixing
Review via email: mp+308072@code.launchpad.net

Commit message

Update FUJ to match the copy doc.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
Revision history for this message
Gavin Panella (allenap) wrote :

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
Revision history for this message
Blake Rouse (blake-rouse) wrote :

I think most of Gavins comments should be addressed.

review: Needs Fixing
Revision history for this message
Andres Rodriguez (andreserl) wrote :

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

Revision history for this message
MAAS Lander (maas-lander) wrote :

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

FUJ changes to match copy-doc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
6 </h2>6 </h2>
7 <div data-ng-class="{ 'action-card__controls': design === 'action-card' }">7 <div data-ng-class="{ 'action-card__controls': design === 'action-card' }">
8 <p class="u-margin--top-small u-margin--bottom-small" data-ng-if="isSuperUser() && !source.tooMany">8 <p class="u-margin--top-small u-margin--bottom-small" data-ng-if="isSuperUser() && !source.tooMany">
9 Select images and architecture to be imported and kept in sync daily. Images will be available for deploying to machines managed by MAAS.9 Select versions and architecture to be available for installation - automatically kept current.
10 </p>10 </p>
11 <form class="form">11 <form class="form">
12 <div data-ng-if="isSuperUser() && !source.tooMany">12 <div data-ng-if="isSuperUser() && !source.tooMany">
1313
=== 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 @@
8 SSH Keys for {$ user.username $}8 SSH Keys for {$ user.username $}
9 </h2>9 </h2>
10 <div class="action-card__controls">10 <div class="action-card__controls">
11 <p class="u-margin--top">Add multiple keys from Launchpad and Github or enter them manually.</p>11 <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>
12 <h3>Keys</h3>12 <h3>Keys</h3>
13 <maas-ssh-keys></maas-ssh-keys>13 <maas-ssh-keys></maas-ssh-keys>
14 </div>14 </div>
@@ -17,12 +17,10 @@
17 data-ng-if="isSuperUser()"17 data-ng-if="isSuperUser()"
18 data-ng-class="{'u-muted': !canContinue()}">18 data-ng-class="{'u-muted': !canContinue()}">
19 <h2 class="action-card__title">19 <h2 class="action-card__title">
20 MAAS has been successfully set up20 MAAS setup complete
21 </h2>21 </h2>
22 <div class="action-card__controls">22 <div class="action-card__controls">
23 <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>23 <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>
24 <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>
25 <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>
26 </div>24 </div>
27 </div>25 </div>
28 <button class="button button--primary"26 <button class="button button--primary"
2927
=== 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 @@
13 <div class="three-col">13 <div class="three-col">
14 <maas-obj-field type="text" key="value" label="Region name" placeholder="e.g. us-west" subtle="false" blur-on-enter="true"></maas-obj-field>14 <maas-obj-field type="text" key="value" label="Region name" placeholder="e.g. us-west" subtle="false" blur-on-enter="true"></maas-obj-field>
15 </div>15 </div>
16 <div class="one-col"></div>
17 <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>
16 </maas-obj-form>18 </maas-obj-form>
17 </div>19 </div>
18 </div>20 </div>
@@ -27,37 +29,37 @@
27 <div class="row u-border--none u-padding--none u-margin--top">29 <div class="row u-border--none u-padding--none u-margin--top">
28 <maas-obj-form obj="upstreamDNS" manager="configManager">30 <maas-obj-form obj="upstreamDNS" manager="configManager">
29 <div class="three-col">31 <div class="three-col">
30 <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>32 <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>
31 </div>33 </div>
32 <div class="one-col"></div>34 <div class="one-col"></div>
33 <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>35 <div class="five-col last-col u-text--subtle">The DNS server used to resolve names outside the domains managed by this MAAS.</div>
34 </maas-obj-form>36 </maas-obj-form>
35 </div>37 </div>
36 <div class="row u-border--none u-padding--none u-margin--top">38 <div class="row u-border--none u-padding--none u-margin--top">
37 <maas-obj-form obj="mainArchive" manager="repoManager">39 <maas-obj-form obj="mainArchive" manager="repoManager">
38 <div class="three-col">40 <div class="three-col">
39 <maas-obj-field type="text" key="url" label="Ubuntu archive" subtle="false" blur-on-enter="true"></maas-obj-field>41 <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>
40 </div>42 </div>
41 <div class="one-col"></div>43 <div class="one-col"></div>
42 <div class="five-col last-col u-text--subtle">The server where machines retrieve packages for Intel architectures.</div>44 <div class="five-col last-col u-text--subtle">The Ubuntu package archive for x86.</div>
43 </maas-obj-form>45 </maas-obj-form>
44 </div>46 </div>
45 <div class="row u-border--none u-padding--none u-margin--top">47 <div class="row u-border--none u-padding--none u-margin--top">
46 <maas-obj-form obj="portsArchive" manager="repoManager">48 <maas-obj-form obj="portsArchive" manager="repoManager">
47 <div class="three-col">49 <div class="three-col">
48 <maas-obj-field type="text" key="url" label="Ubuntu extra architectures" subtle="false" blur-on-enter="true"></maas-obj-field>50 <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>
49 </div>51 </div>
50 <div class="one-col"></div>52 <div class="one-col"></div>
51 <div class="five-col last-col u-text--subtle">Archive used by machines to retrieve packages for non-Intel architectures.</div>53 <div class="five-col last-col u-text--subtle">The Ubuntu package archive for ARM, POWER.</div>
52 </maas-obj-form>54 </maas-obj-form>
53 </div>55 </div>
54 <div class="row u-border--none u-padding--none u-margin--top">56 <div class="row u-border--none u-padding--none u-margin--top">
55 <maas-obj-form obj="httpProxy" manager="configManager">57 <maas-obj-form obj="httpProxy" manager="configManager">
56 <div class="three-col">58 <div class="three-col">
57 <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" subtle="false" blur-on-enter="true"></maas-obj-field>59 <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>
58 </div>60 </div>
59 <div class="one-col"></div>61 <div class="one-col"></div>
60 <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>62 <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>
61 </maas-obj-form>63 </maas-obj-form>
62 </div>64 </div>
63 </div>65 </div>