Merge lp:~ricgard/maas/1681387 into lp:~maas-committers/maas/trunk

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

Commit message

Fixes design issue with incorrect HTML elements being used on the events page

Description of the change

Fixes design issue with incorrect HTML elements being used on the events page

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

Looks good.

review: Approve

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 2017-04-07 16:08:21 +0000
3+++ src/maasserver/static/partials/node-details.html 2017-04-11 09:50:23 +0000
4@@ -2297,7 +2297,7 @@
5 <section class="row" data-ng-if="section.area === 'events'">
6 <div class="wrapper--inner">
7 <div class="twelve-col u-align--right" data-ng-if="node.events.length">
8- <a class="button--secondary button--inline" href="#/node/{$ type_name $}/{$ node.system_id $}/events">View full history</a>
9+ <a href="#/node/{$ type_name $}/{$ node.system_id $}/events">View full history</a>
10 </div>
11 <div class="twelve-col">
12 <p data-ng-if="!node.events.length">No events.</p>
13@@ -2323,9 +2323,7 @@
14 </div>
15 <div class="twelve-col u-align--center">
16 <p>
17- <span data-ng-show="allowShowMoreEvents()">
18- <button class="button--base button--inline" data-ng-click="showMoreEvents()">Load next 10 events</button>
19- </span>
20+ <button class="button--secondary button--inline" data-ng-show="allowShowMoreEvents()" data-ng-click="showMoreEvents()">Load next 10 events</button>
21 </p>
22 </div>
23 </div>