Merge lp:~blake-rouse/maas/fix-1453745 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Move view all button next to the load more button. Fix wording of view more.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-1453745 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [63.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [63.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [81.9 kB]
Get:6 http://security.ubuntu.com trusty-security/universe Sources [25.2 kB]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [273 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
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [105 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [206 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [118 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [526 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [282 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/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 1,745 kB in 3s (564 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-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netifaces python-n...

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-05-27 19:03:35 +0000
+++ src/maasserver/static/partials/node-details.html	2015-05-27 20:44:36 +0000
@@ -377,17 +377,11 @@
                     </tbody>
                 </table>
             </div>
-            <div class="controls four-col last-col no-margin-bottom" data-ng-show="node.events.length">
-                <div class="two-col no-margin-bottom">
-                   <a href="" class="link-cta-ubuntu clear right"></a>
-                </div>
-                <div class="two-col last-col no-margin-bottom">
-                    <a href="#/node/{$ node.system_id $}/events"
-                       class="link-cta-ubuntu secondary full">View more</a>
-                </div>
-            </div>
-            <p class="twelve-col text-center" data-ng-show="allowShowMoreEvents()">
-                <a href="" data-ng-click="showMoreEvents()">Load next 10 events</a>
+            <p class="twelve-col text-center">
+                <span data-ng-show="allowShowMoreEvents()">
+                    <a href="" data-ng-click="showMoreEvents()">Load next 10 events</a> |
+                </span>
+                <a href="#/node/{$ node.system_id $}/events">View full history</a>
             </p>
         </div>
     </div>

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2015-05-27 01:28:42 +0000
+++ src/maasserver/tests/test_node_action.py	2015-05-27 20:44:36 +0000
@@ -274,7 +274,7 @@
     def test_Commission_starts_commissioning(self):
         node = factory.make_Node(
             mac=True, status=self.status,
-            power_type='ether_wake')
+            power_type='ether_wake', power_state=POWER_STATE.OFF)
         self.patch_autospec(node, 'start_transition_monitor')
         node_start = self.patch(node, 'start')
         node_start.side_effect = lambda user, user_data: post_commit()