Merge lp://qastaging/~ricgard/maas/pods-settings-networking-html-improvements into lp://qastaging/~maas-committers/maas/trunk

Proposed by Richard McCartney
Status: Merged
Approved by: Richard McCartney
Approved revision: no longer in the source branch.
Merged at revision: 5885
Proposed branch: lp://qastaging/~ricgard/maas/pods-settings-networking-html-improvements
Merge into: lp://qastaging/~maas-committers/maas/trunk
Prerequisite: lp://qastaging/~ricgard/maas/node-and-networking-accessibility
Diff against target: 789 lines (+109/-109)
21 files modified
src/maasserver/static/js/angular/directives/tests/test_call_to_action.js (+2/-2)
src/maasserver/static/partials/boot-images.html (+1/-1)
src/maasserver/static/partials/domain-details.html (+3/-3)
src/maasserver/static/partials/domains-list.html (+1/-1)
src/maasserver/static/partials/fabric-details.html (+3/-3)
src/maasserver/static/partials/ipranges.html (+5/-5)
src/maasserver/static/partials/node-details.html (+1/-1)
src/maasserver/static/partials/node-events.html (+1/-1)
src/maasserver/static/partials/nodes-list.html (+10/-10)
src/maasserver/static/partials/pod-details.html (+6/-6)
src/maasserver/static/partials/pods-list.html (+2/-2)
src/maasserver/static/partials/settings.html (+53/-53)
src/maasserver/static/partials/space-details.html (+3/-3)
src/maasserver/static/partials/ssh-keys.html (+1/-1)
src/maasserver/static/partials/subnet-details.html (+9/-9)
src/maasserver/static/partials/vlan-details.html (+2/-2)
src/maasserver/templates/maasserver/prefs_add_sslkey.html (+1/-1)
src/maasserver/templates/maasserver/user_add.html (+1/-1)
src/maasserver/templates/maasserver/user_edit.html (+2/-2)
src/maasserver/templates/maasserver/zone_confirm_delete.html (+1/-1)
src/maasserver/templates/maasserver/zone_edit.html (+1/-1)
To merge this branch: bzr merge lp://qastaging/~ricgard/maas/pods-settings-networking-html-improvements
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+321072@code.qastaging.launchpad.net

Commit message

Improving tabbing markup for pods and settings

Description of the change

- Improving the tabbing order for pods, settings and networking

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

Same as previous review. Be prepared to fix things quickly if this breaks anything.

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

Attempt to merge into lp:maas failed due to conflicts:

text conflict in src/maasserver/static/js/angular/directives/tests/test_call_to_action.js
text conflict in src/maasserver/static/partials/node-details.html
text conflict in src/maasserver/static/partials/nodes-list.html

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.