MAAS

Merge lp:~ricgard/maas/node-headers into lp:~maas-committers/maas/trunk

  1. node-headers
  2. Merge into trunk
Proposed by Richard McCartney
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4366
Proposed branch: lp:~ricgard/maas/node-headers
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 104 lines (+15/-12)
1 file modified
src/maasserver/static/partials/node-details.html (+15/-12)
To merge this branch: bzr merge lp:~ricgard/maas/node-headers
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+273714@code.launchpad.net

Commit message

Changed all node detail headers to h2's and h3's

Description of the change

A change to all headline tags, sections changed to h2's and sub titles to h3's

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good. Just one inline comment.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (989.4 KiB)

The attempt to merge lp:~ricgard/maas/node-headers into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://security.ubuntu.com trusty-security/main Sources [96.9 kB]
Get:3 http://security.ubuntu.com trusty-security/universe Sources [31.0 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [237 kB]
Get:5 http://security.ubuntu.com trusty-security/main amd64 Packages [350 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [140 kB]
Get:7 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [628 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [321 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [305 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [169 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 2,458 kB in 4s (556 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios p...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/node-details.html'
2--- src/maasserver/static/partials/node-details.html 2015-10-06 19:15:21 +0000
3+++ src/maasserver/static/partials/node-details.html 2015-10-08 09:51:21 +0000
4@@ -128,7 +128,7 @@
5 <div class="inner-wrapper">
6 <form>
7 <div class="twelve-col">
8- <h3 class="title">Machine summary</h3>
9+ <h2 class="title">Machine summary</h2>
10 </div>
11 <fieldset class="six-col">
12 <div class="ng-hide" data-ng-show="isSuperUser()">
13@@ -265,7 +265,7 @@
14 <div class="inner-wrapper">
15 <form class="disabled">
16 <div class="twelve-col">
17- <h3 class="title">Power</h3>
18+ <h2 class="title">Power</h2>
19 </div>
20 <div class="twelve-col ng-hide error" data-ng-show="hasPowerError()">
21 <ul class="flash-messages">
22@@ -299,12 +299,12 @@
23 <div class="row">
24 <div class="inner-wrapper" ng-controller="NodeNetworkingController">
25 <div class="twelve-col" data-ng-hide="loaded">
26- <h2 class="title">Networking</h2>
27+ <h2 class="title">Network</h2>
28 <div class="twelve-col">Loading...</div>
29 </div>
30 <form class="ng-hide" data-ng-show="loaded">
31 <div class="twelve-col">
32- <h3 class="title">Networking</h3>
33+ <h2 class="title">Network</h2>
34 <div class="table margin-bottom">
35 <header class="table__head">
36 <div class="table__row">
37@@ -668,13 +668,16 @@
38 <div class="row">
39 <div class="inner-wrapper" ng-controller="NodeStorageController">
40 <form>
41+ <div class="twleve-col">
42+ <h2>Storage</h2>
43+ </div>
44 <div class="twelve-col" data-ng-hide="has_disks">
45 <h4>
46 No storage information. Commissioning this node will gather the storage information.
47 </h4>
48 </div>
49 <div class="twelve-col padding-bottom">
50- <h4>File System</h4>
51+ <h3>File System</h3>
52 <section class="table">
53 <header class="table__head">
54 <div class="table__row">
55@@ -707,7 +710,7 @@
56 </section>
57 </div>
58 <div class="twelve-col padding-bottom">
59- <h4>Available disks and partitions</h4>
60+ <h3>Available disks and partitions</h3>
61 <section class="table margin-bottom">
62 <header class="table__head">
63 <div class="table__row">
64@@ -807,7 +810,7 @@
65 </div>
66 </div>
67 <div class="twelve-col padding-bottom">
68- <h4>Used disks and partitions</h4>
69+ <h3>Used disks and partitions</h3>
70 <section class="table">
71 <header class="table__head">
72 <div class="table__row">
73@@ -1271,10 +1274,10 @@
74 <div class="row">
75 <div class="inner-wrapper">
76 <div class="twelve-col">
77- <h3 class="title">Latest machine events</h3>
78- <h4 data-ng-hide="node.events.length">
79+ <h2 class="title">Latest machine events</h2>
80+ <h2 data-ng-hide="node.events.length">
81 No events.
82- </h4>
83+ </h2>
84 <table class="table-listing no-hover" data-ng-show="node.events.length">
85 <thead>
86 <tr class="table-listing__row">
87@@ -1307,7 +1310,7 @@
88 <div class="row" data-ng-show="machine_output.viewable">
89 <div class="inner-wrapper">
90 <div class="twelve-col">
91- <h3 class="title">Machine output
92+ <h2 class="title">Machine output
93 <span class="title__indicator" data-ng-show="machine_output.showSummaryToggle">
94 <a href="" class="title__link active"
95 data-ng-click="machine_output.summaryType = 'yaml'"
96@@ -1317,7 +1320,7 @@
97 data-ng-click="machine_output.summaryType = 'xml'"
98 data-ng-class="{ active: machine_output.summaryType === 'xml' }">XML</a>
99 </span>
100- </h3>
101+ </h2>
102 </div>
103 <div class="twelve-col" data-ng-show="machine_output.selectedView.name === 'summary'">
104 <pre>